diff --git a/.changeset/analytics-millenial-whoop.md b/.changeset/analytics-millenial-whoop.md
deleted file mode 100644
index 265e0072ce..0000000000
--- a/.changeset/analytics-millenial-whoop.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'@backstage/core-app-api': patch
----
-
-Fixed a bug that could cause `navigate` analytics events to be misattributed to the plugin mounted on the root route (e.g. the `home` plugin at `/`) when the route that was navigated to wasn't associated with a routable extension.
diff --git a/.changeset/beige-files-reflect.md b/.changeset/beige-files-reflect.md
deleted file mode 100644
index e888d5e0f8..0000000000
--- a/.changeset/beige-files-reflect.md
+++ /dev/null
@@ -1,7 +0,0 @@
----
-'@backstage/plugin-search-backend-module-techdocs': patch
-'@backstage/plugin-search-backend-module-catalog': patch
-'@backstage/plugin-search-backend-module-explore': patch
----
-
-Ensure that all services are dependency injected into the module instead of taken from options
diff --git a/.changeset/big-bananas-sleep.md b/.changeset/big-bananas-sleep.md
new file mode 100644
index 0000000000..71a0772720
--- /dev/null
+++ b/.changeset/big-bananas-sleep.md
@@ -0,0 +1,5 @@
+---
+'@backstage/plugin-playlist': patch
+---
+
+Updated latest playlist screen in readme document
diff --git a/.changeset/big-masks-divide.md b/.changeset/big-masks-divide.md
new file mode 100644
index 0000000000..f1d346ba7d
--- /dev/null
+++ b/.changeset/big-masks-divide.md
@@ -0,0 +1,5 @@
+---
+'@backstage/plugin-home': patch
+---
+
+Fixed a bug where customizable home page cards would render missing their normal borders.
diff --git a/.changeset/blue-rats-drop.md b/.changeset/blue-rats-drop.md
new file mode 100644
index 0000000000..19b732be1a
--- /dev/null
+++ b/.changeset/blue-rats-drop.md
@@ -0,0 +1,5 @@
+---
+'@backstage/backend-test-utils': patch
+---
+
+Introduced a new utility for testing service factories, `ServiceFactoryTester`.
diff --git a/.changeset/brave-books-pretend.md b/.changeset/brave-books-pretend.md
new file mode 100644
index 0000000000..ee80aedb18
--- /dev/null
+++ b/.changeset/brave-books-pretend.md
@@ -0,0 +1,5 @@
+---
+'@backstage/plugin-playlist': patch
+---
+
+change color of delete icon to secondary in playlist table
diff --git a/.changeset/brave-carrots-occur.md b/.changeset/brave-carrots-occur.md
new file mode 100644
index 0000000000..017a9bdd8c
--- /dev/null
+++ b/.changeset/brave-carrots-occur.md
@@ -0,0 +1,5 @@
+---
+'@backstage/plugin-search-backend-module-pg': patch
+---
+
+Added `indexerBatchSize` option to be able to control the size of the batches being indexed. Also added a debug log entry to list out all the entities in the batch
diff --git a/.changeset/brown-taxis-develop.md b/.changeset/brown-taxis-develop.md
deleted file mode 100644
index 19ebfdef1a..0000000000
--- a/.changeset/brown-taxis-develop.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'@backstage/backend-app-api': patch
----
-
-Do not throw in backend.stop, if start failed
diff --git a/.changeset/calm-cups-smile.md b/.changeset/calm-cups-smile.md
new file mode 100644
index 0000000000..68fcfb2d1a
--- /dev/null
+++ b/.changeset/calm-cups-smile.md
@@ -0,0 +1,60 @@
+---
+'@backstage/plugin-api-docs-module-protoc-gen-doc': patch
+'@backstage/plugin-catalog-unprocessed-entities': patch
+'@backstage/plugin-github-pull-requests-board': patch
+'@backstage/integration-react': patch
+'@backstage/plugin-github-deployments': patch
+'@backstage/plugin-microsoft-calendar': patch
+'@backstage/plugin-newrelic-dashboard': patch
+'@backstage/plugin-entity-validation': patch
+'@backstage/plugin-apollo-explorer': patch
+'@backstage/plugin-gitops-profiles': patch
+'@backstage/plugin-graphql-voyager': patch
+'@backstage/plugin-apache-airflow': patch
+'@backstage/plugin-github-actions': patch
+'@backstage/plugin-octopus-deploy': patch
+'@backstage/plugin-splunk-on-call': patch
+'@backstage/plugin-config-schema': patch
+'@backstage/plugin-github-issues': patch
+'@backstage/plugin-azure-devops': patch
+'@backstage/plugin-code-climate': patch
+'@backstage/plugin-gcp-projects': patch
+'@backstage/plugin-azure-sites': patch
+'@backstage/plugin-firehydrant': patch
+'@backstage/plugin-cloudbuild': patch
+'@backstage/plugin-home-react': patch
+'@backstage/plugin-lighthouse': patch
+'@backstage/plugin-tech-radar': patch
+'@backstage/plugin-codescene': patch
+'@backstage/plugin-dynatrace': patch
+'@backstage/plugin-gcalendar': patch
+'@backstage/plugin-org-react': patch
+'@backstage/plugin-shortcuts': patch
+'@backstage/plugin-sonarqube': patch
+'@backstage/plugin-xcmetrics': patch
+'@backstage/plugin-airbrake': patch
+'@backstage/plugin-circleci': patch
+'@backstage/plugin-graphiql': patch
+'@backstage/plugin-linguist': patch
+'@backstage/plugin-newrelic': patch
+'@backstage/plugin-opencost': patch
+'@backstage/plugin-periskop': patch
+'@backstage/plugin-playlist': patch
+'@backstage/plugin-puppetdb': patch
+'@backstage/plugin-bitrise': patch
+'@backstage/plugin-jenkins': patch
+'@backstage/plugin-rollbar': patch
+'@backstage/plugin-allure': patch
+'@backstage/plugin-badges': patch
+'@backstage/plugin-bazaar': patch
+'@backstage/plugin-sentry': patch
+'@backstage/plugin-fossa': patch
+'@backstage/plugin-ilert': patch
+'@backstage/plugin-kafka': patch
+'@backstage/plugin-nomad': patch
+'@backstage/plugin-vault': patch
+'@backstage/plugin-todo': patch
+'@backstage/plugin-org': patch
+---
+
+Moved `@types/react` to be a regular dependency
diff --git a/.changeset/catalog-everybody-to-the-limit.md b/.changeset/catalog-everybody-to-the-limit.md
new file mode 100644
index 0000000000..4c0177820e
--- /dev/null
+++ b/.changeset/catalog-everybody-to-the-limit.md
@@ -0,0 +1,5 @@
+---
+'@backstage/plugin-catalog-backend': patch
+---
+
+Fix to the `limit` parameter on entity queries.
diff --git a/.changeset/chatty-foxes-buy.md b/.changeset/chatty-foxes-buy.md
deleted file mode 100644
index 609ddc5269..0000000000
--- a/.changeset/chatty-foxes-buy.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'@backstage/plugin-catalog-graph': patch
----
-
-Propagate entity spec to EntityNode so that spec info such as type can be used for graph node customization
diff --git a/.changeset/chatty-goats-mate.md b/.changeset/chatty-goats-mate.md
new file mode 100644
index 0000000000..2d4911c603
--- /dev/null
+++ b/.changeset/chatty-goats-mate.md
@@ -0,0 +1,6 @@
+---
+'@backstage/plugin-kubernetes-backend': patch
+'@backstage/plugin-kubernetes-common': patch
+---
+
+Add AWS Annotations to Kubernetes Cluster Resource
diff --git a/.changeset/chatty-seahorses-juggle.md b/.changeset/chatty-seahorses-juggle.md
deleted file mode 100644
index 8d699699a7..0000000000
--- a/.changeset/chatty-seahorses-juggle.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'@backstage/plugin-kubernetes-backend': patch
----
-
-Fixed a bug where the proxy was not rewriting WebSocket request paths properly.
diff --git a/.changeset/chatty-spiders-serve.md b/.changeset/chatty-spiders-serve.md
new file mode 100644
index 0000000000..e2b5e5630e
--- /dev/null
+++ b/.changeset/chatty-spiders-serve.md
@@ -0,0 +1,5 @@
+---
+'@backstage/backend-app-api': patch
+---
+
+Add support for discovering additional service factories during startup.
diff --git a/.changeset/chilly-balloons-enjoy.md b/.changeset/chilly-balloons-enjoy.md
new file mode 100644
index 0000000000..e541e4d4cc
--- /dev/null
+++ b/.changeset/chilly-balloons-enjoy.md
@@ -0,0 +1,6 @@
+---
+'@backstage/frontend-plugin-api': minor
+'@backstage/frontend-app-api': minor
+---
+
+Initial release
diff --git a/.changeset/chilly-keys-count.md b/.changeset/chilly-keys-count.md
deleted file mode 100644
index 3bbc4e40dc..0000000000
--- a/.changeset/chilly-keys-count.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'@backstage/plugin-playlist': patch
----
-
-Displaying an alert popup each time the Playlist is created or deleted
diff --git a/.changeset/chilly-parrots-yell.md b/.changeset/chilly-parrots-yell.md
new file mode 100644
index 0000000000..fe4c760923
--- /dev/null
+++ b/.changeset/chilly-parrots-yell.md
@@ -0,0 +1,5 @@
+---
+'@backstage/plugin-catalog': patch
+---
+
+Added title to props for `Has<kind>Cards`.
diff --git a/.changeset/clean-houses-invent.md b/.changeset/clean-houses-invent.md
new file mode 100644
index 0000000000..fe4a252d48
--- /dev/null
+++ b/.changeset/clean-houses-invent.md
@@ -0,0 +1,5 @@
+---
+'@backstage/plugin-graphiql': patch
+---
+
+Added experimental exports for the new frontend system under `/alpha`.
diff --git a/.changeset/cold-apricots-poke.md b/.changeset/cold-apricots-poke.md
new file mode 100644
index 0000000000..b050c8082b
--- /dev/null
+++ b/.changeset/cold-apricots-poke.md
@@ -0,0 +1,5 @@
+---
+'@backstage/plugin-catalog-backend': patch
+---
+
+Changed the processing loop task pipeline implementation from recursive to iterative
diff --git a/.changeset/cold-numbers-sleep.md b/.changeset/cold-numbers-sleep.md
deleted file mode 100644
index ac53307b07..0000000000
--- a/.changeset/cold-numbers-sleep.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'@backstage/plugin-scaffolder': patch
----
-
-Fix the get entities query in the `MyGroupsPicker` to query the `kind=Group` entities.
diff --git a/.changeset/create-app-1690284535.md b/.changeset/create-app-1692704146.md
similarity index 100%
rename from .changeset/create-app-1690284535.md
rename to .changeset/create-app-1692704146.md
diff --git a/.changeset/create-app-1690892926.md b/.changeset/create-app-1693311380.md
similarity index 100%
rename from .changeset/create-app-1690892926.md
rename to .changeset/create-app-1693311380.md
diff --git a/.changeset/cuddly-avocados-warn.md b/.changeset/cuddly-avocados-warn.md
new file mode 100644
index 0000000000..aa70da287b
--- /dev/null
+++ b/.changeset/cuddly-avocados-warn.md
@@ -0,0 +1,5 @@
+---
+'@backstage/plugin-techdocs-backend': patch
+---
+
+Expand techdocs.publisher.type with `googleGcs`,`awsS3`,`azureBlobStorage` and `openStackSwift`
diff --git a/.changeset/curvy-roses-march.md b/.changeset/curvy-roses-march.md
new file mode 100644
index 0000000000..cd38808165
--- /dev/null
+++ b/.changeset/curvy-roses-march.md
@@ -0,0 +1,5 @@
+---
+'@backstage/plugin-auth-backend': patch
+---
+
+Migrated the GitLab auth provider to be implemented using the new `@backstage/plugin-auth-backend-module-gitlab-provider` module.
diff --git a/.changeset/cyan-roses-relate.md b/.changeset/cyan-roses-relate.md
new file mode 100644
index 0000000000..e6dbeb6ed9
--- /dev/null
+++ b/.changeset/cyan-roses-relate.md
@@ -0,0 +1,5 @@
+---
+'@backstage/cli': patch
+---
+
+Added the ability to create a plain backend module with the `new` command.
diff --git a/.changeset/dirty-carrots-notice.md b/.changeset/dirty-carrots-notice.md
new file mode 100644
index 0000000000..ccc31c25ca
--- /dev/null
+++ b/.changeset/dirty-carrots-notice.md
@@ -0,0 +1,5 @@
+---
+'@backstage/plugin-auth-backend': patch
+---
+
+Added `authPlugin` export for the new backend system. The plugin does not include any built-in auth providers, they must instead be added by installing additional modules, for example `authModuleGoogleProvider` from `@backstage/plugin-auth-backend-module-google-provider`.
diff --git a/.changeset/dirty-cars-poke.md b/.changeset/dirty-cars-poke.md
new file mode 100644
index 0000000000..5412229f34
--- /dev/null
+++ b/.changeset/dirty-cars-poke.md
@@ -0,0 +1,34 @@
+---
+'@backstage/plugin-adr-backend': minor
+'@backstage/plugin-airbrake-backend': minor
+'@backstage/plugin-auth-backend': minor
+'@backstage/plugin-azure-devops-backend': minor
+'@backstage/plugin-badges-backend': minor
+'@backstage/plugin-bazaar-backend': minor
+'@backstage/plugin-catalog-backend-module-unprocessed': minor
+'@backstage/plugin-devtools-backend': minor
+'@backstage/plugin-entity-feedback-backend': minor
+'@backstage/plugin-kafka-backend': minor
+'@backstage/plugin-lighthouse-backend': minor
+'@backstage/plugin-linguist-backend': minor
+'@backstage/plugin-periskop-backend': minor
+'@backstage/plugin-proxy-backend': minor
+'@backstage/plugin-todo-backend': minor
+'@backstage/plugin-user-settings-backend': minor
+---
+
+**BREAKING**: The export for the new backend system has been moved to be the `default` export.
+
+For example, if you are currently importing the plugin using the following pattern:
+
+```ts
+import { examplePlugin } from '@backstage/plugin-example-backend';
+
+backend.add(examplePlugin);
+```
+
+It should be migrated to this:
+
+```ts
+backend.add(import('@backstage/plugin-example-backend'));
+```
diff --git a/.changeset/angry-beers-relate.md b/.changeset/dirty-cars-smoke.md
similarity index 66%
rename from .changeset/angry-beers-relate.md
rename to .changeset/dirty-cars-smoke.md
index 4e51de99e4..5ba8380d68 100644
--- a/.changeset/angry-beers-relate.md
+++ b/.changeset/dirty-cars-smoke.md
@@ -1,43 +1,48 @@
 ---
-'@backstage/plugin-catalog-backend-module-incremental-ingestion': patch
-'@backstage/plugin-catalog-backend-module-bitbucket-server': patch
+'@backstage/plugin-app-backend': patch
+'@backstage/plugin-auth-backend-module-gcp-iap-provider': patch
+'@backstage/plugin-auth-backend-module-github-provider': patch
+'@backstage/plugin-auth-backend-module-gitlab-provider': patch
+'@backstage/plugin-auth-backend-module-google-provider': patch
+'@backstage/plugin-catalog-backend': patch
+'@backstage/plugin-catalog-backend-module-aws': patch
+'@backstage/plugin-catalog-backend-module-azure': patch
 '@backstage/plugin-catalog-backend-module-bitbucket-cloud': patch
-'@backstage/plugin-search-backend-module-elasticsearch': patch
-'@backstage/plugin-catalog-backend-module-puppetdb': patch
-'@backstage/plugin-catalog-backend-module-msgraph': patch
-'@backstage/plugin-search-backend-module-techdocs': patch
+'@backstage/plugin-catalog-backend-module-bitbucket-server': patch
+'@backstage/plugin-catalog-backend-module-gcp': patch
 '@backstage/plugin-catalog-backend-module-gerrit': patch
 '@backstage/plugin-catalog-backend-module-github': patch
 '@backstage/plugin-catalog-backend-module-gitlab': patch
-'@backstage/plugin-events-backend-module-aws-sqs': patch
-'@backstage/plugin-search-backend-module-catalog': patch
-'@backstage/plugin-search-backend-module-explore': patch
-'@backstage/plugin-catalog-backend-module-azure': patch
-'@backstage/plugin-events-backend-module-github': patch
-'@backstage/plugin-events-backend-module-gitlab': patch
-'@backstage/plugin-catalog-backend-module-aws': patch
-'@backstage/plugin-catalog-backend-module-gcp': patch
-'@backstage/plugin-search-backend-module-pg': patch
-'@backstage/plugin-azure-devops-backend': patch
-'@backstage/plugin-kubernetes-backend': patch
-'@backstage/plugin-lighthouse-backend': patch
-'@backstage/plugin-permission-backend': patch
-'@backstage/plugin-scaffolder-backend': patch
-'@backstage/backend-defaults': patch
-'@backstage/plugin-airbrake-backend': patch
-'@backstage/plugin-devtools-backend': patch
-'@backstage/plugin-periskop-backend': patch
-'@backstage/plugin-techdocs-backend': patch
-'@backstage/backend-common': patch
-'@backstage/plugin-catalog-backend': patch
-'@backstage/plugin-badges-backend': patch
-'@backstage/plugin-bazaar-backend': patch
+'@backstage/plugin-catalog-backend-module-incremental-ingestion': patch
+'@backstage/plugin-catalog-backend-module-msgraph': patch
+'@backstage/plugin-catalog-backend-module-puppetdb': patch
 '@backstage/plugin-events-backend': patch
+'@backstage/plugin-events-backend-module-aws-sqs': patch
+'@backstage/plugin-kubernetes-backend': patch
+'@backstage/plugin-permission-backend': patch
+'@backstage/plugin-permission-backend-module-allow-all-policy': patch
+'@backstage/plugin-scaffolder-backend': patch
 '@backstage/plugin-search-backend': patch
-'@backstage/plugin-kafka-backend': patch
-'@backstage/plugin-proxy-backend': patch
-'@backstage/plugin-todo-backend': patch
-'@backstage/plugin-app-backend': patch
+'@backstage/plugin-search-backend-module-catalog': patch
+'@backstage/plugin-search-backend-module-elasticsearch': patch
+'@backstage/plugin-search-backend-module-explore': patch
+'@backstage/plugin-search-backend-module-pg': patch
+'@backstage/plugin-search-backend-module-techdocs': patch
+'@backstage/plugin-techdocs-backend': patch
 ---
 
-Use `coreServices.rootConfig` instead of `coreService.config`
+The export for the new backend system has been moved to be the `default` export.
+
+For example, if you are currently importing the plugin using the following pattern:
+
+```ts
+import { examplePlugin } from '@backstage/plugin-example-backend';
+
+backend.add(examplePlugin);
+```
+
+It should be migrated to this:
+
+```ts
+backend.add(import('@backstage/plugin-example-backend'));
+```
diff --git a/.changeset/dirty-chefs-listen.md b/.changeset/dirty-chefs-listen.md
deleted file mode 100644
index 84b684b977..0000000000
--- a/.changeset/dirty-chefs-listen.md
+++ /dev/null
@@ -1,7 +0,0 @@
----
-'@backstage/config-loader': minor
----
-
-Loading invalid TypeScript configuration schemas will now throw an error rather than silently being ignored.
-
-In particular this includes defining any additional types other than `Config` in the schema file, or use of unsupported types such as `Record` or `Partial`.
diff --git a/.changeset/dirty-garlics-kiss.md b/.changeset/dirty-garlics-kiss.md
new file mode 100644
index 0000000000..98a9b569cc
--- /dev/null
+++ b/.changeset/dirty-garlics-kiss.md
@@ -0,0 +1,5 @@
+---
+'@backstage/plugin-tech-radar': patch
+---
+
+Add names to blip entry links in the radar to improve accessibility
diff --git a/.changeset/dirty-years-travel.md b/.changeset/dirty-years-travel.md
new file mode 100644
index 0000000000..e6e5b8a608
--- /dev/null
+++ b/.changeset/dirty-years-travel.md
@@ -0,0 +1,5 @@
+---
+'@backstage/plugin-code-coverage-backend': patch
+---
+
+Added support for LCOV coverage reports
diff --git a/.changeset/dry-wasps-occur.md b/.changeset/dry-wasps-occur.md
new file mode 100644
index 0000000000..0c7d231708
--- /dev/null
+++ b/.changeset/dry-wasps-occur.md
@@ -0,0 +1,5 @@
+---
+'@backstage/plugin-auth-backend-module-gcp-iap-provider': minor
+---
+
+New module for `@backstage/plugin-auth-backend` that adds a GCP IAP auth provider.
diff --git a/.changeset/dull-tables-joke.md b/.changeset/dull-tables-joke.md
new file mode 100644
index 0000000000..e987377023
--- /dev/null
+++ b/.changeset/dull-tables-joke.md
@@ -0,0 +1,5 @@
+---
+'@backstage/plugin-catalog': patch
+---
+
+Fixed an issue where `EntitySwitch` was preventing the display of entity errors.
diff --git a/.changeset/early-rules-taste.md b/.changeset/early-rules-taste.md
new file mode 100644
index 0000000000..1a332dfe36
--- /dev/null
+++ b/.changeset/early-rules-taste.md
@@ -0,0 +1,14 @@
+---
+'@backstage/create-app': patch
+---
+
+Added a `fix` scripts that calls the new `backstage-cli repo fix` command.
+
+To apply this change to an existing app, make the following change to your root `package.json`:
+
+```diff
+     "test": "backstage-cli repo test",
+     "test:all": "backstage-cli repo test --coverage",
++    "fix": "backstage-cli repo fix",
+     "lint": "backstage-cli repo lint --since origin/master",
+```
diff --git a/.changeset/early-trains.draw.md b/.changeset/early-trains.draw.md
new file mode 100644
index 0000000000..30aad1a08d
--- /dev/null
+++ b/.changeset/early-trains.draw.md
@@ -0,0 +1,5 @@
+---
+'@backstage/plugin-tech-radar': patch
+---
+
+Fixed the width of the tech radar dialog so that the content fits
diff --git a/.changeset/eight-radios-listen.md b/.changeset/eight-radios-listen.md
new file mode 100644
index 0000000000..0421a561c0
--- /dev/null
+++ b/.changeset/eight-radios-listen.md
@@ -0,0 +1,5 @@
+---
+'@backstage/plugin-techdocs': patch
+---
+
+Fixed bug in styles that caused next and previous links in footer to overlap page content.
diff --git a/.changeset/eight-timers-sin.md b/.changeset/eight-timers-sin.md
new file mode 100644
index 0000000000..28d6259cb4
--- /dev/null
+++ b/.changeset/eight-timers-sin.md
@@ -0,0 +1,5 @@
+---
+'@backstage/plugin-catalog-react': patch
+---
+
+Export the `EntityAutocompletePicker` component.
diff --git a/.changeset/eighty-emus-float.md b/.changeset/eighty-emus-float.md
new file mode 100644
index 0000000000..c149affa09
--- /dev/null
+++ b/.changeset/eighty-emus-float.md
@@ -0,0 +1,5 @@
+---
+'@backstage/cli': patch
+---
+
+Add ESM loader for the experimental backend start command.
diff --git a/.changeset/eighty-fans-provide.md b/.changeset/eighty-fans-provide.md
new file mode 100644
index 0000000000..b98bc39924
--- /dev/null
+++ b/.changeset/eighty-fans-provide.md
@@ -0,0 +1,5 @@
+---
+'@backstage/core-components': patch
+---
+
+Fixed an issue causing `StructuredMetadataTable` to crash in case metadata contained `null` values.
diff --git a/.changeset/empty-rings-type.md b/.changeset/empty-rings-type.md
new file mode 100644
index 0000000000..2aa41054f9
--- /dev/null
+++ b/.changeset/empty-rings-type.md
@@ -0,0 +1,5 @@
+---
+'@backstage/plugin-scaffolder-backend': patch
+---
+
+Add examples for `publish:github` and `publish:gitlab` scaffolder actions.
diff --git a/.changeset/fair-paws-flash.md b/.changeset/fair-paws-flash.md
new file mode 100644
index 0000000000..d9a7b1827e
--- /dev/null
+++ b/.changeset/fair-paws-flash.md
@@ -0,0 +1,5 @@
+---
+'@backstage/plugin-catalog-backend-module-azure': patch
+---
+
+Improve consistency of results from the `AzureDevOpsEntityProvider`.
diff --git a/.changeset/few-nails-smile.md b/.changeset/few-nails-smile.md
new file mode 100644
index 0000000000..2fad9a0b40
--- /dev/null
+++ b/.changeset/few-nails-smile.md
@@ -0,0 +1,5 @@
+---
+'@backstage/plugin-entity-feedback': patch
+---
+
+Improve README to note that Backstage identity is required to be configured
diff --git a/.changeset/fifty-adults-shake.md b/.changeset/fifty-adults-shake.md
new file mode 100644
index 0000000000..a21c5805ab
--- /dev/null
+++ b/.changeset/fifty-adults-shake.md
@@ -0,0 +1,5 @@
+---
+'@backstage/plugin-catalog-backend': minor
+---
+
+Allow configuring the processing interval in your app-config, under the `catalog.processingInterval` key.
diff --git a/.changeset/fluffy-pens-prove.md b/.changeset/fluffy-pens-prove.md
deleted file mode 100644
index 0bd7d9baf3..0000000000
--- a/.changeset/fluffy-pens-prove.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'@backstage/plugin-auth-backend': patch
----
-
-Updated `frameHandler` to return `undefined` when using the redirect flow instead of returning `postMessageReponse` which was causing errors
diff --git a/.changeset/forty-rocks-jog.md b/.changeset/forty-rocks-jog.md
new file mode 100644
index 0000000000..aff3d34a4a
--- /dev/null
+++ b/.changeset/forty-rocks-jog.md
@@ -0,0 +1,6 @@
+---
+'@backstage/plugin-kubernetes': patch
+'@backstage/test-utils': patch
+---
+
+Add pod exec terminal to Container Card
diff --git a/.changeset/four-masks-fry.md b/.changeset/four-masks-fry.md
new file mode 100644
index 0000000000..94bd929016
--- /dev/null
+++ b/.changeset/four-masks-fry.md
@@ -0,0 +1,5 @@
+---
+'@backstage/plugin-catalog-backend': patch
+---
+
+Update OpenAPI schema to relax the encoding validation of all request parameters.
diff --git a/.changeset/fresh-candles-warn.md b/.changeset/fresh-candles-warn.md
new file mode 100644
index 0000000000..49ca2e5402
--- /dev/null
+++ b/.changeset/fresh-candles-warn.md
@@ -0,0 +1,5 @@
+---
+'@backstage/plugin-auth-node': patch
+---
+
+The `BackstageIdentityResponse` interface now has an optional `expiresInSeconds` field that can be used to signal session expiration. The `prepareBackstageIdentityResponse` utility will now also read the expiration from the provided token, and include it in the response.
diff --git a/.changeset/friendly-pugs-lick.md b/.changeset/friendly-pugs-lick.md
new file mode 100644
index 0000000000..3a82497da8
--- /dev/null
+++ b/.changeset/friendly-pugs-lick.md
@@ -0,0 +1,5 @@
+---
+'@backstage/config': minor
+---
+
+Added a `readDurationFromConfig` function
diff --git a/.changeset/funny-ligers-matter.md b/.changeset/funny-ligers-matter.md
new file mode 100644
index 0000000000..0cec3eb333
--- /dev/null
+++ b/.changeset/funny-ligers-matter.md
@@ -0,0 +1,6 @@
+---
+'@backstage/backend-app-api': patch
+---
+
+Adds include and exclude configuration to feature discovery of backend packages
+Adds alpha modules to feature discovery
diff --git a/.changeset/funny-timers-retire.md b/.changeset/funny-timers-retire.md
new file mode 100644
index 0000000000..87cd4d8f0d
--- /dev/null
+++ b/.changeset/funny-timers-retire.md
@@ -0,0 +1,5 @@
+---
+'@backstage/cli': patch
+---
+
+Added a new `repo fix` command that fixes auto-fixable problems in all packages. Initially the command fixes package export declarations, as well as marks all non-bundled frontend packages as side-effect free. Marking packages as free of side-effects can drastically reduce the Webpack bundle size.
diff --git a/.changeset/giant-coats-brush.md b/.changeset/giant-coats-brush.md
new file mode 100644
index 0000000000..e4fe391b9e
--- /dev/null
+++ b/.changeset/giant-coats-brush.md
@@ -0,0 +1,129 @@
+---
+'@backstage/app-defaults': patch
+'@backstage/catalog-client': patch
+'@backstage/catalog-model': patch
+'@backstage/config': patch
+'@backstage/core-app-api': patch
+'@backstage/core-components': patch
+'@backstage/core-plugin-api': patch
+'@backstage/dev-utils': patch
+'@backstage/errors': patch
+'@backstage/integration': patch
+'@backstage/integration-react': patch
+'@backstage/plugin-adr': patch
+'@backstage/plugin-adr-common': patch
+'@backstage/plugin-airbrake': patch
+'@backstage/plugin-allure': patch
+'@backstage/plugin-analytics-module-ga': patch
+'@backstage/plugin-analytics-module-ga4': patch
+'@backstage/plugin-analytics-module-newrelic-browser': patch
+'@backstage/plugin-apache-airflow': patch
+'@backstage/plugin-api-docs': patch
+'@backstage/plugin-api-docs-module-protoc-gen-doc': patch
+'@backstage/plugin-apollo-explorer': patch
+'@backstage/plugin-azure-devops': patch
+'@backstage/plugin-azure-devops-common': patch
+'@backstage/plugin-azure-sites': patch
+'@backstage/plugin-azure-sites-common': patch
+'@backstage/plugin-badges': patch
+'@backstage/plugin-bazaar': patch
+'@backstage/plugin-bitbucket-cloud-common': patch
+'@backstage/plugin-bitrise': patch
+'@backstage/plugin-catalog': patch
+'@backstage/plugin-catalog-common': patch
+'@backstage/plugin-catalog-graph': patch
+'@backstage/plugin-catalog-import': patch
+'@backstage/plugin-catalog-react': patch
+'@backstage/plugin-catalog-unprocessed-entities': patch
+'@backstage/plugin-cicd-statistics': patch
+'@backstage/plugin-cicd-statistics-module-gitlab': patch
+'@backstage/plugin-circleci': patch
+'@backstage/plugin-cloudbuild': patch
+'@backstage/plugin-code-climate': patch
+'@backstage/plugin-code-coverage': patch
+'@backstage/plugin-codescene': patch
+'@backstage/plugin-config-schema': patch
+'@backstage/plugin-cost-insights': patch
+'@backstage/plugin-cost-insights-common': patch
+'@backstage/plugin-devtools': patch
+'@backstage/plugin-devtools-common': patch
+'@backstage/plugin-dynatrace': patch
+'@backstage/plugin-entity-feedback': patch
+'@backstage/plugin-entity-feedback-common': patch
+'@backstage/plugin-entity-validation': patch
+'@backstage/plugin-explore': patch
+'@backstage/plugin-explore-common': patch
+'@backstage/plugin-explore-react': patch
+'@backstage/plugin-firehydrant': patch
+'@backstage/plugin-fossa': patch
+'@backstage/plugin-gcalendar': patch
+'@backstage/plugin-gcp-projects': patch
+'@backstage/plugin-git-release-manager': patch
+'@backstage/plugin-github-actions': patch
+'@backstage/plugin-github-deployments': patch
+'@backstage/plugin-github-issues': patch
+'@backstage/plugin-github-pull-requests-board': patch
+'@backstage/plugin-gitops-profiles': patch
+'@backstage/plugin-gocd': patch
+'@backstage/plugin-graphiql': patch
+'@backstage/plugin-graphql-voyager': patch
+'@backstage/plugin-home': patch
+'@backstage/plugin-home-react': patch
+'@backstage/plugin-ilert': patch
+'@backstage/plugin-jenkins': patch
+'@backstage/plugin-jenkins-common': patch
+'@backstage/plugin-kafka': patch
+'@backstage/plugin-kubernetes': patch
+'@backstage/plugin-kubernetes-common': patch
+'@backstage/plugin-lighthouse': patch
+'@backstage/plugin-lighthouse-common': patch
+'@backstage/plugin-linguist': patch
+'@backstage/plugin-linguist-common': patch
+'@backstage/plugin-microsoft-calendar': patch
+'@backstage/plugin-newrelic': patch
+'@backstage/plugin-newrelic-dashboard': patch
+'@backstage/plugin-nomad': patch
+'@backstage/plugin-octopus-deploy': patch
+'@backstage/plugin-opencost': patch
+'@backstage/plugin-org': patch
+'@backstage/plugin-org-react': patch
+'@backstage/plugin-pagerduty': patch
+'@backstage/plugin-periskop': patch
+'@backstage/plugin-permission-common': patch
+'@backstage/plugin-permission-react': patch
+'@backstage/plugin-playlist': patch
+'@backstage/plugin-playlist-common': patch
+'@backstage/plugin-puppetdb': patch
+'@backstage/plugin-rollbar': patch
+'@backstage/plugin-scaffolder': patch
+'@backstage/plugin-scaffolder-common': patch
+'@backstage/plugin-scaffolder-react': patch
+'@backstage/plugin-search': patch
+'@backstage/plugin-search-common': patch
+'@backstage/plugin-search-react': patch
+'@backstage/plugin-sentry': patch
+'@backstage/plugin-shortcuts': patch
+'@backstage/plugin-sonarqube': patch
+'@backstage/plugin-sonarqube-react': patch
+'@backstage/plugin-splunk-on-call': patch
+'@backstage/plugin-stack-overflow': patch
+'@backstage/plugin-stackstorm': patch
+'@backstage/plugin-tech-insights': patch
+'@backstage/plugin-tech-insights-common': patch
+'@backstage/plugin-tech-radar': patch
+'@backstage/plugin-techdocs': patch
+'@backstage/plugin-techdocs-addons-test-utils': patch
+'@backstage/plugin-techdocs-module-addons-contrib': patch
+'@backstage/plugin-techdocs-react': patch
+'@backstage/plugin-todo': patch
+'@backstage/plugin-user-settings': patch
+'@backstage/plugin-vault': patch
+'@backstage/plugin-xcmetrics': patch
+'@backstage/release-manifests': patch
+'@backstage/test-utils': patch
+'@backstage/theme': patch
+'@backstage/types': patch
+'@backstage/version-bridge': patch
+---
+
+Mark package as being free of side effects, allowing more optimized Webpack builds.
diff --git a/.changeset/gorgeous-coins-attack.md b/.changeset/gorgeous-coins-attack.md
new file mode 100644
index 0000000000..d500459225
--- /dev/null
+++ b/.changeset/gorgeous-coins-attack.md
@@ -0,0 +1,5 @@
+---
+'@backstage/plugin-catalog-react': patch
+---
+
+Added delete alert popup when user delete the entity
diff --git a/.changeset/gorgeous-months-doubt.md b/.changeset/gorgeous-months-doubt.md
deleted file mode 100644
index d440e28b72..0000000000
--- a/.changeset/gorgeous-months-doubt.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'@backstage/backend-openapi-utils': patch
----
-
-Add a new `createRouter` method for generating an `express` router that validates against your spec. Also fixes a bug with the query parameters type resolution.
diff --git a/.changeset/great-chairs-swim.md b/.changeset/great-chairs-swim.md
new file mode 100644
index 0000000000..e6b8ab0882
--- /dev/null
+++ b/.changeset/great-chairs-swim.md
@@ -0,0 +1,5 @@
+---
+'@backstage/core-app-api': minor
+---
+
+Fixed two bugs in how the `OAuth2Session` type represents the underlying data. The `expiresAt` and `backstageIdentity` are now both optional, since that's what they are in practice. This is not considered a breaking change since it was effectively a bug in the modelling of the state that this type represents, and the type was not used in any other external contract.
diff --git a/.changeset/grumpy-papayas-tie.md b/.changeset/grumpy-papayas-tie.md
new file mode 100644
index 0000000000..48580673d8
--- /dev/null
+++ b/.changeset/grumpy-papayas-tie.md
@@ -0,0 +1,5 @@
+---
+'@backstage/integration': patch
+---
+
+Additional fix for Gitiles auth links
diff --git a/.changeset/grumpy-ties-know.md b/.changeset/grumpy-ties-know.md
new file mode 100644
index 0000000000..86e3b0ec7d
--- /dev/null
+++ b/.changeset/grumpy-ties-know.md
@@ -0,0 +1,5 @@
+---
+'@backstage/create-app': patch
+---
+
+Add a notification when `yarn install` is taking a long time.
diff --git a/.changeset/healthy-spiders-arrive.md b/.changeset/healthy-spiders-arrive.md
new file mode 100644
index 0000000000..e8d110ccaa
--- /dev/null
+++ b/.changeset/healthy-spiders-arrive.md
@@ -0,0 +1,5 @@
+---
+'@backstage/plugin-org': patch
+---
+
+Ensure direct relations are shown for User entities while keeping support for aggregating closest parent group ownership
diff --git a/.changeset/healthy-tools-count.md b/.changeset/healthy-tools-count.md
new file mode 100644
index 0000000000..5d3f04159f
--- /dev/null
+++ b/.changeset/healthy-tools-count.md
@@ -0,0 +1,5 @@
+---
+'@backstage/plugin-auth-backend': patch
+---
+
+Deprecated several exports that are now available from `@backstage/plugin-auth-node` instead.
diff --git a/.changeset/hip-seahorses-exist.md b/.changeset/hip-seahorses-exist.md
new file mode 100644
index 0000000000..e8e247cc0a
--- /dev/null
+++ b/.changeset/hip-seahorses-exist.md
@@ -0,0 +1,5 @@
+---
+'@backstage/plugin-home': patch
+---
+
+Align zod dependency to align with other packages.
diff --git a/.changeset/honest-ads-rush.md b/.changeset/honest-ads-rush.md
new file mode 100644
index 0000000000..63510f7c1a
--- /dev/null
+++ b/.changeset/honest-ads-rush.md
@@ -0,0 +1,5 @@
+---
+'@backstage/plugin-scaffolder-backend': patch
+---
+
+Add examples for `publish:bitbucket` scaffolder actions.
diff --git a/.changeset/hot-cats-rush.md b/.changeset/hot-cats-rush.md
deleted file mode 100644
index 2963804ff2..0000000000
--- a/.changeset/hot-cats-rush.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'@backstage/plugin-explore-backend': patch
----
-
-Moved the config example from the "Tools as Code" section to the "Tools as Config" section of the README
diff --git a/.changeset/hungry-cherries-speak.md b/.changeset/hungry-cherries-speak.md
new file mode 100644
index 0000000000..bd67f61446
--- /dev/null
+++ b/.changeset/hungry-cherries-speak.md
@@ -0,0 +1,5 @@
+---
+'@backstage/backend-test-utils': patch
+---
+
+Add support for installing backend features via module imports, for example `startTestBackend({ features: [import('my-plugin')] })`.
diff --git a/.changeset/hungry-dots-design.md b/.changeset/hungry-dots-design.md
new file mode 100644
index 0000000000..0dd8d415e9
--- /dev/null
+++ b/.changeset/hungry-dots-design.md
@@ -0,0 +1,7 @@
+---
+'@backstage/plugin-catalog-backend-module-azure': patch
+'@backstage/plugin-scaffolder-backend': patch
+'@backstage/backend-common': patch
+---
+
+Use `DefaultAzureDevOpsCredentialsProvider` to retrieve credentials for Azure DevOps.
diff --git a/.changeset/hungry-shrimps-care.md b/.changeset/hungry-shrimps-care.md
deleted file mode 100644
index 665a7bfc82..0000000000
--- a/.changeset/hungry-shrimps-care.md
+++ /dev/null
@@ -1,91 +0,0 @@
----
-'@backstage/plugin-scaffolder-backend-module-confluence-to-markdown': patch
-'@backstage/plugin-scaffolder-backend-module-cookiecutter': patch
-'@backstage/plugin-events-backend-module-bitbucket-cloud': patch
-'@backstage/plugin-search-backend-module-elasticsearch': patch
-'@backstage/plugin-catalog-backend-module-unprocessed': patch
-'@backstage/plugin-scaffolder-backend-module-sentry': patch
-'@backstage/plugin-scaffolder-backend-module-yeoman': patch
-'@backstage/plugin-scaffolder-backend-module-rails': patch
-'@backstage/plugin-search-backend-module-techdocs': patch
-'@backstage/plugin-cicd-statistics-module-gitlab': patch
-'@backstage/plugin-events-backend-module-aws-sqs': patch
-'@backstage/plugin-search-backend-module-catalog': patch
-'@backstage/plugin-search-backend-module-explore': patch
-'@backstage/plugin-events-backend-module-gerrit': patch
-'@backstage/plugin-events-backend-module-github': patch
-'@backstage/plugin-events-backend-module-gitlab': patch
-'@backstage/plugin-events-backend-module-azure': patch
-'@backstage/plugin-events-backend-test-utils': patch
-'@backstage/plugin-search-backend-module-pg': patch
-'@backstage/plugin-entity-feedback-backend': patch
-'@backstage/backend-openapi-utils': patch
-'@backstage/plugin-bitbucket-cloud-common': patch
-'@backstage/plugin-entity-feedback-common': patch
-'@backstage/plugin-code-coverage-backend': patch
-'@backstage/plugin-user-settings-backend': patch
-'@backstage/plugin-analytics-module-ga4': patch
-'@backstage/plugin-azure-devops-backend': patch
-'@backstage/plugin-analytics-module-ga': patch
-'@backstage/plugin-git-release-manager': patch
-'@backstage/plugin-search-backend-node': patch
-'@backstage/integration-react': patch
-'@backstage/plugin-github-deployments': patch
-'@backstage/plugin-microsoft-calendar': patch
-'@backstage/plugin-newrelic-dashboard': patch
-'@backstage/plugin-permission-backend': patch
-'@backstage/plugin-entity-validation': patch
-'@backstage/plugin-sonarqube-backend': patch
-'@backstage/plugin-airbrake-backend': patch
-'@backstage/plugin-devtools-backend': patch
-'@backstage/plugin-linguist-backend': patch
-'@backstage/plugin-periskop-backend': patch
-'@backstage/plugin-playlist-backend': patch
-'@backstage/plugin-apollo-explorer': patch
-'@backstage/plugin-devtools-common': patch
-'@backstage/plugin-entity-feedback': patch
-'@backstage/plugin-explore-backend': patch
-'@backstage/plugin-graphql-voyager': patch
-'@backstage/plugin-jenkins-backend': patch
-'@backstage/plugin-linguist-common': patch
-'@backstage/plugin-playlist-common': patch
-'@backstage/plugin-scaffolder-node': patch
-'@backstage/plugin-apache-airflow': patch
-'@backstage/plugin-bazaar-backend': patch
-'@backstage/plugin-events-backend': patch
-'@backstage/plugin-jenkins-common': patch
-'@backstage/plugin-octopus-deploy': patch
-'@backstage/plugin-search-backend': patch
-'@backstage/plugin-stack-overflow': patch
-'@backstage/plugin-catalog-graph': patch
-'@backstage/plugin-code-coverage': patch
-'@backstage/plugin-config-schema': patch
-'@backstage/plugin-github-issues': patch
-'@backstage/plugin-nomad-backend': patch
-'@backstage/plugin-tech-insights': patch
-'@backstage/plugin-catalog-node': patch
-'@backstage/plugin-code-climate': patch
-'@backstage/plugin-events-node': patch
-'@backstage/plugin-firehydrant': patch
-'@backstage/cli-node': patch
-'@backstage/plugin-auth-node': patch
-'@backstage/plugin-codescene': patch
-'@backstage/plugin-dynatrace': patch
-'@backstage/plugin-gcalendar': patch
-'@backstage/plugin-org-react': patch
-'@backstage/plugin-shortcuts': patch
-'@backstage/plugin-xcmetrics': patch
-'@backstage/plugin-airbrake': patch
-'@backstage/plugin-periskop': patch
-'@backstage/plugin-playlist': patch
-'@backstage/plugin-bitrise': patch
-'@backstage/plugin-allure': patch
-'@backstage/plugin-bazaar': patch
-'@backstage/plugin-ilert': patch
-'@backstage/plugin-kafka': patch
-'@backstage/plugin-nomad': patch
-'@backstage/plugin-adr': patch
-'@backstage/plugin-org': patch
----
-
-Add package repository and homepage metadata
diff --git a/.changeset/khaki-flies-draw.md b/.changeset/khaki-flies-draw.md
deleted file mode 100644
index ada45dea06..0000000000
--- a/.changeset/khaki-flies-draw.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'@backstage/plugin-catalog-backend-module-gitlab': patch
----
-
-Added option to skip forked repos in GitlabDiscoveryEntityProvider
diff --git a/.changeset/khaki-pigs-accept.md b/.changeset/khaki-pigs-accept.md
new file mode 100644
index 0000000000..e00db1746f
--- /dev/null
+++ b/.changeset/khaki-pigs-accept.md
@@ -0,0 +1,7 @@
+---
+'@backstage/plugin-devtools-backend': patch
+'@backstage/plugin-devtools-common': patch
+'@backstage/plugin-devtools': patch
+---
+
+Show resource utilization in `DevTools` plugin
diff --git a/.changeset/khaki-spiders-sniff.md b/.changeset/khaki-spiders-sniff.md
new file mode 100644
index 0000000000..53798a6cf0
--- /dev/null
+++ b/.changeset/khaki-spiders-sniff.md
@@ -0,0 +1,5 @@
+---
+'@backstage/plugin-user-settings': patch
+---
+
+conditionally rendering the user email in user profile card
diff --git a/.changeset/kind-cougars-allow.md b/.changeset/kind-cougars-allow.md
deleted file mode 100644
index d37c4c5cf2..0000000000
--- a/.changeset/kind-cougars-allow.md
+++ /dev/null
@@ -1,14 +0,0 @@
----
-'@backstage/plugin-devtools-backend': patch
----
-
-Add DevTools configuration to enable dependency listing to be filtered with custom prefixes. For instance, in your `app-config.yaml`:
-
-```yaml
-devTools:
-  info:
-    packagePrefixes:
-      - @backstage/
-      - @roadiehq/backstage-
-      - @spotify/backstage-
-```
diff --git a/.changeset/large-badgers-switch.md b/.changeset/large-badgers-switch.md
deleted file mode 100644
index 47c06a4afe..0000000000
--- a/.changeset/large-badgers-switch.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'@backstage/plugin-linguist-common': patch
----
-
-Exported new LanguageType type alias
diff --git a/.changeset/large-experts-poke.md b/.changeset/large-experts-poke.md
deleted file mode 100644
index 9f6ca640b6..0000000000
--- a/.changeset/large-experts-poke.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'@backstage/plugin-linguist-backend': patch
----
-
-Fixed bug in LinguistBackendClient.ts file where if the linguistJsOptions is specified and sent over to the linguist-js package it would get changed (another attribute would be added) causing future entities of the batch to fail with an error
diff --git a/.changeset/large-vans-cross.md b/.changeset/large-vans-cross.md
deleted file mode 100644
index f50b432742..0000000000
--- a/.changeset/large-vans-cross.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'@backstage/plugin-sonarqube': patch
----
-
-Remove sonarQube card disable class
diff --git a/.changeset/late-cows-turn.md b/.changeset/late-cows-turn.md
new file mode 100644
index 0000000000..7fa775ce22
--- /dev/null
+++ b/.changeset/late-cows-turn.md
@@ -0,0 +1,5 @@
+---
+'@backstage/plugin-catalog-backend': patch
+---
+
+Fixed a link to the frontend Backstage plugin that had pointed to itself.
diff --git a/.changeset/late-hounds-yell.md b/.changeset/late-hounds-yell.md
new file mode 100644
index 0000000000..903b161c35
--- /dev/null
+++ b/.changeset/late-hounds-yell.md
@@ -0,0 +1,5 @@
+---
+'@backstage/create-app': patch
+---
+
+Updated Dockerfile to include `apt-get update` when installing the SQLite dependency
diff --git a/.changeset/late-roses-dream.md b/.changeset/late-roses-dream.md
new file mode 100644
index 0000000000..b0c2316c95
--- /dev/null
+++ b/.changeset/late-roses-dream.md
@@ -0,0 +1,5 @@
+---
+'@backstage/plugin-code-coverage-backend': patch
+---
+
+Add text body parser for LCOV reports
diff --git a/.changeset/lazy-pugs-wash.md b/.changeset/lazy-pugs-wash.md
deleted file mode 100644
index 923ef5b116..0000000000
--- a/.changeset/lazy-pugs-wash.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'@backstage/plugin-app-node': minor
----
-
-Added the `app` plugin node library, initially providing an extension point that can be used to configure a static fallback handler.
diff --git a/.changeset/lazy-pumas-hope.md b/.changeset/lazy-pumas-hope.md
new file mode 100644
index 0000000000..5e06014a3c
--- /dev/null
+++ b/.changeset/lazy-pumas-hope.md
@@ -0,0 +1,5 @@
+---
+'@backstage/plugin-user-settings': patch
+---
+
+changed auto theme tooltip title to camel case
diff --git a/.changeset/lazy-pumas-shop.md b/.changeset/lazy-pumas-shop.md
new file mode 100644
index 0000000000..13524aa741
--- /dev/null
+++ b/.changeset/lazy-pumas-shop.md
@@ -0,0 +1,8 @@
+---
+'@backstage/plugin-kubernetes-backend': patch
+'@backstage/plugin-permission-backend': patch
+'@backstage/plugin-techdocs-backend': patch
+'@backstage/plugin-permission-node': patch
+---
+
+Minor `package.json` update.
diff --git a/.changeset/lazy-rice-rule.md b/.changeset/lazy-rice-rule.md
new file mode 100644
index 0000000000..1c3a3c3250
--- /dev/null
+++ b/.changeset/lazy-rice-rule.md
@@ -0,0 +1,5 @@
+---
+'@backstage/plugin-scaffolder-backend': patch
+---
+
+Fixed the plugin and module ID of the alpha `catalogModuleTemplateKind` export.
diff --git a/.changeset/lemon-donuts-clap.md b/.changeset/lemon-donuts-clap.md
new file mode 100644
index 0000000000..75408d2584
--- /dev/null
+++ b/.changeset/lemon-donuts-clap.md
@@ -0,0 +1,5 @@
+---
+'@backstage/backend-plugin-api': patch
+---
+
+Ensure that root scoped services cannot accept (at a type level) plugin scoped deps
diff --git a/.changeset/light-drinks-rush.md b/.changeset/light-drinks-rush.md
new file mode 100644
index 0000000000..08383ab089
--- /dev/null
+++ b/.changeset/light-drinks-rush.md
@@ -0,0 +1,5 @@
+---
+'@backstage/cli': patch
+---
+
+Add experimental support for frontend package discovery.
diff --git a/.changeset/little-penguins-build.md b/.changeset/little-penguins-build.md
deleted file mode 100644
index 9e54a566e2..0000000000
--- a/.changeset/little-penguins-build.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'@backstage/plugin-catalog-backend': minor
----
-
-Support configuring applicable kinds for `AnnotateScmSlugEntityProcessor`
diff --git a/.changeset/long-flowers-sort.md b/.changeset/long-flowers-sort.md
new file mode 100644
index 0000000000..2f25260030
--- /dev/null
+++ b/.changeset/long-flowers-sort.md
@@ -0,0 +1,5 @@
+---
+'@backstage/plugin-org': patch
+---
+
+Entity relations toggle should by default be aggregated for User entities
diff --git a/.changeset/loud-apricots-destroy.md b/.changeset/loud-apricots-destroy.md
new file mode 100644
index 0000000000..e60be6dccf
--- /dev/null
+++ b/.changeset/loud-apricots-destroy.md
@@ -0,0 +1,5 @@
+---
+'@backstage/plugin-tech-radar': patch
+---
+
+Add description property for Rings which will be shown in the footer.
diff --git a/.changeset/loud-garlics-press.md b/.changeset/loud-garlics-press.md
deleted file mode 100644
index 28aee20619..0000000000
--- a/.changeset/loud-garlics-press.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'@backstage/cli': patch
----
-
-Reload the frontend when app config changes
diff --git a/.changeset/lovely-years-sniff.md b/.changeset/lovely-years-sniff.md
new file mode 100644
index 0000000000..09b86f7112
--- /dev/null
+++ b/.changeset/lovely-years-sniff.md
@@ -0,0 +1,5 @@
+---
+'@backstage/core-app-api': minor
+---
+
+The `OAuth` class which is used by all OAuth providers will now consider both the session expiration of both the Backstage identity as well as the upstream identity provider, and refresh the session with either of them is about to expire.
diff --git a/.changeset/lucky-chicken-hear.md b/.changeset/lucky-chicken-hear.md
new file mode 100644
index 0000000000..b7f0d6ec48
--- /dev/null
+++ b/.changeset/lucky-chicken-hear.md
@@ -0,0 +1,13 @@
+---
+'@backstage/plugin-code-coverage-backend': patch
+---
+
+Replace `express-xml-bodyparser` with `body-parser-xml`.
+
+`express-xml-bodyparser` was last updated 8 years ago
+and currently depends on a version of `xml2js` which
+contains a vulnerability.
+
+This change will swap it out in favor of `body-parser-xml`
+which is more maintained and depends on a more recent `xml2js`
+version without the vulnerability.
diff --git a/.changeset/lucky-chicken-lie.md b/.changeset/lucky-chicken-lie.md
new file mode 100644
index 0000000000..6edb3a36f6
--- /dev/null
+++ b/.changeset/lucky-chicken-lie.md
@@ -0,0 +1,5 @@
+---
+'@backstage/plugin-auth-backend-module-gitlab-provider': minor
+---
+
+New module for `@backstage/plugin-auth-backend` that adds a GitLab auth provider.
diff --git a/.changeset/many-tips-attend.md b/.changeset/many-tips-attend.md
new file mode 100644
index 0000000000..34b5898803
--- /dev/null
+++ b/.changeset/many-tips-attend.md
@@ -0,0 +1,5 @@
+---
+'@backstage/plugin-search-react': patch
+---
+
+Optionally initializes the search context with default settings for search queries only when the config is defined, rather than always overriding it.
diff --git a/.changeset/mean-carpets-provide.md b/.changeset/mean-carpets-provide.md
new file mode 100644
index 0000000000..b5e9f551d4
--- /dev/null
+++ b/.changeset/mean-carpets-provide.md
@@ -0,0 +1,5 @@
+---
+'@backstage/plugin-catalog-backend-module-azure': patch
+---
+
+Remove duplications from Azure search before committing the new locations to the catalog.
diff --git a/.changeset/mean-squids-relax.md b/.changeset/mean-squids-relax.md
deleted file mode 100644
index 558b42fcfc..0000000000
--- a/.changeset/mean-squids-relax.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'@backstage/plugin-home-react': patch
----
-
-Make `title` optional when defining the `createCardExtension`
diff --git a/.changeset/metal-buttons-search.md b/.changeset/metal-buttons-search.md
deleted file mode 100644
index 9578d8d2d4..0000000000
--- a/.changeset/metal-buttons-search.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'@backstage/plugin-scaffolder-backend': patch
----
-
-Adds examples to a few scaffolder actions.
diff --git a/.changeset/mighty-crabs-cheat.md b/.changeset/mighty-crabs-cheat.md
new file mode 100644
index 0000000000..ef2abbada4
--- /dev/null
+++ b/.changeset/mighty-crabs-cheat.md
@@ -0,0 +1,5 @@
+---
+'@backstage/plugin-auth-backend': patch
+---
+
+Added the ability to disable the built-in auth providers by passing `disableDefaultProviderFactories` to `createRouter`.
diff --git a/.changeset/mighty-lions-search-2.md b/.changeset/mighty-lions-search-2.md
deleted file mode 100644
index a7fb1a4a7d..0000000000
--- a/.changeset/mighty-lions-search-2.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'@backstage/backend-test-utils': minor
----
-
-**BREAKING**: Renamed `mockServices.config` to `mockServices.rootConfig`.
diff --git a/.changeset/mighty-lions-search-3.md b/.changeset/mighty-lions-search-3.md
deleted file mode 100644
index 6b381ce2b2..0000000000
--- a/.changeset/mighty-lions-search-3.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'@backstage/backend-app-api': minor
----
-
-**BREAKING**: Renamed `configServiceFactory` to `rootConfigServiceFactory`.
diff --git a/.changeset/mighty-lions-search.md b/.changeset/mighty-lions-search.md
deleted file mode 100644
index 6d2ffd02c0..0000000000
--- a/.changeset/mighty-lions-search.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'@backstage/backend-plugin-api': minor
----
-
-**BREAKING**: Renamed `coreServices.config` to `coreServices.rootConfig`.
diff --git a/.changeset/modern-trees-add.md b/.changeset/modern-trees-add.md
new file mode 100644
index 0000000000..bb5ea78a5b
--- /dev/null
+++ b/.changeset/modern-trees-add.md
@@ -0,0 +1,6 @@
+---
+'@backstage/plugin-techdocs': minor
+'@backstage/plugin-catalog': minor
+---
+
+This change allows a new annotation of `backstage.io/techdocs-entity` this ref allows you to reference another entity for its TechDocs. This allows you have a single TechDoc for all items in a system, for example you might have a frontend and a backend in the same repo. This would allow you to have TechDocs build under a `System` entity while referencing the system e.g.: `backstage.io/techdocs-entity: system:default/example` that will show the systems docs in both the TechDocs button and the TechDocs tab without needing to do duplicate builds and filling the TechDocs page with garbage.
diff --git a/.changeset/nasty-cherries-exercise.md b/.changeset/nasty-cherries-exercise.md
new file mode 100644
index 0000000000..bb4386e978
--- /dev/null
+++ b/.changeset/nasty-cherries-exercise.md
@@ -0,0 +1,5 @@
+---
+'@backstage/plugin-kubernetes-backend': patch
+---
+
+fix "undefined" kind for custom resources
diff --git a/.changeset/nasty-forks-beg.md b/.changeset/nasty-forks-beg.md
new file mode 100644
index 0000000000..0662431453
--- /dev/null
+++ b/.changeset/nasty-forks-beg.md
@@ -0,0 +1,14 @@
+---
+'@backstage/plugin-search-react': minor
+'@backstage/plugin-search': minor
+---
+
+The SearchPage component can now be configured via app-config.yaml with default query parameters to define how it behaves when it is first loaded or reset. Check out the following example:
+
+```yaml
+search:
+  query:
+    pageLimit: 50
+```
+
+Acceptable values for `pageLimit` are `10`, `25`, `50` or `100`.
diff --git a/.changeset/nasty-snails-complain.md b/.changeset/nasty-snails-complain.md
new file mode 100644
index 0000000000..d7d2cac319
--- /dev/null
+++ b/.changeset/nasty-snails-complain.md
@@ -0,0 +1,5 @@
+---
+'@backstage/plugin-kubernetes': patch
+---
+
+fix logs dialog min height
diff --git a/.changeset/nasty-worms-share.md b/.changeset/nasty-worms-share.md
new file mode 100644
index 0000000000..4be8315cce
--- /dev/null
+++ b/.changeset/nasty-worms-share.md
@@ -0,0 +1,5 @@
+---
+'@backstage/plugin-playlist': patch
+---
+
+Fix a bug that led to errors being thrown in guest mode
diff --git a/.changeset/neat-coins-raise.md b/.changeset/neat-coins-raise.md
deleted file mode 100644
index c3045634bf..0000000000
--- a/.changeset/neat-coins-raise.md
+++ /dev/null
@@ -1,17 +0,0 @@
----
-'@backstage/plugin-catalog-backend-module-bitbucket-server': patch
-'@backstage/plugin-catalog-backend-module-bitbucket-cloud': patch
-'@backstage/plugin-catalog-backend-module-puppetdb': patch
-'@backstage/plugin-catalog-backend-module-msgraph': patch
-'@backstage/plugin-catalog-backend-module-gerrit': patch
-'@backstage/plugin-catalog-backend-module-github': patch
-'@backstage/plugin-catalog-backend-module-gitlab': patch
-'@backstage/plugin-events-backend-module-aws-sqs': patch
-'@backstage/plugin-catalog-backend-module-azure': patch
-'@backstage/plugin-catalog-backend-module-aws': patch
-'@backstage/backend-common': patch
-'@backstage/plugin-jenkins-backend': patch
-'@backstage/plugin-proxy-backend': patch
----
-
-Fixed invalid configuration schema. The configuration schema may be more strict as a result.
diff --git a/.changeset/neat-lamps-press.md b/.changeset/neat-lamps-press.md
deleted file mode 100644
index 23c0b15fb7..0000000000
--- a/.changeset/neat-lamps-press.md
+++ /dev/null
@@ -1,8 +0,0 @@
----
-'@backstage/core-components': patch
-'@backstage/plugin-splunk-on-call': patch
-'@backstage/plugin-xcmetrics': patch
-'@backstage/plugin-catalog': patch
----
-
-Prefer simple `theme.spacing` without string interpolation
diff --git a/.changeset/new-sheep-cover.md b/.changeset/new-sheep-cover.md
new file mode 100644
index 0000000000..390de1a9b3
--- /dev/null
+++ b/.changeset/new-sheep-cover.md
@@ -0,0 +1,5 @@
+---
+'@backstage/plugin-linguist-backend': patch
+---
+
+When creating the router using `createRouterFromConfig` or using the plugin for the new backend system the `linguist.useSourceLocation` configuration is now optional.
diff --git a/.changeset/nice-forks-remain.md b/.changeset/nice-forks-remain.md
new file mode 100644
index 0000000000..6d833ff283
--- /dev/null
+++ b/.changeset/nice-forks-remain.md
@@ -0,0 +1,5 @@
+---
+'@backstage/plugin-code-coverage': patch
+---
+
+Use fetchApi to ensure authorization is used when fetching code-coverage data
diff --git a/.changeset/ninety-horses-remember.md b/.changeset/ninety-horses-remember.md
new file mode 100644
index 0000000000..22ef53b340
--- /dev/null
+++ b/.changeset/ninety-horses-remember.md
@@ -0,0 +1,5 @@
+---
+'@backstage/backend-app-api': patch
+---
+
+The experimental backend feature discovery now only considers default exports from packages. It no longer filters packages to include based on the package role, except that `'cli'` packages are ignored. However, the `"backstage"` field is still required in `package.json`.
diff --git a/.changeset/ninety-news-visit.md b/.changeset/ninety-news-visit.md
new file mode 100644
index 0000000000..1b990f9ac7
--- /dev/null
+++ b/.changeset/ninety-news-visit.md
@@ -0,0 +1,5 @@
+---
+'@backstage/plugin-auth-backend': patch
+---
+
+The algorithm used when generating Backstage tokens can be configured via `auth.identityTokenAlgorithm`.
diff --git a/.changeset/odd-avocados-buy.md b/.changeset/odd-avocados-buy.md
deleted file mode 100644
index 9e71c19fc0..0000000000
--- a/.changeset/odd-avocados-buy.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'@backstage/plugin-scaffolder-backend-module-confluence-to-markdown': patch
----
-
-Use `fetchContents` directly instead of a `fetchPlainAction`
diff --git a/.changeset/old-geese-drive.md b/.changeset/old-geese-drive.md
new file mode 100644
index 0000000000..ddaa7ad30a
--- /dev/null
+++ b/.changeset/old-geese-drive.md
@@ -0,0 +1,5 @@
+---
+'@backstage/backend-test-utils': patch
+---
+
+Extended `mockService` to also include mocked variants, for example `mockServices.lifecycle.mock()`. The returned mocked implementation will have a `factory` property which is a service factory for itself. You can also pass a partial implementation of the service to the mock function to use a mock implementation of specific methods.
diff --git a/.changeset/orange-houses-fly.md b/.changeset/orange-houses-fly.md
new file mode 100644
index 0000000000..546484304c
--- /dev/null
+++ b/.changeset/orange-houses-fly.md
@@ -0,0 +1,5 @@
+---
+'@backstage/integration': patch
+---
+
+Gitiles: Fixed auth prefix issue
diff --git a/.changeset/pink-cups-rescue.md b/.changeset/pink-cups-rescue.md
new file mode 100644
index 0000000000..abb69e88b7
--- /dev/null
+++ b/.changeset/pink-cups-rescue.md
@@ -0,0 +1,28 @@
+---
+'@backstage/plugin-auth-node': minor
+---
+
+Introduced a new system for building auth providers for `@backstage/plugin-auth-backend`, which both increases the amount of code re-use across providers, and also works better with the new backend system.
+
+Many existing types have been moved from `@backstage/plugin-auth-backend` in order to avoid a direct dependency on the plugin from modules.
+
+Auth provider integrations are now primarily implemented through a pattern of creating "authenticators", which are in turn specific to each kind of integrations. Initially there are two types: `createOAuthAuthenticator` and `createProxyAuthenticator`. These come paired with functions that let you create the corresponding route handlers, `createOAuthRouteHandlers` and `createProxyAuthRouteHandlers`, as well as provider factories, `createOAuthProviderFactory` and `createProxyAuthProviderFactory`. This new authenticator pattern allows the sign-in logic to be separated from the auth integration logic, allowing it to be completely re-used across all providers of the same kind.
+
+The new provider factories also implement a new declarative way to configure sign-in resolvers, rather than configuration through code. Sign-in resolvers can now be configured through the `resolvers` configuration key, where the first resolver that provides an identity will be used, for example:
+
+```yaml
+auth:
+  providers:
+    google:
+      development:
+        clientId: ...
+        clientSecret: ...
+        signIn:
+          resolvers:
+            - resolver: emailMatchingUserEntityAnnotation
+            - resolver: emailLocalPartMatchingUserEntityName
+```
+
+These configurable resolvers are created with a new `createSignInResolverFactory` function, which creates a sign-in resolver factory, optionally with an options schema that will be used both when configuring the sign-in resolver through configuration and code.
+
+The internal helpers from `@backstage/plugin-auth-backend` that were used to implement auth providers using passport strategies have now also been made available as public API, through `PassportHelpers` and `PassportOAuthAuthenticatorHelper`.
diff --git a/.changeset/pink-months-hammer.md b/.changeset/pink-months-hammer.md
new file mode 100644
index 0000000000..20a484a389
--- /dev/null
+++ b/.changeset/pink-months-hammer.md
@@ -0,0 +1,5 @@
+---
+'@backstage/plugin-permission-backend': patch
+---
+
+Moved `permissionModuleAllowAllPolicy` to `@backstage/plugin-permission-backend-module-allow-all-policy`
diff --git a/.changeset/pink-squids-nail.md b/.changeset/pink-squids-nail.md
deleted file mode 100644
index 989b5034d5..0000000000
--- a/.changeset/pink-squids-nail.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'@backstage/plugin-catalog-backend-module-unprocessed': minor
----
-
-**BREAKING**: Fixing typo in exported module. You will have to rename the import to the correct spelling. `UnprocessedEntites` -> `UnprocessedEntities`
diff --git a/.changeset/polite-forks-grin.md b/.changeset/polite-forks-grin.md
new file mode 100644
index 0000000000..8f6570ccbc
--- /dev/null
+++ b/.changeset/polite-forks-grin.md
@@ -0,0 +1,5 @@
+---
+'@backstage/plugin-catalog-backend': patch
+---
+
+Fixed validation of the `fullTextFilterFields` query parameter.
diff --git a/.changeset/polite-plums-share.md b/.changeset/polite-plums-share.md
new file mode 100644
index 0000000000..09c980b921
--- /dev/null
+++ b/.changeset/polite-plums-share.md
@@ -0,0 +1,5 @@
+---
+'@backstage/plugin-catalog-backend': patch
+---
+
+Added some examples to the catalog OpenAPI definition
diff --git a/.changeset/poor-olives-own.md b/.changeset/poor-olives-own.md
new file mode 100644
index 0000000000..6eb8b5ac2b
--- /dev/null
+++ b/.changeset/poor-olives-own.md
@@ -0,0 +1,5 @@
+---
+'@backstage/plugin-catalog-backend': patch
+---
+
+Fixes an issue where `order` was not a recognized parameter for the `/entities` endpoint.
diff --git a/.changeset/poor-years-appear.md b/.changeset/poor-years-appear.md
new file mode 100644
index 0000000000..d5b53a7051
--- /dev/null
+++ b/.changeset/poor-years-appear.md
@@ -0,0 +1,5 @@
+---
+'@backstage/plugin-entity-feedback-backend': patch
+---
+
+Improve backend logging if method calls fail
diff --git a/.changeset/popular-clocks-whisper.md b/.changeset/popular-clocks-whisper.md
new file mode 100644
index 0000000000..7c1d86ab03
--- /dev/null
+++ b/.changeset/popular-clocks-whisper.md
@@ -0,0 +1,5 @@
+---
+'@backstage/cli': patch
+---
+
+Fixed a bug where package exports entry points could not be `.tsx` files.
diff --git a/.changeset/popular-coins-tap.md b/.changeset/popular-coins-tap.md
new file mode 100644
index 0000000000..3ece9e20b1
--- /dev/null
+++ b/.changeset/popular-coins-tap.md
@@ -0,0 +1,5 @@
+---
+'@backstage/backend-tasks': patch
+---
+
+Use `readDurationFromConfig` from the config package
diff --git a/.changeset/popular-fans-camp.md b/.changeset/popular-fans-camp.md
deleted file mode 100644
index 47fc095ef8..0000000000
--- a/.changeset/popular-fans-camp.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'@backstage/plugin-auth-backend': patch
----
-
-Updated config schema to match what was being used in code
diff --git a/.changeset/popular-readers-allow.md b/.changeset/popular-readers-allow.md
new file mode 100644
index 0000000000..b89e0c264e
--- /dev/null
+++ b/.changeset/popular-readers-allow.md
@@ -0,0 +1,5 @@
+---
+'@backstage/core-plugin-api': minor
+---
+
+Added the optional `expiresAt` field that may now be part of a `BackstageIdentityResponse`.
diff --git a/.changeset/pre.json b/.changeset/pre.json
index 605f1ea771..2345e3af67 100644
--- a/.changeset/pre.json
+++ b/.changeset/pre.json
@@ -2,280 +2,353 @@
   "mode": "pre",
   "tag": "next",
   "initialVersions": {
-    "example-app": "0.2.85",
-    "@backstage/app-defaults": "1.4.1",
-    "example-backend": "0.2.85",
-    "@backstage/backend-app-api": "0.4.5",
-    "@backstage/backend-common": "0.19.1",
-    "@backstage/backend-defaults": "0.1.12",
+    "example-app": "0.2.86",
+    "@backstage/app-defaults": "1.4.2",
+    "example-backend": "0.2.86",
+    "@backstage/backend-app-api": "0.5.0",
+    "@backstage/backend-common": "0.19.2",
+    "@backstage/backend-defaults": "0.2.0",
     "@backstage/backend-dev-utils": "0.1.1",
-    "example-backend-next": "0.0.13",
-    "@backstage/backend-openapi-utils": "0.0.2",
-    "@backstage/backend-plugin-api": "0.5.4",
-    "@backstage/backend-tasks": "0.5.4",
-    "@backstage/backend-test-utils": "0.1.39",
+    "example-backend-next": "0.0.14",
+    "@backstage/backend-openapi-utils": "0.0.3",
+    "@backstage/backend-plugin-api": "0.6.0",
+    "@backstage/backend-tasks": "0.5.5",
+    "@backstage/backend-test-utils": "0.2.0",
     "@backstage/catalog-client": "1.4.3",
     "@backstage/catalog-model": "1.4.1",
-    "@backstage/cli": "0.22.9",
+    "@backstage/cli": "0.22.10",
     "@backstage/cli-common": "0.1.12",
-    "@backstage/cli-node": "0.1.2",
+    "@backstage/cli-node": "0.1.3",
     "@backstage/codemods": "0.1.45",
     "@backstage/config": "1.0.8",
-    "@backstage/config-loader": "1.3.2",
-    "@backstage/core-app-api": "1.9.0",
-    "@backstage/core-components": "0.13.3",
+    "@backstage/config-loader": "1.4.0",
+    "@backstage/core-app-api": "1.9.1",
+    "@backstage/core-components": "0.13.4",
     "@backstage/core-plugin-api": "1.5.3",
-    "@backstage/create-app": "0.5.3",
-    "@backstage/dev-utils": "1.0.17",
-    "e2e-test": "0.2.5",
+    "@backstage/create-app": "0.5.4",
+    "@backstage/dev-utils": "1.0.18",
+    "e2e-test": "0.2.6",
     "@backstage/errors": "1.2.1",
     "@backstage/eslint-plugin": "0.1.3",
-    "@backstage/integration": "1.5.1",
+    "@backstage/integration": "1.6.0",
     "@backstage/integration-aws-node": "0.1.5",
-    "@backstage/integration-react": "1.1.15",
+    "@backstage/integration-react": "1.1.16",
     "@backstage/release-manifests": "0.0.9",
-    "@backstage/repo-tools": "0.3.2",
-    "@techdocs/cli": "1.4.4",
-    "techdocs-cli-embedded-app": "0.2.84",
-    "@backstage/test-utils": "1.4.1",
+    "@backstage/repo-tools": "0.3.3",
+    "@techdocs/cli": "1.4.5",
+    "techdocs-cli-embedded-app": "0.2.85",
+    "@backstage/test-utils": "1.4.2",
     "@backstage/theme": "0.4.1",
     "@backstage/types": "1.1.0",
     "@backstage/version-bridge": "1.0.4",
-    "@backstage/plugin-adr": "0.6.3",
-    "@backstage/plugin-adr-backend": "0.3.5",
-    "@backstage/plugin-adr-common": "0.2.11",
-    "@backstage/plugin-airbrake": "0.3.20",
-    "@backstage/plugin-airbrake-backend": "0.2.20",
-    "@backstage/plugin-allure": "0.1.36",
-    "@backstage/plugin-analytics-module-ga": "0.1.31",
-    "@backstage/plugin-analytics-module-ga4": "0.1.2",
-    "@backstage/plugin-apache-airflow": "0.2.13",
-    "@backstage/plugin-api-docs": "0.9.6",
+    "@backstage/plugin-adr": "0.6.4",
+    "@backstage/plugin-adr-backend": "0.3.6",
+    "@backstage/plugin-adr-common": "0.2.12",
+    "@backstage/plugin-airbrake": "0.3.21",
+    "@backstage/plugin-airbrake-backend": "0.2.21",
+    "@backstage/plugin-allure": "0.1.37",
+    "@backstage/plugin-analytics-module-ga": "0.1.32",
+    "@backstage/plugin-analytics-module-ga4": "0.1.3",
+    "@backstage/plugin-analytics-module-newrelic-browser": "0.0.1",
+    "@backstage/plugin-apache-airflow": "0.2.14",
+    "@backstage/plugin-api-docs": "0.9.7",
     "@backstage/plugin-api-docs-module-protoc-gen-doc": "0.1.2",
-    "@backstage/plugin-apollo-explorer": "0.1.13",
-    "@backstage/plugin-app-backend": "0.3.47",
-    "@backstage/plugin-auth-backend": "0.18.5",
-    "@backstage/plugin-auth-node": "0.2.16",
-    "@backstage/plugin-azure-devops": "0.3.2",
-    "@backstage/plugin-azure-devops-backend": "0.3.26",
+    "@backstage/plugin-apollo-explorer": "0.1.14",
+    "@backstage/plugin-app-backend": "0.3.48",
+    "@backstage/plugin-app-node": "0.1.0",
+    "@backstage/plugin-auth-backend": "0.18.6",
+    "@backstage/plugin-auth-node": "0.2.17",
+    "@backstage/plugin-azure-devops": "0.3.3",
+    "@backstage/plugin-azure-devops-backend": "0.3.27",
     "@backstage/plugin-azure-devops-common": "0.3.0",
-    "@backstage/plugin-azure-sites": "0.1.9",
-    "@backstage/plugin-azure-sites-backend": "0.1.9",
+    "@backstage/plugin-azure-sites": "0.1.10",
+    "@backstage/plugin-azure-sites-backend": "0.1.10",
     "@backstage/plugin-azure-sites-common": "0.1.0",
-    "@backstage/plugin-badges": "0.2.44",
-    "@backstage/plugin-badges-backend": "0.2.2",
-    "@backstage/plugin-bazaar": "0.2.11",
-    "@backstage/plugin-bazaar-backend": "0.2.10",
-    "@backstage/plugin-bitbucket-cloud-common": "0.2.8",
-    "@backstage/plugin-bitrise": "0.1.47",
-    "@backstage/plugin-catalog": "1.12.0",
-    "@backstage/plugin-catalog-backend": "1.11.0",
-    "@backstage/plugin-catalog-backend-module-aws": "0.2.2",
-    "@backstage/plugin-catalog-backend-module-azure": "0.1.18",
-    "@backstage/plugin-catalog-backend-module-bitbucket": "0.2.14",
-    "@backstage/plugin-catalog-backend-module-bitbucket-cloud": "0.1.14",
-    "@backstage/plugin-catalog-backend-module-bitbucket-server": "0.1.12",
-    "@backstage/plugin-catalog-backend-module-gerrit": "0.1.15",
-    "@backstage/plugin-catalog-backend-module-github": "0.3.2",
-    "@backstage/plugin-catalog-backend-module-gitlab": "0.2.3",
-    "@backstage/plugin-catalog-backend-module-incremental-ingestion": "0.4.0",
-    "@backstage/plugin-catalog-backend-module-ldap": "0.5.14",
-    "@backstage/plugin-catalog-backend-module-msgraph": "0.5.6",
-    "@backstage/plugin-catalog-backend-module-openapi": "0.1.13",
-    "@backstage/plugin-catalog-backend-module-puppetdb": "0.1.4",
-    "@backstage/plugin-catalog-backend-module-unprocessed": "0.1.1",
+    "@backstage/plugin-badges": "0.2.45",
+    "@backstage/plugin-badges-backend": "0.2.3",
+    "@backstage/plugin-bazaar": "0.2.12",
+    "@backstage/plugin-bazaar-backend": "0.2.11",
+    "@backstage/plugin-bitbucket-cloud-common": "0.2.9",
+    "@backstage/plugin-bitrise": "0.1.48",
+    "@backstage/plugin-catalog": "1.12.1",
+    "@backstage/plugin-catalog-backend": "1.12.0",
+    "@backstage/plugin-catalog-backend-module-aws": "0.2.3",
+    "@backstage/plugin-catalog-backend-module-azure": "0.1.19",
+    "@backstage/plugin-catalog-backend-module-bitbucket": "0.2.15",
+    "@backstage/plugin-catalog-backend-module-bitbucket-cloud": "0.1.15",
+    "@backstage/plugin-catalog-backend-module-bitbucket-server": "0.1.13",
+    "@backstage/plugin-catalog-backend-module-gcp": "0.1.0",
+    "@backstage/plugin-catalog-backend-module-gerrit": "0.1.16",
+    "@backstage/plugin-catalog-backend-module-github": "0.3.3",
+    "@backstage/plugin-catalog-backend-module-gitlab": "0.2.4",
+    "@backstage/plugin-catalog-backend-module-incremental-ingestion": "0.4.1",
+    "@backstage/plugin-catalog-backend-module-ldap": "0.5.15",
+    "@backstage/plugin-catalog-backend-module-msgraph": "0.5.7",
+    "@backstage/plugin-catalog-backend-module-openapi": "0.1.14",
+    "@backstage/plugin-catalog-backend-module-puppetdb": "0.1.5",
+    "@backstage/plugin-catalog-backend-module-unprocessed": "0.2.0",
     "@backstage/plugin-catalog-common": "1.0.15",
-    "@internal/plugin-catalog-customized": "0.0.12",
-    "@backstage/plugin-catalog-graph": "0.2.32",
+    "@internal/plugin-catalog-customized": "0.0.13",
+    "@backstage/plugin-catalog-graph": "0.2.33",
     "@backstage/plugin-catalog-graphql": "0.3.22",
-    "@backstage/plugin-catalog-import": "0.9.10",
-    "@backstage/plugin-catalog-node": "1.4.0",
-    "@backstage/plugin-catalog-react": "1.8.0",
-    "@backstage/plugin-catalog-unprocessed-entities": "0.1.1",
-    "@backstage/plugin-cicd-statistics": "0.1.22",
-    "@backstage/plugin-cicd-statistics-module-gitlab": "0.1.16",
-    "@backstage/plugin-circleci": "0.3.20",
-    "@backstage/plugin-cloudbuild": "0.3.20",
-    "@backstage/plugin-code-climate": "0.1.20",
-    "@backstage/plugin-code-coverage": "0.2.13",
-    "@backstage/plugin-code-coverage-backend": "0.2.13",
-    "@backstage/plugin-codescene": "0.1.15",
-    "@backstage/plugin-config-schema": "0.1.43",
-    "@backstage/plugin-cost-insights": "0.12.9",
+    "@backstage/plugin-catalog-import": "0.9.11",
+    "@backstage/plugin-catalog-node": "1.4.1",
+    "@backstage/plugin-catalog-react": "1.8.1",
+    "@backstage/plugin-catalog-unprocessed-entities": "0.1.2",
+    "@backstage/plugin-cicd-statistics": "0.1.23",
+    "@backstage/plugin-cicd-statistics-module-gitlab": "0.1.17",
+    "@backstage/plugin-circleci": "0.3.21",
+    "@backstage/plugin-cloudbuild": "0.3.21",
+    "@backstage/plugin-code-climate": "0.1.21",
+    "@backstage/plugin-code-coverage": "0.2.14",
+    "@backstage/plugin-code-coverage-backend": "0.2.14",
+    "@backstage/plugin-codescene": "0.1.16",
+    "@backstage/plugin-config-schema": "0.1.44",
+    "@backstage/plugin-cost-insights": "0.12.10",
     "@backstage/plugin-cost-insights-common": "0.1.1",
-    "@backstage/plugin-devtools": "0.1.2",
-    "@backstage/plugin-devtools-backend": "0.1.2",
-    "@backstage/plugin-devtools-common": "0.1.2",
-    "@backstage/plugin-dynatrace": "7.0.0",
-    "@backstage/plugin-entity-feedback": "0.2.3",
-    "@backstage/plugin-entity-feedback-backend": "0.1.5",
-    "@backstage/plugin-entity-feedback-common": "0.1.1",
-    "@backstage/plugin-entity-validation": "0.1.5",
-    "@backstage/plugin-events-backend": "0.2.8",
-    "@backstage/plugin-events-backend-module-aws-sqs": "0.2.2",
-    "@backstage/plugin-events-backend-module-azure": "0.1.9",
-    "@backstage/plugin-events-backend-module-bitbucket-cloud": "0.1.9",
-    "@backstage/plugin-events-backend-module-gerrit": "0.1.9",
-    "@backstage/plugin-events-backend-module-github": "0.1.9",
-    "@backstage/plugin-events-backend-module-gitlab": "0.1.9",
-    "@backstage/plugin-events-backend-test-utils": "0.1.9",
-    "@backstage/plugin-events-node": "0.2.8",
-    "@internal/plugin-todo-list": "1.0.15",
-    "@internal/plugin-todo-list-backend": "1.0.15",
+    "@backstage/plugin-devtools": "0.1.3",
+    "@backstage/plugin-devtools-backend": "0.1.3",
+    "@backstage/plugin-devtools-common": "0.1.3",
+    "@backstage/plugin-dynatrace": "7.0.1",
+    "@backstage/plugin-entity-feedback": "0.2.4",
+    "@backstage/plugin-entity-feedback-backend": "0.1.6",
+    "@backstage/plugin-entity-feedback-common": "0.1.2",
+    "@backstage/plugin-entity-validation": "0.1.6",
+    "@backstage/plugin-events-backend": "0.2.9",
+    "@backstage/plugin-events-backend-module-aws-sqs": "0.2.3",
+    "@backstage/plugin-events-backend-module-azure": "0.1.10",
+    "@backstage/plugin-events-backend-module-bitbucket-cloud": "0.1.10",
+    "@backstage/plugin-events-backend-module-gerrit": "0.1.10",
+    "@backstage/plugin-events-backend-module-github": "0.1.10",
+    "@backstage/plugin-events-backend-module-gitlab": "0.1.10",
+    "@backstage/plugin-events-backend-test-utils": "0.1.10",
+    "@backstage/plugin-events-node": "0.2.9",
+    "@internal/plugin-todo-list": "1.0.16",
+    "@internal/plugin-todo-list-backend": "1.0.16",
     "@internal/plugin-todo-list-common": "1.0.12",
-    "@backstage/plugin-explore": "0.4.6",
-    "@backstage/plugin-explore-backend": "0.0.9",
+    "@backstage/plugin-explore": "0.4.7",
+    "@backstage/plugin-explore-backend": "0.0.10",
     "@backstage/plugin-explore-common": "0.0.1",
     "@backstage/plugin-explore-react": "0.0.30",
-    "@backstage/plugin-firehydrant": "0.2.4",
-    "@backstage/plugin-fossa": "0.2.52",
-    "@backstage/plugin-gcalendar": "0.3.16",
-    "@backstage/plugin-gcp-projects": "0.3.39",
-    "@backstage/plugin-git-release-manager": "0.3.33",
-    "@backstage/plugin-github-actions": "0.6.1",
-    "@backstage/plugin-github-deployments": "0.1.51",
-    "@backstage/plugin-github-issues": "0.2.9",
-    "@backstage/plugin-github-pull-requests-board": "0.1.14",
-    "@backstage/plugin-gitops-profiles": "0.3.38",
-    "@backstage/plugin-gocd": "0.1.26",
-    "@backstage/plugin-graphiql": "0.2.52",
-    "@backstage/plugin-graphql-backend": "0.1.37",
-    "@backstage/plugin-graphql-voyager": "0.1.5",
-    "@backstage/plugin-home": "0.5.4",
-    "@backstage/plugin-home-react": "0.1.1",
-    "@backstage/plugin-ilert": "0.2.9",
-    "@backstage/plugin-jenkins": "0.8.2",
-    "@backstage/plugin-jenkins-backend": "0.2.2",
-    "@backstage/plugin-jenkins-common": "0.1.17",
-    "@backstage/plugin-kafka": "0.3.20",
-    "@backstage/plugin-kafka-backend": "0.2.40",
-    "@backstage/plugin-kubernetes": "0.9.3",
-    "@backstage/plugin-kubernetes-backend": "0.11.2",
+    "@backstage/plugin-firehydrant": "0.2.5",
+    "@backstage/plugin-fossa": "0.2.53",
+    "@backstage/plugin-gcalendar": "0.3.17",
+    "@backstage/plugin-gcp-projects": "0.3.40",
+    "@backstage/plugin-git-release-manager": "0.3.34",
+    "@backstage/plugin-github-actions": "0.6.2",
+    "@backstage/plugin-github-deployments": "0.1.52",
+    "@backstage/plugin-github-issues": "0.2.10",
+    "@backstage/plugin-github-pull-requests-board": "0.1.15",
+    "@backstage/plugin-gitops-profiles": "0.3.39",
+    "@backstage/plugin-gocd": "0.1.27",
+    "@backstage/plugin-graphiql": "0.2.53",
+    "@backstage/plugin-graphql-backend": "0.1.38",
+    "@backstage/plugin-graphql-voyager": "0.1.6",
+    "@backstage/plugin-home": "0.5.5",
+    "@backstage/plugin-home-react": "0.1.2",
+    "@backstage/plugin-ilert": "0.2.10",
+    "@backstage/plugin-jenkins": "0.8.3",
+    "@backstage/plugin-jenkins-backend": "0.2.3",
+    "@backstage/plugin-jenkins-common": "0.1.18",
+    "@backstage/plugin-kafka": "0.3.21",
+    "@backstage/plugin-kafka-backend": "0.2.41",
+    "@backstage/plugin-kubernetes": "0.10.0",
+    "@backstage/plugin-kubernetes-backend": "0.11.3",
     "@backstage/plugin-kubernetes-common": "0.6.5",
-    "@backstage/plugin-lighthouse": "0.4.5",
-    "@backstage/plugin-lighthouse-backend": "0.2.3",
+    "@backstage/plugin-lighthouse": "0.4.6",
+    "@backstage/plugin-lighthouse-backend": "0.2.4",
     "@backstage/plugin-lighthouse-common": "0.1.2",
-    "@backstage/plugin-linguist": "0.1.5",
-    "@backstage/plugin-linguist-backend": "0.3.1",
-    "@backstage/plugin-linguist-common": "0.1.0",
-    "@backstage/plugin-microsoft-calendar": "0.1.5",
-    "@backstage/plugin-newrelic": "0.3.38",
-    "@backstage/plugin-newrelic-dashboard": "0.2.13",
-    "@backstage/plugin-nomad": "0.1.1",
-    "@backstage/plugin-nomad-backend": "0.1.1",
-    "@backstage/plugin-octopus-deploy": "0.2.2",
-    "@backstage/plugin-org": "0.6.10",
-    "@backstage/plugin-org-react": "0.1.9",
-    "@backstage/plugin-pagerduty": "0.6.1",
-    "@backstage/plugin-periskop": "0.1.18",
-    "@backstage/plugin-periskop-backend": "0.1.18",
-    "@backstage/plugin-permission-backend": "0.5.22",
+    "@backstage/plugin-linguist": "0.1.6",
+    "@backstage/plugin-linguist-backend": "0.4.0",
+    "@backstage/plugin-linguist-common": "0.1.1",
+    "@backstage/plugin-microsoft-calendar": "0.1.6",
+    "@backstage/plugin-newrelic": "0.3.39",
+    "@backstage/plugin-newrelic-dashboard": "0.2.14",
+    "@backstage/plugin-nomad": "0.1.2",
+    "@backstage/plugin-nomad-backend": "0.1.2",
+    "@backstage/plugin-octopus-deploy": "0.2.3",
+    "@backstage/plugin-org": "0.6.11",
+    "@backstage/plugin-org-react": "0.1.10",
+    "@backstage/plugin-pagerduty": "0.6.2",
+    "@backstage/plugin-periskop": "0.1.19",
+    "@backstage/plugin-periskop-backend": "0.1.19",
+    "@backstage/plugin-permission-backend": "0.5.23",
     "@backstage/plugin-permission-common": "0.7.7",
-    "@backstage/plugin-permission-node": "0.7.10",
+    "@backstage/plugin-permission-node": "0.7.11",
     "@backstage/plugin-permission-react": "0.4.14",
-    "@backstage/plugin-playlist": "0.1.12",
-    "@backstage/plugin-playlist-backend": "0.3.3",
-    "@backstage/plugin-playlist-common": "0.1.8",
-    "@backstage/plugin-proxy-backend": "0.2.41",
-    "@backstage/plugin-puppetdb": "0.1.3",
-    "@backstage/plugin-rollbar": "0.4.20",
-    "@backstage/plugin-rollbar-backend": "0.1.44",
-    "@backstage/plugin-scaffolder": "1.14.1",
-    "@backstage/plugin-scaffolder-backend": "1.15.1",
-    "@backstage/plugin-scaffolder-backend-module-confluence-to-markdown": "0.2.0",
-    "@backstage/plugin-scaffolder-backend-module-cookiecutter": "0.2.23",
-    "@backstage/plugin-scaffolder-backend-module-gitlab": "0.2.2",
-    "@backstage/plugin-scaffolder-backend-module-rails": "0.4.16",
-    "@backstage/plugin-scaffolder-backend-module-sentry": "0.1.7",
-    "@backstage/plugin-scaffolder-backend-module-yeoman": "0.2.20",
-    "@backstage/plugin-scaffolder-common": "1.3.2",
-    "@backstage/plugin-scaffolder-node": "0.1.5",
-    "@backstage/plugin-scaffolder-react": "1.5.1",
-    "@backstage/plugin-search": "1.3.3",
-    "@backstage/plugin-search-backend": "1.3.3",
-    "@backstage/plugin-search-backend-module-catalog": "0.1.3",
-    "@backstage/plugin-search-backend-module-elasticsearch": "1.3.2",
-    "@backstage/plugin-search-backend-module-explore": "0.1.3",
-    "@backstage/plugin-search-backend-module-pg": "0.5.8",
-    "@backstage/plugin-search-backend-module-techdocs": "0.1.3",
-    "@backstage/plugin-search-backend-node": "1.2.3",
+    "@backstage/plugin-playlist": "0.1.13",
+    "@backstage/plugin-playlist-backend": "0.3.4",
+    "@backstage/plugin-playlist-common": "0.1.9",
+    "@backstage/plugin-proxy-backend": "0.3.0",
+    "@backstage/plugin-puppetdb": "0.1.4",
+    "@backstage/plugin-rollbar": "0.4.21",
+    "@backstage/plugin-rollbar-backend": "0.1.45",
+    "@backstage/plugin-scaffolder": "1.14.2",
+    "@backstage/plugin-scaffolder-backend": "1.16.0",
+    "@backstage/plugin-scaffolder-backend-module-confluence-to-markdown": "0.2.1",
+    "@backstage/plugin-scaffolder-backend-module-cookiecutter": "0.2.24",
+    "@backstage/plugin-scaffolder-backend-module-gitlab": "0.2.3",
+    "@backstage/plugin-scaffolder-backend-module-rails": "0.4.17",
+    "@backstage/plugin-scaffolder-backend-module-sentry": "0.1.8",
+    "@backstage/plugin-scaffolder-backend-module-yeoman": "0.2.21",
+    "@backstage/plugin-scaffolder-common": "1.4.0",
+    "@backstage/plugin-scaffolder-node": "0.2.0",
+    "@backstage/plugin-scaffolder-react": "1.5.2",
+    "@backstage/plugin-search": "1.3.4",
+    "@backstage/plugin-search-backend": "1.4.0",
+    "@backstage/plugin-search-backend-module-catalog": "0.1.4",
+    "@backstage/plugin-search-backend-module-elasticsearch": "1.3.3",
+    "@backstage/plugin-search-backend-module-explore": "0.1.4",
+    "@backstage/plugin-search-backend-module-pg": "0.5.9",
+    "@backstage/plugin-search-backend-module-techdocs": "0.1.4",
+    "@backstage/plugin-search-backend-node": "1.2.4",
     "@backstage/plugin-search-common": "1.2.5",
-    "@backstage/plugin-search-react": "1.6.3",
-    "@backstage/plugin-sentry": "0.5.5",
-    "@backstage/plugin-shortcuts": "0.3.12",
-    "@backstage/plugin-sonarqube": "0.7.1",
-    "@backstage/plugin-sonarqube-backend": "0.2.1",
+    "@backstage/plugin-search-react": "1.6.4",
+    "@backstage/plugin-sentry": "0.5.6",
+    "@backstage/plugin-shortcuts": "0.3.13",
+    "@backstage/plugin-sonarqube": "0.7.2",
+    "@backstage/plugin-sonarqube-backend": "0.2.2",
     "@backstage/plugin-sonarqube-react": "0.1.7",
-    "@backstage/plugin-splunk-on-call": "0.4.9",
-    "@backstage/plugin-stack-overflow": "0.1.18",
-    "@backstage/plugin-stack-overflow-backend": "0.2.3",
-    "@backstage/plugin-stackstorm": "0.1.4",
-    "@backstage/plugin-tech-insights": "0.3.12",
-    "@backstage/plugin-tech-insights-backend": "0.5.13",
-    "@backstage/plugin-tech-insights-backend-module-jsonfc": "0.1.31",
+    "@backstage/plugin-splunk-on-call": "0.4.10",
+    "@backstage/plugin-stack-overflow": "0.1.19",
+    "@backstage/plugin-stack-overflow-backend": "0.2.4",
+    "@backstage/plugin-stackstorm": "0.1.5",
+    "@backstage/plugin-tech-insights": "0.3.13",
+    "@backstage/plugin-tech-insights-backend": "0.5.14",
+    "@backstage/plugin-tech-insights-backend-module-jsonfc": "0.1.32",
     "@backstage/plugin-tech-insights-common": "0.2.11",
-    "@backstage/plugin-tech-insights-node": "0.4.5",
-    "@backstage/plugin-tech-radar": "0.6.6",
-    "@backstage/plugin-techdocs": "1.6.5",
-    "@backstage/plugin-techdocs-addons-test-utils": "1.0.16",
-    "@backstage/plugin-techdocs-backend": "1.6.4",
-    "@backstage/plugin-techdocs-module-addons-contrib": "1.0.15",
-    "@backstage/plugin-techdocs-node": "1.7.3",
-    "@backstage/plugin-techdocs-react": "1.1.8",
-    "@backstage/plugin-todo": "0.2.22",
-    "@backstage/plugin-todo-backend": "0.1.44",
-    "@backstage/plugin-user-settings": "0.7.5",
-    "@backstage/plugin-user-settings-backend": "0.1.11",
-    "@backstage/plugin-vault": "0.1.14",
-    "@backstage/plugin-vault-backend": "0.3.3",
-    "@backstage/plugin-xcmetrics": "0.2.40",
-    "@backstage/plugin-analytics-module-newrelic-browser": "0.0.0",
-    "@backstage/plugin-catalog-backend-module-gcp": "0.0.0"
+    "@backstage/plugin-tech-insights-node": "0.4.6",
+    "@backstage/plugin-tech-radar": "0.6.7",
+    "@backstage/plugin-techdocs": "1.6.6",
+    "@backstage/plugin-techdocs-addons-test-utils": "1.0.17",
+    "@backstage/plugin-techdocs-backend": "1.6.5",
+    "@backstage/plugin-techdocs-module-addons-contrib": "1.0.16",
+    "@backstage/plugin-techdocs-node": "1.7.4",
+    "@backstage/plugin-techdocs-react": "1.1.9",
+    "@backstage/plugin-todo": "0.2.23",
+    "@backstage/plugin-todo-backend": "0.2.0",
+    "@backstage/plugin-user-settings": "0.7.6",
+    "@backstage/plugin-user-settings-backend": "0.1.12",
+    "@backstage/plugin-vault": "0.1.15",
+    "@backstage/plugin-vault-backend": "0.3.4",
+    "@backstage/plugin-xcmetrics": "0.2.41",
+    "@backstage/plugin-auth-backend-module-gcp-iap-provider": "0.0.0",
+    "@backstage/plugin-auth-backend-module-github-provider": "0.0.0",
+    "@backstage/plugin-auth-backend-module-google-provider": "0.0.0",
+    "@backstage/plugin-opencost": "0.1.0",
+    "example-app-next": "0.0.0",
+    "@backstage/frontend-app-api": "0.0.0",
+    "@backstage/frontend-plugin-api": "0.0.0",
+    "@backstage/plugin-auth-backend-module-gitlab-provider": "0.0.0",
+    "@backstage/backend-plugin-manager": "0.0.0",
+    "@backstage/plugin-permission-backend-module-allow-all-policy": "0.0.0"
   },
   "changesets": [
-    "analytics-millenial-whoop",
-    "angry-beers-relate",
-    "chatty-foxes-buy",
-    "chatty-seahorses-juggle",
-    "chilly-keys-count",
-    "cold-numbers-sleep",
-    "create-app-1690284535",
-    "create-app-1690892926",
-    "dirty-chefs-listen",
-    "gorgeous-months-doubt",
-    "hungry-shrimps-care",
-    "khaki-flies-draw",
-    "kind-cougars-allow",
-    "large-experts-poke",
-    "large-vans-cross",
-    "loud-garlics-press",
-    "mean-squids-relax",
-    "mighty-lions-search-2",
-    "mighty-lions-search-3",
-    "mighty-lions-search",
-    "neat-coins-raise",
-    "neat-lamps-press",
-    "odd-avocados-buy",
-    "pink-squids-nail",
-    "popular-fans-camp",
-    "quiet-starfishes-kick",
-    "rare-pens-exist",
-    "rich-zoos-occur",
-    "rude-feet-sparkle",
-    "search-donuts-wash",
-    "selfish-coats-shout",
-    "serious-bats-repair",
-    "slimy-kids-jam",
-    "smart-pandas-applaud",
-    "stale-wombats-talk",
-    "strong-bobcats-unite",
-    "stupid-berries-run",
-    "ten-otters-appear",
-    "tender-fireants-cheer",
-    "thin-yaks-hang",
-    "tidy-cobras-scream",
-    "tough-dolphins-care",
-    "tough-lies-float",
-    "wild-timers-sparkle"
+    "big-bananas-sleep",
+    "blue-rats-drop",
+    "brave-books-pretend",
+    "brave-carrots-occur",
+    "calm-cups-smile",
+    "catalog-everybody-to-the-limit",
+    "chatty-goats-mate",
+    "chilly-parrots-yell",
+    "cold-apricots-poke",
+    "create-app-1692704146",
+    "create-app-1693311380",
+    "curvy-roses-march",
+    "cyan-roses-relate",
+    "dirty-carrots-notice",
+    "dirty-garlics-kiss",
+    "dirty-years-travel",
+    "dry-wasps-occur",
+    "dull-tables-joke",
+    "early-trains.draw",
+    "eight-radios-listen",
+    "eight-timers-sin",
+    "eighty-fans-provide",
+    "empty-rings-type",
+    "fair-paws-flash",
+    "few-nails-smile",
+    "fifty-adults-shake",
+    "four-masks-fry",
+    "fresh-candles-warn",
+    "friendly-pugs-lick",
+    "funny-ligers-matter",
+    "gorgeous-coins-attack",
+    "great-chairs-swim",
+    "grumpy-papayas-tie",
+    "healthy-spiders-arrive",
+    "healthy-tools-count",
+    "hip-seahorses-exist",
+    "honest-ads-rush",
+    "hungry-dots-design",
+    "khaki-pigs-accept",
+    "khaki-spiders-sniff",
+    "late-cows-turn",
+    "late-hounds-yell",
+    "late-roses-dream",
+    "lazy-pumas-hope",
+    "lazy-rice-rule",
+    "long-flowers-sort",
+    "loud-apricots-destroy",
+    "lovely-years-sniff",
+    "lucky-chicken-hear",
+    "lucky-chicken-lie",
+    "many-tips-attend",
+    "mean-carpets-provide",
+    "mighty-crabs-cheat",
+    "modern-trees-add",
+    "nasty-cherries-exercise",
+    "nasty-forks-beg",
+    "nasty-snails-complain",
+    "new-sheep-cover",
+    "nice-forks-remain",
+    "ninety-news-visit",
+    "old-geese-drive",
+    "orange-houses-fly",
+    "pink-cups-rescue",
+    "pink-months-hammer",
+    "polite-forks-grin",
+    "polite-plums-share",
+    "poor-olives-own",
+    "poor-years-appear",
+    "popular-coins-tap",
+    "popular-readers-allow",
+    "pretty-otters-whisper",
+    "proud-lamps-cross",
+    "red-pens-knock",
+    "renovate-2ebf420",
+    "renovate-76185f9",
+    "renovate-b129f45",
+    "renovate-bbda8e8",
+    "repo-p-lisa",
+    "repo-tools-boo-descriptions-two-electric-boogaloo",
+    "repo-tools-boo-descriptions",
+    "repo-tools-ci-toldya-so",
+    "rude-dolphins-reply",
+    "silent-icons-deny",
+    "silly-emus-remain",
+    "six-radios-smile",
+    "six-wolves-admire",
+    "slow-ducks-hunt",
+    "slow-queens-visit",
+    "smart-islands-jog",
+    "strange-frogs-count",
+    "stupid-ants-change",
+    "sweet-hairs-complain",
+    "sweet-pens-hunt",
+    "swift-frogs-drop",
+    "tall-items-clap",
+    "tall-peas-visit",
+    "tricky-melons-fold",
+    "twelve-elephants-pay",
+    "warm-llamas-bake",
+    "warm-panthers-lick",
+    "weak-tomatoes-dance",
+    "witty-ants-cover",
+    "yellow-trains-protect",
+    "yellow-yaks-behave",
+    "young-ants-nail",
+    "young-panthers-mix"
   ]
 }
diff --git a/.changeset/pretty-otters-whisper.md b/.changeset/pretty-otters-whisper.md
new file mode 100644
index 0000000000..7019596b38
--- /dev/null
+++ b/.changeset/pretty-otters-whisper.md
@@ -0,0 +1,6 @@
+---
+'@backstage/plugin-techdocs-node': minor
+'@backstage/plugin-techdocs-backend': minor
+---
+
+Add a `techdocs.publisher.azureBlobStorage.connectionString` app-config setting, which can be leveraged for improved Azurite support.
diff --git a/.changeset/proud-lamps-cross.md b/.changeset/proud-lamps-cross.md
new file mode 100644
index 0000000000..cd2528a94c
--- /dev/null
+++ b/.changeset/proud-lamps-cross.md
@@ -0,0 +1,5 @@
+---
+'@backstage/plugin-code-coverage-backend': patch
+---
+
+Include auth token when fetching entity
diff --git a/.changeset/quiet-starfishes-kick.md b/.changeset/quiet-starfishes-kick.md
deleted file mode 100644
index 2fc8ed632e..0000000000
--- a/.changeset/quiet-starfishes-kick.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'@backstage/plugin-home': patch
----
-
-Now, user can provide a language (optional) as input to receive a greeting in that specific language. Example: `<WelcomeTitle language={['English', 'Spanish']} />`
diff --git a/.changeset/rare-pens-exist.md b/.changeset/rare-pens-exist.md
deleted file mode 100644
index 7363f5033a..0000000000
--- a/.changeset/rare-pens-exist.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'@backstage/cli': patch
----
-
-Enable to print the config schema not merged with the `--no-merge` flag
diff --git a/.changeset/red-pens-knock.md b/.changeset/red-pens-knock.md
new file mode 100644
index 0000000000..98ee51b894
--- /dev/null
+++ b/.changeset/red-pens-knock.md
@@ -0,0 +1,93 @@
+---
+'@backstage/plugin-analytics-module-newrelic-browser': patch
+'@backstage/plugin-techdocs-module-addons-contrib': patch
+'@backstage/plugin-catalog-unprocessed-entities': patch
+'@backstage/plugin-github-pull-requests-board': patch
+'@backstage/plugin-techdocs-addons-test-utils': patch
+'@backstage/plugin-analytics-module-ga4': patch
+'@backstage/plugin-analytics-module-ga': patch
+'@backstage/plugin-git-release-manager': patch
+'@backstage/integration-react': patch
+'@backstage/release-manifests': patch
+'@backstage/plugin-github-deployments': patch
+'@backstage/plugin-microsoft-calendar': patch
+'@backstage/plugin-entity-validation': patch
+'@backstage/core-components': patch
+'@backstage/core-plugin-api': patch
+'@backstage/plugin-apollo-explorer': patch
+'@backstage/plugin-entity-feedback': patch
+'@backstage/plugin-gitops-profiles': patch
+'@backstage/plugin-graphql-voyager': patch
+'@backstage/config-loader': patch
+'@backstage/plugin-apache-airflow': patch
+'@backstage/plugin-badges-backend': patch
+'@backstage/plugin-github-actions': patch
+'@backstage/plugin-octopus-deploy': patch
+'@backstage/plugin-splunk-on-call': patch
+'@backstage/plugin-stack-overflow': patch
+'@backstage/app-defaults': patch
+'@backstage/core-app-api': patch
+'@backstage/plugin-code-coverage': patch
+'@backstage/plugin-config-schema': patch
+'@backstage/plugin-cost-insights': patch
+'@backstage/plugin-explore-react': patch
+'@backstage/plugin-github-issues': patch
+'@backstage/plugin-tech-insights': patch
+'@backstage/plugin-user-settings': patch
+'@backstage/plugin-azure-devops': patch
+'@backstage/plugin-code-climate': patch
+'@backstage/plugin-gcp-projects': patch
+'@backstage/create-app': patch
+'@backstage/test-utils': patch
+'@backstage/plugin-azure-sites': patch
+'@backstage/plugin-firehydrant': patch
+'@backstage/dev-utils': patch
+'@backstage/plugin-cloudbuild': patch
+'@backstage/plugin-home-react': patch
+'@backstage/plugin-kubernetes': patch
+'@backstage/plugin-lighthouse': patch
+'@backstage/plugin-scaffolder': patch
+'@backstage/plugin-stackstorm': patch
+'@backstage/plugin-tech-radar': patch
+'@backstage/plugin-codescene': patch
+'@backstage/plugin-dynatrace': patch
+'@backstage/plugin-gcalendar': patch
+'@backstage/plugin-org-react': patch
+'@backstage/plugin-pagerduty': patch
+'@backstage/plugin-shortcuts': patch
+'@backstage/plugin-sonarqube': patch
+'@backstage/plugin-xcmetrics': patch
+'@backstage/plugin-airbrake': patch
+'@backstage/plugin-api-docs': patch
+'@backstage/plugin-circleci': patch
+'@backstage/plugin-devtools': patch
+'@backstage/plugin-graphiql': patch
+'@backstage/plugin-linguist': patch
+'@backstage/plugin-newrelic': patch
+'@backstage/plugin-periskop': patch
+'@backstage/plugin-playlist': patch
+'@backstage/plugin-puppetdb': patch
+'@backstage/plugin-techdocs': patch
+'@backstage/config': patch
+'@backstage/plugin-bitrise': patch
+'@backstage/plugin-explore': patch
+'@backstage/plugin-jenkins': patch
+'@backstage/plugin-rollbar': patch
+'@backstage/plugin-allure': patch
+'@backstage/plugin-badges': patch
+'@backstage/plugin-search': patch
+'@backstage/plugin-sentry': patch
+'@backstage/plugin-fossa': patch
+'@backstage/plugin-ilert': patch
+'@backstage/plugin-kafka': patch
+'@backstage/plugin-nomad': patch
+'@backstage/plugin-vault': patch
+'@backstage/cli': patch
+'@backstage/plugin-gocd': patch
+'@backstage/plugin-home': patch
+'@backstage/plugin-todo': patch
+'@backstage/plugin-adr': patch
+'@backstage/plugin-org': patch
+---
+
+Removed `@types/node` dependency
diff --git a/.changeset/renovate-2ebf420.md b/.changeset/renovate-2ebf420.md
new file mode 100644
index 0000000000..cbd1e76538
--- /dev/null
+++ b/.changeset/renovate-2ebf420.md
@@ -0,0 +1,7 @@
+---
+'@backstage/core-components': patch
+'@backstage/plugin-codescene': patch
+'@backstage/plugin-sonarqube': patch
+---
+
+Updated dependency `rc-progress` to `3.5.1`.
diff --git a/.changeset/renovate-76185f9.md b/.changeset/renovate-76185f9.md
new file mode 100644
index 0000000000..5e23f3cfda
--- /dev/null
+++ b/.changeset/renovate-76185f9.md
@@ -0,0 +1,5 @@
+---
+'@backstage/plugin-cost-insights': patch
+---
+
+Updated dependency `@types/pluralize` to `^0.0.30`.
diff --git a/.changeset/renovate-b129f45.md b/.changeset/renovate-b129f45.md
new file mode 100644
index 0000000000..0f747fba5b
--- /dev/null
+++ b/.changeset/renovate-b129f45.md
@@ -0,0 +1,5 @@
+---
+'@backstage/cli': patch
+---
+
+Updated dependency `run-script-webpack-plugin` to `^0.2.0`.
diff --git a/.changeset/renovate-bbda8e8.md b/.changeset/renovate-bbda8e8.md
new file mode 100644
index 0000000000..a43e1c55a9
--- /dev/null
+++ b/.changeset/renovate-bbda8e8.md
@@ -0,0 +1,5 @@
+---
+'@backstage/plugin-scaffolder-react': patch
+---
+
+Updated dependency `use-immer` to `^0.9.0`.
diff --git a/.changeset/repo-p-lisa.md b/.changeset/repo-p-lisa.md
new file mode 100644
index 0000000000..d6a0fa56f4
--- /dev/null
+++ b/.changeset/repo-p-lisa.md
@@ -0,0 +1,7 @@
+---
+'@backstage/repo-tools': patch
+---
+
+The `generate-catalog-info` command now uses the first listed `CODEOWNER` as Component owner when initially
+creating the `catalog-info.yaml` file. It continues to allow any one listed `CODEOWNER` when updating
+entity metadata.
diff --git a/.changeset/repo-tools-boo-descriptions-two-electric-boogaloo.md b/.changeset/repo-tools-boo-descriptions-two-electric-boogaloo.md
new file mode 100644
index 0000000000..8cb6d49153
--- /dev/null
+++ b/.changeset/repo-tools-boo-descriptions-two-electric-boogaloo.md
@@ -0,0 +1,5 @@
+---
+'@backstage/repo-tools': patch
+---
+
+Fixed a bug with the `generate-catalog-info` command that could cause `metadata.description` values to be overwritten by `package.json` description values only because unrelated attributes were being changed.
diff --git a/.changeset/repo-tools-boo-descriptions.md b/.changeset/repo-tools-boo-descriptions.md
new file mode 100644
index 0000000000..5973dd7127
--- /dev/null
+++ b/.changeset/repo-tools-boo-descriptions.md
@@ -0,0 +1,5 @@
+---
+'@backstage/repo-tools': patch
+---
+
+Fixed a bug with the `generate-catalog-info` command that could cause the `--dry-run` flag to indicate changes to files when no changes would actually be made if the command were run without the flag.
diff --git a/.changeset/repo-tools-ci-toldya-so.md b/.changeset/repo-tools-ci-toldya-so.md
new file mode 100644
index 0000000000..20425fc631
--- /dev/null
+++ b/.changeset/repo-tools-ci-toldya-so.md
@@ -0,0 +1,5 @@
+---
+'@backstage/repo-tools': patch
+---
+
+Added a `--ci` flag to the `generate-catalog-info` command. This flag behaves similarly to the same flag on `api-reports`: if `catalog-info.yaml` files would have been added or modified, then the process exits with status code `1`, and instructions are printed.
diff --git a/.changeset/rich-zoos-occur.md b/.changeset/rich-zoos-occur.md
deleted file mode 100644
index 979acb93c6..0000000000
--- a/.changeset/rich-zoos-occur.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-'@backstage/backend-plugin-api': minor
-'@backstage/backend-defaults': minor
----
-
-**BREAKING**: Removing shared environments concept from the new experimental backend system.
diff --git a/.changeset/rotten-bees-wave.md b/.changeset/rotten-bees-wave.md
new file mode 100644
index 0000000000..a5ce8cae85
--- /dev/null
+++ b/.changeset/rotten-bees-wave.md
@@ -0,0 +1,5 @@
+---
+'@backstage/plugin-catalog-backend-module-github': minor
+---
+
+Added a `catalogModuleGithubOrgEntityProvider` for the new backend system
diff --git a/.changeset/rotten-rabbits-move.md b/.changeset/rotten-rabbits-move.md
deleted file mode 100644
index f2e1ffda08..0000000000
--- a/.changeset/rotten-rabbits-move.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'@backstage/plugin-proxy-backend': minor
----
-
-Defining proxy endpoints directly under the root `proxy` configuration key is deprecated. Endpoints should now be declared under `proxy.endpoints` instead. The `skipInvalidProxies` and `reviveConsumedRequestBodies` can now also be configured through static configuration.
diff --git a/.changeset/rude-dolphins-reply.md b/.changeset/rude-dolphins-reply.md
new file mode 100644
index 0000000000..89545cde1f
--- /dev/null
+++ b/.changeset/rude-dolphins-reply.md
@@ -0,0 +1,5 @@
+---
+'@backstage/plugin-techdocs-module-addons-contrib': minor
+---
+
+Enable zoom icon for techdocs images inside lightbox
diff --git a/.changeset/rude-feet-sparkle.md b/.changeset/rude-feet-sparkle.md
deleted file mode 100644
index fabc83bb0b..0000000000
--- a/.changeset/rude-feet-sparkle.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'@backstage/plugin-analytics-module-newrelic-browser': patch
----
-
-Introduced the New Relic Browser analytics module. Check out the plugins [README.md](https://github.com/backstage/backstage/tree/master/plugins/analytics-module-newrelic-browser) for more details!
diff --git a/.changeset/search-donuts-wash.md b/.changeset/search-donuts-wash.md
deleted file mode 100644
index 2fa3325761..0000000000
--- a/.changeset/search-donuts-wash.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'@backstage/plugin-search-backend-node': patch
----
-
-Fix Lunr search engine highlight by ignoring invalid metadata positions.
diff --git a/.changeset/selfish-coats-shout.md b/.changeset/selfish-coats-shout.md
deleted file mode 100644
index 071c47e371..0000000000
--- a/.changeset/selfish-coats-shout.md
+++ /dev/null
@@ -1,55 +0,0 @@
----
-'@backstage/config-loader': minor
----
-
-Adds a new `deepVisibility` schema keyword that sets child visibility recursively to the defined value, respecting preexisting values or child `deepVisibility`.
-
-Example usage:
-
-```ts
-export interface Config {
-  /**
-   * Enforces a default of `secret` instead of `backend` for this object.
-   * @deepVisibility secret
-   */
-  mySecretProperty: {
-    type: 'object';
-    properties: {
-      secretValue: {
-        type: 'string';
-      };
-
-      verySecretProperty: {
-        type: 'string';
-      };
-    };
-  };
-}
-```
-
-Example of a schema that would not be allowed:
-
-```ts
-export interface Config {
-  /**
-   * Set the top level property to secret, enforcing a default of `secret` instead of `backend` for this object.
-   * @deepVisibility secret
-   */
-  mySecretProperty: {
-    type: 'object';
-    properties: {
-      frontendUrl: {
-        /**
-         * We can NOT override the visibility to reveal a property to the front end.
-         * @visibility frontend
-         */
-        type: 'string';
-      };
-
-      verySecretProperty: {
-        type: 'string';
-      };
-    };
-  };
-}
-```
diff --git a/.changeset/serious-bats-repair.md b/.changeset/serious-bats-repair.md
deleted file mode 100644
index d93b49bda0..0000000000
--- a/.changeset/serious-bats-repair.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'@backstage/repo-tools': patch
----
-
-Update `schema openapi generate` command to now create a default router that can be imported and used directly.
diff --git a/.changeset/seven-cougars-smash.md b/.changeset/seven-cougars-smash.md
deleted file mode 100644
index 5493a724d7..0000000000
--- a/.changeset/seven-cougars-smash.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'@backstage/backend-tasks': patch
----
-
-Make `readTaskScheduleDefinitionFromConfig` properly handle bad inputs
diff --git a/.changeset/sharp-months-think.md b/.changeset/sharp-months-think.md
deleted file mode 100644
index 04ffbb8d1b..0000000000
--- a/.changeset/sharp-months-think.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'@backstage/plugin-app-backend': patch
----
-
-Migrated the alpha `appBackend` export to use static configuration and extension points rather than accepting options.
diff --git a/.changeset/silent-icons-deny.md b/.changeset/silent-icons-deny.md
new file mode 100644
index 0000000000..3dd7d75c90
--- /dev/null
+++ b/.changeset/silent-icons-deny.md
@@ -0,0 +1,5 @@
+---
+'@backstage/backend-app-api': patch
+---
+
+Extension points are now tracked via their ID rather than reference, in order to support package duplication.
diff --git a/.changeset/silly-emus-remain.md b/.changeset/silly-emus-remain.md
new file mode 100644
index 0000000000..4fe605080a
--- /dev/null
+++ b/.changeset/silly-emus-remain.md
@@ -0,0 +1,5 @@
+---
+'@backstage/plugin-scaffolder-backend': patch
+---
+
+Add examples for `github:actions:dispatch` scaffolder actions.
diff --git a/.changeset/six-radios-smile.md b/.changeset/six-radios-smile.md
new file mode 100644
index 0000000000..e4f4eed450
--- /dev/null
+++ b/.changeset/six-radios-smile.md
@@ -0,0 +1,5 @@
+---
+'@backstage/plugin-code-coverage-backend': patch
+---
+
+Correct the line hits calculation for Cobertura reports
diff --git a/.changeset/six-wolves-admire.md b/.changeset/six-wolves-admire.md
new file mode 100644
index 0000000000..efc80826c2
--- /dev/null
+++ b/.changeset/six-wolves-admire.md
@@ -0,0 +1,23 @@
+---
+'@backstage/integration': minor
+---
+
+Added `AzureDevOpsCredentialsProvider` to support multiple Azure DevOps organizations and **deprecated** `AzureIntegrationConfig.credential` and `AzureIntegrationConfig.token` in favour of `AzureIntegrationConfig.credentials`. You can now use specific credentials for different Azure DevOps (Server) organizations by specifying the `organizations` field on a credential:
+
+```yaml
+integrations:
+  azure:
+    - host: dev.azure.com
+      credentials:
+        - organizations:
+            - my-org
+            - my-other-org
+          clientId: ${AZURE_CLIENT_ID}
+          clientSecret: ${AZURE_CLIENT_SECRET}
+          tenantId: ${AZURE_TENANT_ID}
+        - organizations:
+            - yet-another-org
+          personalAccessToken: ${PERSONAL_ACCESS_TOKEN}
+```
+
+See the [Azure integration documentation](https://backstage.io/docs/integrations/azure/locations) for more information.
diff --git a/.changeset/slimy-kids-jam.md b/.changeset/slimy-kids-jam.md
deleted file mode 100644
index c02daf325e..0000000000
--- a/.changeset/slimy-kids-jam.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'@backstage/plugin-catalog-backend': minor
----
-
-Added OpenTelemetry spans for catalog processing
diff --git a/.changeset/slow-ducks-hunt.md b/.changeset/slow-ducks-hunt.md
new file mode 100644
index 0000000000..0aac3056cf
--- /dev/null
+++ b/.changeset/slow-ducks-hunt.md
@@ -0,0 +1,5 @@
+---
+'@backstage/cli': patch
+---
+
+Added support for the `dev/index` entry point for backend plugins and modules.
diff --git a/.changeset/slow-queens-visit.md b/.changeset/slow-queens-visit.md
new file mode 100644
index 0000000000..2df948e477
--- /dev/null
+++ b/.changeset/slow-queens-visit.md
@@ -0,0 +1,5 @@
+---
+'@backstage/plugin-opencost': minor
+---
+
+New OpenCost plugin provides an port of the latest OpenCost UI to Backstage with updated dependencies. The plugin's README covers installation and configuration
diff --git a/.changeset/smart-islands-jog.md b/.changeset/smart-islands-jog.md
new file mode 100644
index 0000000000..50bc36191f
--- /dev/null
+++ b/.changeset/smart-islands-jog.md
@@ -0,0 +1,5 @@
+---
+'@backstage/plugin-catalog-backend': patch
+---
+
+Fix OpenAPI schema for the facets endpoint
diff --git a/.changeset/smart-pandas-applaud.md b/.changeset/smart-pandas-applaud.md
deleted file mode 100644
index 5f2c297df5..0000000000
--- a/.changeset/smart-pandas-applaud.md
+++ /dev/null
@@ -1,7 +0,0 @@
----
-'@backstage/plugin-todo-backend': minor
-'@backstage/plugin-catalog-backend': minor
-'@backstage/plugin-search-backend': minor
----
-
-Now performs request validation based on OpenAPI schema through `@backstage/backend-openapi-utils`. Error responses for invalid input, like `"a"` instead of a number, may have changed.
diff --git a/.changeset/stale-wombats-talk.md b/.changeset/stale-wombats-talk.md
deleted file mode 100644
index f4e0b852f8..0000000000
--- a/.changeset/stale-wombats-talk.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'@backstage/plugin-catalog-backend-module-aws': patch
----
-
-Added option to configure AWS `accountId` in `AwsS3EntityProvider`
diff --git a/.changeset/strange-frogs-count.md b/.changeset/strange-frogs-count.md
new file mode 100644
index 0000000000..94fa6b9fb6
--- /dev/null
+++ b/.changeset/strange-frogs-count.md
@@ -0,0 +1,5 @@
+---
+'@backstage/core-components': patch
+---
+
+Add loading indicator to Table
diff --git a/.changeset/strange-shrimps-mix.md b/.changeset/strange-shrimps-mix.md
deleted file mode 100644
index fbb08eeeb6..0000000000
--- a/.changeset/strange-shrimps-mix.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'@backstage/plugin-linguist-backend': minor
----
-
-Adds a processor to the linguist backend which can automatically add language tags to entities
diff --git a/.changeset/strong-bobcats-unite.md b/.changeset/strong-bobcats-unite.md
deleted file mode 100644
index ef86023d58..0000000000
--- a/.changeset/strong-bobcats-unite.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'@backstage/backend-test-utils': patch
----
-
-Add needed constants and constructs to support PostgreSQL version 14 as test database
diff --git a/.changeset/stupid-ants-change.md b/.changeset/stupid-ants-change.md
new file mode 100644
index 0000000000..c78c5e4250
--- /dev/null
+++ b/.changeset/stupid-ants-change.md
@@ -0,0 +1,5 @@
+---
+'@backstage/plugin-tech-insights-backend-module-jsonfc': patch
+---
+
+Handle extracting facts from 'not' conditions too
diff --git a/.changeset/stupid-berries-run.md b/.changeset/stupid-berries-run.md
deleted file mode 100644
index f506ce2475..0000000000
--- a/.changeset/stupid-berries-run.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'@backstage/plugin-home': patch
----
-
-Make sure the widget name is never empty in the `AddWidgetDialog`. If the title was set to "", the entry would contain an empty string. Use the name as a fallback
diff --git a/.changeset/sweet-hairs-complain.md b/.changeset/sweet-hairs-complain.md
new file mode 100644
index 0000000000..56dede5617
--- /dev/null
+++ b/.changeset/sweet-hairs-complain.md
@@ -0,0 +1,5 @@
+---
+'@backstage/plugin-auth-backend-module-google-provider': minor
+---
+
+New module for `@backstage/plugin-auth-backend` that adds a Google auth provider.
diff --git a/.changeset/sweet-pens-hunt.md b/.changeset/sweet-pens-hunt.md
new file mode 100644
index 0000000000..03e79ecebb
--- /dev/null
+++ b/.changeset/sweet-pens-hunt.md
@@ -0,0 +1,24 @@
+---
+'@backstage/config-loader': minor
+---
+
+Deep visibility now also applies to values that are not covered by the configuration schema.
+
+For example, given the following configuration schema:
+
+```ts
+// plugins/a/config.schema.ts
+export interface Config {
+  /** @deepVisibility frontend */
+  a?: unknown;
+}
+
+// plugins/a/config.schema.ts
+export interface Config {
+  a?: {
+    b?: string;
+  };
+}
+```
+
+All values under `a` are now visible to the frontend, while previously only `a` and `a/b` would've been visible.
diff --git a/.changeset/swift-frogs-drop.md b/.changeset/swift-frogs-drop.md
new file mode 100644
index 0000000000..3edff21ca2
--- /dev/null
+++ b/.changeset/swift-frogs-drop.md
@@ -0,0 +1,5 @@
+---
+'@backstage/plugin-playlist': patch
+---
+
+Limit the use of the same playlist name when adding a playlist
diff --git a/.changeset/tall-countries-float.md b/.changeset/tall-countries-float.md
new file mode 100644
index 0000000000..d6c6946b7a
--- /dev/null
+++ b/.changeset/tall-countries-float.md
@@ -0,0 +1,5 @@
+---
+'@backstage/cli': patch
+---
+
+Add `"sideEffects": false` to `package.json` in frontend package templates. This can be added to existing packages using the new `yarn fix` command.
diff --git a/.changeset/tall-items-clap.md b/.changeset/tall-items-clap.md
new file mode 100644
index 0000000000..613c280cbe
--- /dev/null
+++ b/.changeset/tall-items-clap.md
@@ -0,0 +1,5 @@
+---
+'@backstage/plugin-permission-backend-module-allow-all-policy': minor
+---
+
+Created package with policy `permissionModuleAllowAllPolicy`
diff --git a/.changeset/tall-peas-visit.md b/.changeset/tall-peas-visit.md
new file mode 100644
index 0000000000..3e3ca76e46
--- /dev/null
+++ b/.changeset/tall-peas-visit.md
@@ -0,0 +1,5 @@
+---
+'@backstage/plugin-catalog-backend': patch
+---
+
+Fix issue with `catalogFileName` not being a required property for `/analyze-location`
diff --git a/.changeset/ten-lies-cheat.md b/.changeset/ten-lies-cheat.md
deleted file mode 100644
index 1c965a574c..0000000000
--- a/.changeset/ten-lies-cheat.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'@backstage/plugin-scaffolder-node': patch
----
-
-Export `TemplateExample` from the `createTemplateAction` type.
diff --git a/.changeset/ten-otters-appear.md b/.changeset/ten-otters-appear.md
deleted file mode 100644
index 4cb3d301ae..0000000000
--- a/.changeset/ten-otters-appear.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'@backstage/plugin-scaffolder-react': patch
----
-
-Fixed bug in Workflow component by passing a prop `templateName` down to Stepper component.
diff --git a/.changeset/tender-fireants-cheer.md b/.changeset/tender-fireants-cheer.md
deleted file mode 100644
index 1d829f673b..0000000000
--- a/.changeset/tender-fireants-cheer.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'@backstage/plugin-devtools': patch
----
-
-Fix readme typo
diff --git a/.changeset/thin-dryers-repeat.md b/.changeset/thin-dryers-repeat.md
new file mode 100644
index 0000000000..bcf62f21de
--- /dev/null
+++ b/.changeset/thin-dryers-repeat.md
@@ -0,0 +1,5 @@
+---
+'@backstage/backend-app-api': patch
+---
+
+Add support for installing features as package imports, for example `backend.add(import('my-plugin'))`.
diff --git a/.changeset/thin-yaks-hang.md b/.changeset/thin-yaks-hang.md
deleted file mode 100644
index 1a1bdb4ab7..0000000000
--- a/.changeset/thin-yaks-hang.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'@backstage/plugin-search-backend': patch
----
-
-Add missing `configSchema` to package.json
diff --git a/.changeset/tidy-cobras-scream.md b/.changeset/tidy-cobras-scream.md
deleted file mode 100644
index 2917f11dfc..0000000000
--- a/.changeset/tidy-cobras-scream.md
+++ /dev/null
@@ -1,7 +0,0 @@
----
-'@backstage/plugin-scaffolder-backend-module-confluence-to-markdown': patch
-'@backstage/plugin-scaffolder-backend-module-cookiecutter': patch
-'@backstage/plugin-scaffolder-backend-module-rails': patch
----
-
-Import helpers from the node package instead of the backend package
diff --git a/.changeset/tough-dolphins-care.md b/.changeset/tough-dolphins-care.md
deleted file mode 100644
index 7d9739ec10..0000000000
--- a/.changeset/tough-dolphins-care.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'@backstage/plugin-catalog-backend-module-gcp': minor
----
-
-Added GCP catalog plugin with GKE provider
diff --git a/.changeset/tough-lies-float.md b/.changeset/tough-lies-float.md
deleted file mode 100644
index 2ad3b8623f..0000000000
--- a/.changeset/tough-lies-float.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-'@backstage/plugin-scaffolder-backend': patch
-'@backstage/plugin-scaffolder-node': patch
----
-
-Deprecated `executeShellCommand`, `RunCommandOptions`, and `fetchContents` from `@backstage/plugin-scaffolder-backend`, since they are useful for Scaffolder modules (who should not be importing from the plugin package itself). You should now import these from `@backstage/plugin-scaffolder-backend-node` instead. `RunCommandOptions` was renamed in the Node package as `ExecuteShellCommandOptions`, for consistency.
diff --git a/.changeset/tricky-melons-fold.md b/.changeset/tricky-melons-fold.md
new file mode 100644
index 0000000000..036413ea8e
--- /dev/null
+++ b/.changeset/tricky-melons-fold.md
@@ -0,0 +1,5 @@
+---
+'@backstage/backend-app-api': patch
+---
+
+Backend startup will now fail if any circular service dependencies are detected.
diff --git a/.changeset/twelve-elephants-pay.md b/.changeset/twelve-elephants-pay.md
new file mode 100644
index 0000000000..08fb983b6f
--- /dev/null
+++ b/.changeset/twelve-elephants-pay.md
@@ -0,0 +1,7 @@
+---
+'@backstage/plugin-techdocs-backend': minor
+'@backstage/plugin-techdocs-node': minor
+'@techdocs/cli': minor
+---
+
+Add optional config and cli option for techdocs to specify default mkdocs plugins.
diff --git a/.changeset/unlucky-bags-pump.md b/.changeset/unlucky-bags-pump.md
deleted file mode 100644
index a275887410..0000000000
--- a/.changeset/unlucky-bags-pump.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'@backstage/plugin-auth-backend': patch
----
-
-Add frontend visibility to provider objects in `auth` config.
diff --git a/.changeset/warm-llamas-bake.md b/.changeset/warm-llamas-bake.md
new file mode 100644
index 0000000000..3da4a9b94d
--- /dev/null
+++ b/.changeset/warm-llamas-bake.md
@@ -0,0 +1,5 @@
+---
+'@backstage/config-loader': patch
+---
+
+Do not unnecessarily notify subscribers when no-op updates to config happen
diff --git a/.changeset/warm-panthers-lick.md b/.changeset/warm-panthers-lick.md
new file mode 100644
index 0000000000..b06809fac1
--- /dev/null
+++ b/.changeset/warm-panthers-lick.md
@@ -0,0 +1,5 @@
+---
+'@backstage/plugin-auth-backend-module-github-provider': minor
+---
+
+New module for `@backstage/plugin-auth-backend` that adds a GitHub auth provider.
diff --git a/.changeset/weak-tomatoes-dance.md b/.changeset/weak-tomatoes-dance.md
new file mode 100644
index 0000000000..446051e16f
--- /dev/null
+++ b/.changeset/weak-tomatoes-dance.md
@@ -0,0 +1,5 @@
+---
+'@backstage/plugin-catalog-backend-module-github': patch
+---
+
+Properly support custom `userTransformer` returning `undefined` in `GithubMultiOrgEntityProvider`
diff --git a/.changeset/wild-timers-sparkle.md b/.changeset/wild-timers-sparkle.md
deleted file mode 100644
index 3df14f3a69..0000000000
--- a/.changeset/wild-timers-sparkle.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'@backstage/plugin-microsoft-calendar': patch
----
-
-README update - example of apiRef definition and fixed component name
diff --git a/.changeset/wise-tables-add.md b/.changeset/wise-tables-add.md
new file mode 100644
index 0000000000..987c74cf53
--- /dev/null
+++ b/.changeset/wise-tables-add.md
@@ -0,0 +1,5 @@
+---
+'@backstage/backend-plugin-api': patch
+---
+
+Service factory functions are now marked as feature factories that can be installed in the backend.
diff --git a/.changeset/witty-ants-cover.md b/.changeset/witty-ants-cover.md
new file mode 100644
index 0000000000..7f499a88ae
--- /dev/null
+++ b/.changeset/witty-ants-cover.md
@@ -0,0 +1,5 @@
+---
+'@backstage/plugin-home': patch
+---
+
+Allow specifying static widgets to custom home page
diff --git a/.changeset/witty-pans-flash.md b/.changeset/witty-pans-flash.md
new file mode 100644
index 0000000000..107ef90973
--- /dev/null
+++ b/.changeset/witty-pans-flash.md
@@ -0,0 +1,5 @@
+---
+'@backstage/plugin-playlist': patch
+---
+
+Fix the Ui style of the search bar
diff --git a/.changeset/yellow-trains-protect.md b/.changeset/yellow-trains-protect.md
new file mode 100644
index 0000000000..4b8c50ac3e
--- /dev/null
+++ b/.changeset/yellow-trains-protect.md
@@ -0,0 +1,13 @@
+---
+'@backstage/plugin-code-coverage-backend': patch
+'@backstage/plugin-tech-insights-backend': patch
+'@backstage/plugin-linguist-backend': patch
+'@backstage/backend-common': patch
+'@backstage/plugin-catalog-backend': patch
+'@backstage/backend-tasks': patch
+'@backstage/plugin-app-backend': patch
+'@backstage/plugin-bazaar-backend': patch
+'@backstage/plugin-scaffolder-backend': patch
+---
+
+Changes needed to support MySQL
diff --git a/.changeset/yellow-yaks-behave.md b/.changeset/yellow-yaks-behave.md
new file mode 100644
index 0000000000..546d74c3e4
--- /dev/null
+++ b/.changeset/yellow-yaks-behave.md
@@ -0,0 +1,7 @@
+---
+'@backstage/core-plugin-api': minor
+'@backstage/core-app-api': minor
+'@backstage/plugin-user-settings': patch
+---
+
+Introduced experimental support for internationalization.
diff --git a/.changeset/young-ants-nail.md b/.changeset/young-ants-nail.md
new file mode 100644
index 0000000000..6648098687
--- /dev/null
+++ b/.changeset/young-ants-nail.md
@@ -0,0 +1,5 @@
+---
+'@backstage/plugin-catalog-backend-module-github': patch
+---
+
+Allow github user and team transforms to return any Entity
diff --git a/.changeset/young-panthers-mix.md b/.changeset/young-panthers-mix.md
new file mode 100644
index 0000000000..cbaf3b3704
--- /dev/null
+++ b/.changeset/young-panthers-mix.md
@@ -0,0 +1,13 @@
+---
+'@backstage/plugin-tech-insights-backend': patch
+'@backstage/plugin-microsoft-calendar': patch
+'@backstage/plugin-scaffolder-backend': patch
+'@backstage/plugin-catalog-backend': patch
+'@backstage/backend-tasks': patch
+'@backstage/plugin-cloudbuild': patch
+'@backstage/plugin-gcalendar': patch
+'@backstage/plugin-xcmetrics': patch
+'@backstage/plugin-ilert': patch
+---
+
+Update to handle invalid luxon values
diff --git a/.clomonitor.yml b/.clomonitor.yml
new file mode 100644
index 0000000000..1e217dd400
--- /dev/null
+++ b/.clomonitor.yml
@@ -0,0 +1,9 @@
+# CLOMonitor metadata file
+# This file must be located at the root of the repository
+# https://clomonitor.io/projects/cncf/backstage
+
+# Checks exemptions
+exemptions:
+  - check: trademark_disclaimer # Check identifier (see https://github.com/cncf/clomonitor/blob/main/docs/checks.md#exemptions)
+    # Justification of this exemption (mandatory, it will be displayed on the UI)
+    reason: 'The Linux Foundation trademark disclaimer and link are contained within the project web site at https://backstage.io in the copyright footer. However, because the site is delivered dynamically via React through JavaScript, the check cannot currently identify it.'
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 5c957807cf..922f7588a5 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -4,8 +4,10 @@
 # The last matching pattern takes precedence.
 # https://help.github.com/articles/about-codeowners/
 
-*                                                 @backstage/maintainers
-*/yarn.lock                                       @backstage/maintainers @backstage-service
+*                                                 @backstage/maintainers @backstage/reviewers
+yarn.lock                                         @backstage/maintainers @backstage/reviewers @backstage-service
+*/yarn.lock                                       @backstage/maintainers @backstage/reviewers @backstage-service
+/.changeset/*.md
 /cypress/src/integration/plugins/techdocs.spec.ts @backstage/techdocs-maintainers
 /docs/assets/search                               @backstage/discoverability-maintainers
 /docs/features/search                             @backstage/discoverability-maintainers
@@ -14,81 +16,67 @@
 /packages/cli/src/commands/onboard                @backstage/sharks
 /packages/techdocs-cli                            @backstage/techdocs-maintainers
 /packages/techdocs-cli-embedded-app               @backstage/techdocs-maintainers
-/plugins/adr                                      @backstage/maintainers @kuangp
-/plugins/adr-*                                    @backstage/maintainers @kuangp
-/plugins/allure                                   @backstage/maintainers @deepak-bhardwaj-ps
-/plugins/analytics-module-newrelic-browser        @backstage/maintainers @jmezach
-/plugins/apache-airflow                           @backstage/maintainers @cmpadden
-/plugins/api-docs                                 @backstage/maintainers @backstage/sda-se-reviewers
-/plugins/azure-devops                             @backstage/maintainers @marleypowell @awanlin
-/plugins/azure-devops-backend                     @backstage/maintainers @marleypowell @awanlin
-/plugins/azure-devops-common                      @backstage/maintainers @marleypowell @awanlin
-/plugins/bitbucket-cloud-common                   @backstage/maintainers @pjungermann
-/plugins/bitrise                                  @backstage/maintainers @backstage/sda-se-reviewers
-/plugins/catalog                                  @backstage/maintainers @backstage/catalog-maintainers
-/plugins/catalog-*                                @backstage/maintainers @backstage/catalog-maintainers
-/plugins/catalog-backend-module-aws               @backstage/maintainers @backstage/catalog-maintainers @pjungermann
-/plugins/catalog-backend-module-bitbucket-cloud   @backstage/maintainers @backstage/catalog-maintainers @pjungermann
-/plugins/catalog-backend-module-msgraph           @backstage/maintainers @backstage/catalog-maintainers @pjungermann
-/plugins/catalog-backend-module-puppetdb          @backstage/maintainers @backstage/catalog-maintainers @tdabasinskas
-/plugins/catalog-graph                            @backstage/maintainers @backstage/catalog-maintainers @backstage/sda-se-reviewers
-/plugins/circleci                                 @backstage/maintainers @adamdmharvey
-/plugins/cloudbuild                               @backstage/maintainers @trivago/ebarrios
-/plugins/code-coverage                            @backstage/maintainers @alde @nissayeva
-/plugins/code-coverage-backend                    @backstage/maintainers @alde @nissayeva
-/plugins/cost-insights                            @backstage/maintainers @backstage/silver-lining
-/plugins/cost-insights-*                          @backstage/maintainers @backstage/silver-lining
-/plugins/devtools                                 @backstage/maintainers @awanlin
-/plugins/devtools-backend                         @backstage/maintainers @awanlin
-/plugins/devtools-common                          @backstage/maintainers @awanlin
-/plugins/entity-feedback                          @backstage/maintainers @kuangp
-/plugins/entity-feedback-*                        @backstage/maintainers @kuangp
-/plugins/events-backend                           @backstage/maintainers @pjungermann
-/plugins/events-backend-module-aws-sqs            @backstage/maintainers @pjungermann
-/plugins/events-backend-module-azure              @backstage/maintainers @pjungermann
-/plugins/events-backend-module-bitbucket-cloud    @backstage/maintainers @pjungermann
-/plugins/events-backend-module-gerrit             @backstage/maintainers @pjungermann
-/plugins/events-backend-module-github             @backstage/maintainers @pjungermann
-/plugins/events-backend-module-gitlab             @backstage/maintainers @pjungermann
-/plugins/events-backend-test-utils                @backstage/maintainers @pjungermann
-/plugins/events-node                              @backstage/maintainers @pjungermann
-/plugins/explore                                  @backstage/maintainers @backstage/sda-se-reviewers
-/plugins/explore-react                            @backstage/maintainers @backstage/sda-se-reviewers
-/plugins/fossa                                    @backstage/maintainers @backstage/sda-se-reviewers
-/plugins/gcalendar                                @backstage/maintainers @szubster @ptychu @kielosz @alexrybch
-/plugins/git-release-manager                      @backstage/maintainers @erikengervall
+/plugins/adr                                      @backstage/maintainers @backstage/reviewers @kuangp
+/plugins/adr-*                                    @backstage/maintainers @backstage/reviewers @kuangp
+/plugins/api-docs                                 @backstage/maintainers @backstage/reviewers @backstage/sda-se-reviewers
+/plugins/azure-devops                             @backstage/maintainers @backstage/reviewers @awanlin
+/plugins/azure-devops-backend                     @backstage/maintainers @backstage/reviewers @awanlin
+/plugins/azure-devops-common                      @backstage/maintainers @backstage/reviewers @awanlin
+/plugins/bitbucket-cloud-common                   @backstage/maintainers @backstage/reviewers @pjungermann
+/plugins/bitrise                                  @backstage/maintainers @backstage/reviewers @backstage/sda-se-reviewers
+/plugins/catalog                                  @backstage/maintainers @backstage/reviewers @backstage/catalog-maintainers
+/plugins/catalog-*                                @backstage/maintainers @backstage/reviewers @backstage/catalog-maintainers
+/plugins/catalog-backend-module-aws               @backstage/maintainers @backstage/reviewers @backstage/catalog-maintainers @pjungermann
+/plugins/catalog-backend-module-bitbucket-cloud   @backstage/maintainers @backstage/reviewers @backstage/catalog-maintainers @pjungermann
+/plugins/catalog-backend-module-msgraph           @backstage/maintainers @backstage/reviewers @backstage/catalog-maintainers @pjungermann
+/plugins/catalog-backend-module-puppetdb          @backstage/maintainers @backstage/reviewers @backstage/catalog-maintainers
+/plugins/catalog-graph                            @backstage/maintainers @backstage/reviewers @backstage/catalog-maintainers @backstage/sda-se-reviewers
+/plugins/circleci                                 @backstage/maintainers @backstage/reviewers @adamdmharvey
+/plugins/code-coverage                            @backstage/maintainers @backstage/reviewers @alde
+/plugins/code-coverage-backend                    @backstage/maintainers @backstage/reviewers @alde
+/plugins/cost-insights                            @backstage/maintainers @backstage/reviewers @backstage/silver-lining
+/plugins/cost-insights-*                          @backstage/maintainers @backstage/reviewers @backstage/silver-lining
+/plugins/devtools                                 @backstage/maintainers @backstage/reviewers @awanlin
+/plugins/devtools-backend                         @backstage/maintainers @backstage/reviewers @awanlin
+/plugins/devtools-common                          @backstage/maintainers @backstage/reviewers @awanlin
+/plugins/entity-feedback                          @backstage/maintainers @backstage/reviewers @kuangp
+/plugins/entity-feedback-*                        @backstage/maintainers @backstage/reviewers @kuangp
+/plugins/events-backend                           @backstage/maintainers @backstage/reviewers @pjungermann
+/plugins/events-backend-module-aws-sqs            @backstage/maintainers @backstage/reviewers @pjungermann
+/plugins/events-backend-module-azure              @backstage/maintainers @backstage/reviewers @pjungermann
+/plugins/events-backend-module-bitbucket-cloud    @backstage/maintainers @backstage/reviewers @pjungermann
+/plugins/events-backend-module-gerrit             @backstage/maintainers @backstage/reviewers @pjungermann
+/plugins/events-backend-module-github             @backstage/maintainers @backstage/reviewers @pjungermann
+/plugins/events-backend-module-gitlab             @backstage/maintainers @backstage/reviewers @pjungermann
+/plugins/events-backend-test-utils                @backstage/maintainers @backstage/reviewers @pjungermann
+/plugins/events-node                              @backstage/maintainers @backstage/reviewers @pjungermann
+/plugins/explore                                  @backstage/maintainers @backstage/reviewers @backstage/sda-se-reviewers
+/plugins/explore-react                            @backstage/maintainers @backstage/reviewers @backstage/sda-se-reviewers
+/plugins/fossa                                    @backstage/maintainers @backstage/reviewers @backstage/sda-se-reviewers
+/plugins/git-release-manager                      @backstage/maintainers @backstage/reviewers @erikengervall
 /plugins/home                                     @backstage/discoverability-maintainers
 /plugins/home-*                                   @backstage/discoverability-maintainers
-/plugins/ilert                                    @backstage/maintainers @yacut
-/plugins/jenkins                                  @backstage/maintainers @timja
-/plugins/jenkins-backend                          @backstage/maintainers @timja
-/plugins/kafka                                    @backstage/maintainers @nirga @andrewthauer
-/plugins/kafka-backend                            @backstage/maintainers @nirga @andrewthauer
-/plugins/kubernetes                               @backstage/maintainers @backstage/kubernetes-maintainers
-/plugins/kubernetes-*                             @backstage/maintainers @backstage/kubernetes-maintainers
-/plugins/linguist                                 @backstage/maintainers @awanlin
-/plugins/linguist-backend                         @backstage/maintainers @awanlin
-/plugins/linguist-common                          @backstage/maintainers @awanlin
-/plugins/microsoft-calendar                       @backstage/maintainers @abhay-soni-developer @NishkarshRaj
-/plugins/newrelic-dashboard                       @backstage/maintainers @mufaddal7
+/plugins/kafka                                    @backstage/maintainers @backstage/reviewers @andrewthauer
+/plugins/kafka-backend                            @backstage/maintainers @backstage/reviewers @andrewthauer
+/plugins/kubernetes                               @backstage/kubernetes-maintainers
+/plugins/kubernetes-*                             @backstage/kubernetes-maintainers
+/plugins/linguist                                 @backstage/maintainers @backstage/reviewers @awanlin
+/plugins/linguist-backend                         @backstage/maintainers @backstage/reviewers @awanlin
+/plugins/linguist-common                          @backstage/maintainers @backstage/reviewers @awanlin
 /plugins/permission-*                             @backstage/permission-maintainers
-/plugins/playlist                                 @backstage/maintainers @kuangp
-/plugins/playlist-*                               @backstage/maintainers @kuangp
-/plugins/puppetdb                                 @backstage/maintainers @tdabasinskas
-/plugins/rollbar                                  @backstage/maintainers @andrewthauer
-/plugins/rollbar-backend                          @backstage/maintainers @andrewthauer
-/plugins/scaffolder-backend-module-rails          @backstage/maintainers @angeliski
-/plugins/scaffolder-backend-module-yeoman         @backstage/maintainers @pawelmitka
+/plugins/playlist                                 @backstage/maintainers @backstage/reviewers @kuangp
+/plugins/playlist-*                               @backstage/maintainers @backstage/reviewers @kuangp
+/plugins/rollbar                                  @backstage/maintainers @backstage/reviewers @andrewthauer
+/plugins/rollbar-backend                          @backstage/maintainers @backstage/reviewers @andrewthauer
 /plugins/search                                   @backstage/discoverability-maintainers
 /plugins/search-*                                 @backstage/discoverability-maintainers
-/plugins/sonarqube                                @backstage/maintainers @backstage/sda-se-reviewers
+/plugins/sonarqube                                @backstage/maintainers @backstage/reviewers @backstage/sda-se-reviewers
 /plugins/stack-overflow                           @backstage/discoverability-maintainers
 /plugins/stack-overflow-backend                   @backstage/discoverability-maintainers
 /plugins/techdocs                                 @backstage/techdocs-maintainers
 /plugins/techdocs-*                               @backstage/techdocs-maintainers
-/plugins/user-settings-backend                    @backstage/maintainers @backstage/sda-se-reviewers
-/tech-insights-backend                            @backstage/maintainers @xantier @iain-b
-/tech-insights-backend-module-jsonfc              @backstage/maintainers @xantier @iain-b
-/tech-insights-tech-insights-common               @backstage/maintainers @xantier @iain-b
-/tech-insights-tech-insights-node                 @backstage/maintainers @xantier @iain-b
-yarn.lock                                         @backstage/maintainers @backstage-service
+/plugins/user-settings-backend                    @backstage/maintainers @backstage/reviewers @backstage/sda-se-reviewers
+/plugins/tech-insights-backend                    @backstage/maintainers @backstage/reviewers @xantier
+/plugins/tech-insights-backend-module-jsonfc      @backstage/maintainers @backstage/reviewers @xantier
+/plugins/tech-insights-tech-insights-common       @backstage/maintainers @backstage/reviewers @xantier
+/plugins/tech-insights-tech-insights-node         @backstage/maintainers @backstage/reviewers @xantier
diff --git a/.github/labeler.yml b/.github/labeler.yml
index eaba199588..dc048b1744 100644
--- a/.github/labeler.yml
+++ b/.github/labeler.yml
@@ -24,6 +24,8 @@ documentation:
   - docs/**/*
 microsite:
   - microsite/**/*
+storybook:
+  - storybook/**/*
 auth:
   - plugins/auth-backend/**/*
   - packages/core-app-api/src/apis/implementations/auth/**/*
diff --git a/.github/uffizzi/uffizzi.production.app-config.yaml b/.github/uffizzi/uffizzi.production.app-config.yaml
index 77b093e024..34f4c90f0b 100644
--- a/.github/uffizzi/uffizzi.production.app-config.yaml
+++ b/.github/uffizzi/uffizzi.production.app-config.yaml
@@ -56,72 +56,73 @@ catalog:
         - allow: [Template]
 
 proxy:
-  '/circleci/api':
-    target: https://circleci.com/api/v1.1
-    headers:
-      Circle-Token: ${CIRCLECI_AUTH_TOKEN}
+  endpoints:
+    '/circleci/api':
+      target: https://circleci.com/api/v1.1
+      headers:
+        Circle-Token: ${CIRCLECI_AUTH_TOKEN}
 
-  '/jenkins/api':
-    target: http://localhost:8080
-    headers:
-      Authorization: ${JENKINS_BASIC_AUTH_HEADER}
+    '/jenkins/api':
+      target: http://localhost:8080
+      headers:
+        Authorization: ${JENKINS_BASIC_AUTH_HEADER}
 
-  '/travisci/api':
-    target: https://api.travis-ci.com
-    changeOrigin: true
-    headers:
-      Authorization: ${TRAVISCI_AUTH_TOKEN}
-      travis-api-version: '3'
+    '/travisci/api':
+      target: https://api.travis-ci.com
+      changeOrigin: true
+      headers:
+        Authorization: ${TRAVISCI_AUTH_TOKEN}
+        travis-api-version: '3'
 
-  '/newrelic/apm/api':
-    target: https://api.newrelic.com/v2
-    headers:
-      X-Api-Key: ${NEW_RELIC_REST_API_KEY}
+    '/newrelic/apm/api':
+      target: https://api.newrelic.com/v2
+      headers:
+        X-Api-Key: ${NEW_RELIC_REST_API_KEY}
 
-  '/newrelic/api':
-    target: https://api.newrelic.com
-    headers:
-      X-Api-Key: ${NEW_RELIC_USER_KEY}
+    '/newrelic/api':
+      target: https://api.newrelic.com
+      headers:
+        X-Api-Key: ${NEW_RELIC_USER_KEY}
 
-  '/pagerduty':
-    target: https://api.pagerduty.com
-    headers:
-      Authorization: Token token=${PAGERDUTY_TOKEN}
+    '/pagerduty':
+      target: https://api.pagerduty.com
+      headers:
+        Authorization: Token token=${PAGERDUTY_TOKEN}
 
-  '/buildkite/api':
-    target: https://api.buildkite.com/v2/
-    headers:
-      Authorization: ${BUILDKITE_TOKEN}
+    '/buildkite/api':
+      target: https://api.buildkite.com/v2/
+      headers:
+        Authorization: ${BUILDKITE_TOKEN}
 
-  '/sentry/api':
-    target: https://sentry.io/api/
-    allowedMethods: ['GET']
-    headers:
-      Authorization: ${SENTRY_TOKEN}
+    '/sentry/api':
+      target: https://sentry.io/api/
+      allowedMethods: ['GET']
+      headers:
+        Authorization: ${SENTRY_TOKEN}
 
-  '/ilert':
-    target: https://api.ilert.com
-    allowedMethods: ['GET', 'POST', 'PUT']
-    allowedHeaders: ['Authorization']
-    headers:
-      Authorization: ${ILERT_AUTH_HEADER}
+    '/ilert':
+      target: https://api.ilert.com
+      allowedMethods: ['GET', 'POST', 'PUT']
+      allowedHeaders: ['Authorization']
+      headers:
+        Authorization: ${ILERT_AUTH_HEADER}
 
-  '/airflow':
-    target: https://your.airflow.instance.com/api/v1
-    headers:
-      Authorization: ${AIRFLOW_BASIC_AUTH_HEADER}
+    '/airflow':
+      target: https://your.airflow.instance.com/api/v1
+      headers:
+        Authorization: ${AIRFLOW_BASIC_AUTH_HEADER}
 
-  '/gocd':
-    target: https://your.gocd.instance.com/go/api
-    allowedMethods: ['GET']
-    allowedHeaders: ['Authorization']
-    headers:
-      Authorization: Basic ${GOCD_AUTH_CREDENTIALS}
+    '/gocd':
+      target: https://your.gocd.instance.com/go/api
+      allowedMethods: ['GET']
+      allowedHeaders: ['Authorization']
+      headers:
+        Authorization: Basic ${GOCD_AUTH_CREDENTIALS}
 
-  '/dynatrace':
-    target: https://your.dynatrace.instance.com/api/v2
-    headers:
-      Authorization: 'Api-Token ${DYNATRACE_ACCESS_TOKEN}'
+    '/dynatrace':
+      target: https://your.dynatrace.instance.com/api/v2
+      headers:
+        Authorization: 'Api-Token ${DYNATRACE_ACCESS_TOKEN}'
 
 techdocs:
   builder: 'local' # Alternatives - 'external'
@@ -279,3 +280,7 @@ gocd:
 
 permission:
   enabled: true
+
+search:
+  query:
+    pageLimit: 50
diff --git a/.github/vale/Vocab/Backstage/accept.txt b/.github/vale/Vocab/Backstage/accept.txt
index ed09c73c91..9fa7af5585 100644
--- a/.github/vale/Vocab/Backstage/accept.txt
+++ b/.github/vale/Vocab/Backstage/accept.txt
@@ -123,8 +123,11 @@ FireHydrant
 Firekube
 Firestore
 Fiverr
+Flightcontrol
+flightcontrol
 Francesco
 Frontside
+Gaurav
 gerrit
 Gerrit
 gitbeaker
@@ -164,6 +167,7 @@ inlined
 inlinehilite
 integrator's
 interop
+iterable
 JaCoCo
 JavaScript
 jenkins
@@ -257,6 +261,7 @@ padding
 paddings
 pagerduty
 pageview
+Pandey
 parallelization
 parseable
 Patrik
@@ -405,6 +410,7 @@ unbreak
 Unconference
 unicode
 unmanaged
+unmount
 unregister
 unregistering
 unregistration
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index e395370f62..65844e339a 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -79,6 +79,9 @@ jobs:
       - name: verify local dependency ranges
         run: node scripts/verify-local-dependencies.js
 
+      - name: type checking and declarations
+        run: yarn fix --check
+
       - name: validate config
         run: yarn backstage-cli config:check --lax
 
diff --git a/.github/workflows/deploy_docker-image.yml b/.github/workflows/deploy_docker-image.yml
index 6fdfd5d5a4..231b81598e 100644
--- a/.github/workflows/deploy_docker-image.yml
+++ b/.github/workflows/deploy_docker-image.yml
@@ -10,7 +10,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        node-version: [16.x]
+        node-version: [18.x]
 
     steps:
       - name: checkout
diff --git a/.github/workflows/scorecard.yml b/.github/workflows/scorecard.yml
new file mode 100644
index 0000000000..d247312f89
--- /dev/null
+++ b/.github/workflows/scorecard.yml
@@ -0,0 +1,66 @@
+# This workflow uses actions that are not certified by GitHub. They are provided
+# by a third-party and are governed by separate terms of service, privacy
+# policy, and support documentation.
+
+name: Scorecard supply-chain security
+on:
+  # For Branch-Protection check. Only the default branch is supported. See
+  # https://github.com/ossf/scorecard/blob/main/docs/checks.md#branch-protection
+  # branch_protection_rule:
+  # To guarantee Maintained check is occasionally updated. See
+  # https://github.com/ossf/scorecard/blob/main/docs/checks.md#maintained
+  schedule:
+    - cron: '41 8 * * 6'
+  push:
+    branches: ['master']
+
+# Declare default permissions as read only.
+permissions: read-all
+
+jobs:
+  analysis:
+    name: Scorecard analysis
+    runs-on: ubuntu-latest
+    permissions:
+      # Needed to upload the results to code-scanning dashboard.
+      security-events: write
+      # Needed to publish results and get a badge (see publish_results below).
+      id-token: write
+
+    steps:
+      - name: 'Checkout code'
+        uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3.6.0
+        with:
+          persist-credentials: false
+
+      - name: 'Run analysis'
+        uses: ossf/scorecard-action@08b4669551908b1024bb425080c797723083c031 # v2.2.0
+        with:
+          results_file: results.sarif
+          results_format: sarif
+          # (Optional) "write" PAT token. Uncomment the `repo_token` line below if:
+          # - you want to enable the Branch-Protection check on a *public* repository, or
+          # - you are installing Scorecard on a *private* repository
+          # To create the PAT, follow the steps in https://github.com/ossf/scorecard-action#authentication-with-pat.
+          # repo_token: ${{ secrets.SCORECARD_TOKEN }}
+
+          # Public repositories:
+          #   - Publish results to OpenSSF REST API for easy access by consumers
+          #   - Allows the repository to include the Scorecard badge.
+          #   - See https://github.com/ossf/scorecard-action#publishing-results.
+          publish_results: true
+
+      # Upload the results as artifacts (optional). Commenting out will disable uploads of run results in SARIF
+      # format to the repository Actions tab.
+      - name: 'Upload artifact'
+        uses: actions/upload-artifact@0b7f8abb1508181956e8e162db84b466c27e18ce # v3.1.2
+        with:
+          name: SARIF file
+          path: results.sarif
+          retention-days: 5
+
+      # Upload the results to GitHub's code scanning dashboard.
+      - name: 'Upload to code-scanning'
+        uses: github/codeql-action/upload-sarif@00e563ead9f72a8461b24876bee2d0c2e8bd2ee8 # v2.21.5
+        with:
+          sarif_file: results.sarif
diff --git a/.github/workflows/sync_snyk-monitor.yml b/.github/workflows/sync_snyk-monitor.yml
index 87dec287d7..8bfa90d726 100644
--- a/.github/workflows/sync_snyk-monitor.yml
+++ b/.github/workflows/sync_snyk-monitor.yml
@@ -30,7 +30,7 @@ jobs:
             --remote-repo-url=https://github.com/backstage/backstage
         env:
           SNYK_TOKEN: ${{ secrets.SNYK_TOKEN }}
-          NODE_OPTIONS: --max-old-space-size=4096
+          NODE_OPTIONS: --max-old-space-size=7168
 
       # Above we run the `monitor` command, this runs the `test` command which is
       # the one that generates the SARIF report that we can upload to GitHub.
@@ -45,7 +45,7 @@ jobs:
             --sarif-file-output=snyk.sarif
         env:
           SNYK_TOKEN: ${{ secrets.SNYK_TOKEN }}
-          NODE_OPTIONS: --max-old-space-size=4096
+          NODE_OPTIONS: --max-old-space-size=7168
       - name: Upload Snyk report
         uses: github/codeql-action/upload-sarif@v2
         with:
diff --git a/.github/workflows/sync_version-packages.yml b/.github/workflows/sync_version-packages.yml
index 22421925c7..6d662ea05f 100644
--- a/.github/workflows/sync_version-packages.yml
+++ b/.github/workflows/sync_version-packages.yml
@@ -27,3 +27,11 @@ jobs:
         env:
           GITHUB_TOKEN: ${{ secrets.GH_SERVICE_ACCOUNT_TOKEN }}
           HUSKY: '0'
+
+      - name: Discord notification
+        if: ${{ failure() }}
+        uses: Ilshidur/action-discord@0.3.2
+        env:
+          DISCORD_WEBHOOK: ${{ secrets.DISCORD_WEBHOOK }}
+        with:
+          args: 'Version Packages Sync Failed https://github.com/{{GITHUB_REPOSITORY}}/actions/runs/{{GITHUB_RUN_ID}}'
diff --git a/.github/workflows/uffizzi-build.yml b/.github/workflows/uffizzi-build.yml
index fc62d36563..a018537daf 100644
--- a/.github/workflows/uffizzi-build.yml
+++ b/.github/workflows/uffizzi-build.yml
@@ -4,6 +4,8 @@ on:
     types: [opened, synchronize, reopened, closed]
     paths-ignore:
       - 'microsite/**'
+      - 'storybook/**'
+      - 'contrib/**'
       - '*.md'
 
 jobs:
diff --git a/.github/workflows/verify_e2e-kubernetes-noop.yml b/.github/workflows/verify_e2e-kubernetes-noop.yml
index ee9dbc69e2..ac49fbc469 100644
--- a/.github/workflows/verify_e2e-kubernetes-noop.yml
+++ b/.github/workflows/verify_e2e-kubernetes-noop.yml
@@ -6,7 +6,7 @@ on:
   pull_request:
     paths-ignore:
       - 'yarn.lock'
-      - '.github/workflows/verify_kubernetes.yml'
+      - '.github/workflows/verify_e2e-kubernetes.yml'
       - 'packages/backend-common/src/**'
 
 jobs:
diff --git a/.github/workflows/verify_e2e-kubernetes.yml b/.github/workflows/verify_e2e-kubernetes.yml
index c05339f595..4c25c259c5 100644
--- a/.github/workflows/verify_e2e-kubernetes.yml
+++ b/.github/workflows/verify_e2e-kubernetes.yml
@@ -4,7 +4,7 @@ on:
   pull_request:
     paths:
       - 'yarn.lock'
-      - '.github/workflows/verify_kubernetes.yml'
+      - '.github/workflows/verify_e2e-kubernetes.yml'
       - 'packages/backend-common/src/**'
 
 jobs:
@@ -35,7 +35,7 @@ jobs:
           cache-prefix: ${{ runner.os }}-v${{ matrix.node-version }}
 
       - name: bootstrap kind
-        uses: helm/kind-action@v1.7.0
+        uses: helm/kind-action@v1.8.0
 
       - name: kubernetes test
         working-directory: packages/backend-common
diff --git a/ADOPTERS.md b/ADOPTERS.md
index 9c76b01ff3..0d5b9fba59 100644
--- a/ADOPTERS.md
+++ b/ADOPTERS.md
@@ -35,7 +35,7 @@ _You can do this by using the [Adopter form](https://info.backstage.spotify.com/
 | [PagerDuty](https://www.pagerduty.com/)                                     | [Mark Shaw](https://github.com/markshawtoronto)                                                                                                                                                                                                                  | Developer portal, initially focused on software templates and tech-docs.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                               |
 | [MoonShiner](https://moonshiner.at)                                         | [Fabian Hippmann](https://github.com/FabianHippmann)                                                                                                                                                                                                             | Developer portal - helps us keep track of our customer projects, onboard new developers & improve our development process 🌕🚀🧑‍🚀                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    |
 | [FundApps](https://www.fundapps.co/)                                        | [Elliot Greenwood](https://github.com/egnwd)                                                                                                                                                                                                                     | Developer Portal - A place for us to keep track of our projects and documentation for all services and processes                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                       |
-| [DAZN](https://dazn.com/)                                                   | [David Rubio Vidal](https://github.com/davidrv87), [Marco Crivellaro](https://github.com/crivetechie), [Alex Hollerith](mailto:alex.hollerith@dazn.com), [Kamil Wolny](https://github.com/mrwolny)                                                               | Ingesting all of DAZN's repos for the catalog, migrating our internal platform apps (pull request boards, release information, inner source marketplace etc) to Backstage plugins (where applicable).                                                                                                                                                                                                                                                                                                                                                                                                                  |
+| [DAZN](https://dazn.com/)                                                   | [David Rubio Vidal](https://github.com/davidrv87), [Marco Crivellaro](https://github.com/crivetechie), [Marian Bazalik](https://github.com/mbazalik)                                                               | Ingesting all of DAZN's repos for the catalog, migrating our internal platform apps (pull request boards, release information, inner source marketplace etc) to Backstage plugins (where applicable).                                                                                                                                                                                                                                                                                                                                                                                                                  |
 | [HelloFresh](https://www.hellofresh.de/)                                    | [@iammuho](https://github.com/iammuho), [@ElenaForester](https://github.com/ElenaForester), [@diegomarangoni](https://github.com/diegomarangoni)                                                                                                                 | Our developer portal at HelloFresh - Spread across an organisation of 500+ engineers globally.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                         |
 | [FactSet](https://www.factset.com/)                                         | [@kuangp](https://github.com/kuangp)                                                                                                                                                                                                                             | Developer portal to provide discoverability to all internal components, APIs, documentation, and scaffold templates with integrations to our internal infrastructure tools.                                                                                                                                                                                                                                                                                                                                                                                                                                            |
 | [Workrise](https://www.workrise.com/)                                       | [Michael Rode](https://github.com/michaelrode)                                                                                                                                                                                                                   | Developer portal, main gateway to our infrastructure, documentation and internal tooling.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              |
@@ -43,7 +43,7 @@ _You can do this by using the [Adopter form](https://info.backstage.spotify.com/
 | [MavTek](https://www.mavtek.com/)                                           | [@fgascon](https://github.com/fgascon)                                                                                                                                                                                                                           | Developer portal focused on standardizing practices, centralizing documentation and streamlining developer practices.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  |
 | [QuintoAndar](https://www.quintoandar.com.br/)                              | [@quintoandar](https://github.com/quintoandar)                                                                                                                                                                                                                   | Developer portal, services catalog and centralization of service metrics.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              |
 | [empathy.co](https://empathy.co/)                                           | [@guillermotti](https://github.com/guillermotti)                                                                                                                                                                                                                 | Developer portal for tech docs, service catalog, plugin discovery and much more.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                       |
-| [creditas.com](https://creditas.com/)                                       | [@aureliosaraiva](https://github.com/aureliosaraiva) [@Creditas](https://github.com/creditas)                                                                                                                                                                    | Centralization of all services, standards, documentation, etc. We started the deployment process.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      |
+| [creditas.com](https://creditas.com/)                                       | [@rebender](https://github.com/rebender) [@Creditas](https://github.com/creditas)                                                                                                                                                                    | Centralization of all services, standards, documentation, etc. We started the deployment process.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      |
 | [Prisjakt](https://www.prisjakt.nu) / [PriceSpy](https://pricespy.co.uk)    | [@kennylindahl](https://github.com/kennylindahl)                                                                                                                                                                                                                 | Internal developer portal - Documentation, scaffolding, software catalog, TechRadar, Gitlab org data integration                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                       |
 | [Powerspike](https://powerspike.tv/)                                        | [@trelore](https://github.com/trelore)                                                                                                                                                                                                                           | Developer portal for documentation of core libraries and repositories.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                 |
 | [2U](https://2u.com)                                                        | [@danielleEriksen](https://github.com/danielleEriksen), [@sbhatia](https://github.com/sbhatia)                                                                                                                                                                   | Development team home-base, promoting service discoverability, resource dependencies, and tech radar                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                   |
@@ -256,3 +256,7 @@ _You can do this by using the [Adopter form](https://info.backstage.spotify.com/
 | [JB Hi-Fi](https://www.jbhifi.com.au) | [@bahman](https://github.com/bahman-jb/) | We use Backstage as a central place for all of our components/apis across multiple teams. It helps us to quickly identify the ownership of a component/api, find the related links and have a quick access to CI/CD pipelines. |
 | [Zenklub](https://www.zenklub.com.br) | [@zenklub](https://github.com/zenklub), [@gioufop](https://github.com/gioufop) | Developer portal, services catalog and centralization of metrics from Grafana Stack and AWS. Furthermore, centralization of documentation and infra details like Tools, Network services and so on. |
 | [Platzi](https://platzi.com/) | [@juancarestre](https://github.com/juancarestre/), [Engineering at Platzi](https://github.com/PlatziDev/) | Backstage allow our developers to get easily engaged with all the internal components, technical documentations and software templates. All new developers reduce its onboarding time via Backstage, and after a couple of integrations it allowed us to create new components with in a couple of clicks. |
+| [idealo](https://idealo.de) | [Wanis Fahmy](https://github.com/wanisfahmyDE), [Sajjad Pervaiz](https://github.com/sjvaiz), [Tim Heurich](https://github.com/theurichde) | Backstage is our Internal developer portal. Along with other plugins, We use the software catalog, TechDocs and explore plugins to manage, discover and document our software components and platform products. |
+| [Localiza&Co](https://www.localiza.com/) | [Augusto Amormino](https://github.com/augustoamormino), [Jonas Soares](https://github.com/jonaopower), [Alexandre Amormino](https://github.com/alexandreamormino), [Greg Almeida](https://github.com/sephh) | We're excited to announce our adoption of Backstage as our Internal Developer Portal! Our mission is to elevate the Developer Experience by streaming information access. Backstage will serve as the ultimate hub for developer resources, including documentation, tools, software insights, and metrics. Through Backstage, we're simplifying processes, offering software templates to empowered and efficient development journey, enhancing self-service capabilities with the embedded all best practices. |
+| [V2 Digital](https://v2.digital) | [Joe Patterson](https://github.com/jrwpatterson)| We will be using it to be a corporate dashboard plus our software catalog. |
+| [AppsFlyer](https://www.appsflyer.com/) | [Shahar Shmaram](https://github.com/shmaram)                                                                                                                                                                                                                     | Internal Developer Portal, a catalog of all company resources, custom providers and processors, scaffolder for generating new resources.
diff --git a/OWNERS.md b/OWNERS.md
index 5a9457d755..6c26078f8c 100644
--- a/OWNERS.md
+++ b/OWNERS.md
@@ -42,6 +42,7 @@ Scope: Discoverability within Backstage, including the home page, information ar
 | Emma Indal               | Spotify      | BUX  | [emmaindal](http://github.com/emmaindal) | emmaindal#7503     |
 | Raghunandan Balachandran | Spotify      | BUX  | [soapraj](http://github.com/soapraj)     | raghunandanb#1114  |
 | Renan Mendes Carvalho    | Spotify      | BUX  | [aitherios](http://github.com/aitherios) | aitherios#0593     |
+| Bailey Brooks            | Spotify      | BUX  | [bailey](http://github.com/bailey)       | \_bailey4          |
 
 ### Helm Charts
 
@@ -89,10 +90,17 @@ Team: @backstage/techdocs-maintainers
 
 Scope: The TechDocs plugin and related tooling
 
-| Name                     | Organization | Team         | GitHub                                           | Discord            |
-| ------------------------ | ------------ | ------------ | ------------------------------------------------ | ------------------ |
-| Morgan Bentell           | Spotify      | Pulp Fiction | [agentbellnorm](http://github.com/agentbellnorm) | morganbentell#9030 |
-| Raghunandan Balachandran | Spotify      | Pulp Fiction | [soapraj](http://github.com/soapraj)             | raghunandanb#1114  |
+| Name                     | Organization | Team    | GitHub                                            | Discord             |
+| ------------------------ | ------------ | ------- | ------------------------------------------------- | ------------------- |
+| Alex Lorenzi             | Spotify      | ProTean | [AlexLorenzi](https://github.com/AlexLorenzi)     | `alexlorenzi`       |
+| Bond Yan                 | Spotify      | ProTean | [byan1197](https://github.com/byan1197)           | `bondify`           |
+| Daniel Lochrie           | Spotify      | ProTean | [dlochrie](https://github.com/dlochrie)           | -                   |
+| Jackson Chen             | Spotify      | ProTean | [PeaWarrior](https://github.com/PeaWarrior)       | `jacksonc#3322`     |
+| John Philip              | Spotify      | ProTean | [johnphilip283](https://github.com/johnphilip283) | `john_philip#2399`  |
+| Morgan Bentell           | Spotify      | ProTean | [agentbellnorm](http://github.com/agentbellnorm)  | `morganbentell`     |
+| Raghunandan Balachandran | Spotify      | BUX     | [soapraj](http://github.com/soapraj)              | `raghunandanb#1114` |
+| Sydney Achinger          | Spotify      | ProTean | [squid-ney](https://github.com/squid-ney)         | -                   |
+| Vojta Burian             | Spotify      | ProTean | [sankaritan](https://github.com/sankaritan)       | `vojtabu`           |
 
 ## Incubating Project Areas
 
diff --git a/README.md b/README.md
index 9c8fbec79b..83f7512a07 100644
--- a/README.md
+++ b/README.md
@@ -13,8 +13,6 @@
 [![OpenSSF Best Practices](https://bestpractices.coreinfrastructure.org/projects/7678/badge)](https://bestpractices.coreinfrastructure.org/projects/7678)
 [![OpenSSF Scorecard](https://api.securityscorecards.dev/projects/github.com/backstage/backstage/badge)](https://securityscorecards.dev/viewer/?uri=github.com/backstage/backstage)
 
-> 🏖️ The week beginning the 26th of June, some of the maintainers will be taking a well earned Summer Holiday break. We will be slower to respond to issues and PRs during this time. Releases will continue to be shipped weekly. Normal service will resume on the 24th of July. 🏝️
-
 ## What is Backstage?
 
 [Backstage](https://backstage.io/) is an open platform for building developer portals. Powered by a centralized software catalog, Backstage restores order to your microservices and infrastructure and enables your product teams to ship high-quality code quickly without compromising autonomy.
@@ -67,7 +65,7 @@ To engage with our community, you can use the following resources:
 
 ## License
 
-Copyright 2020-2022 © The Backstage Authors. All rights reserved. The Linux Foundation has registered trademarks and uses trademarks. For a list of trademarks of The Linux Foundation, please see our Trademark Usage page: https://www.linuxfoundation.org/trademark-usage
+Copyright 2020-2023 © The Backstage Authors. All rights reserved. The Linux Foundation has registered trademarks and uses trademarks. For a list of trademarks of The Linux Foundation, please see our Trademark Usage page: https://www.linuxfoundation.org/trademark-usage
 
 Licensed under the Apache License, Version 2.0: http://www.apache.org/licenses/LICENSE-2.0
 
diff --git a/REVIEWING.md b/REVIEWING.md
index 500e15701d..43085090a8 100644
--- a/REVIEWING.md
+++ b/REVIEWING.md
@@ -20,6 +20,14 @@ When reviewing pull requests it's important to consider our [versioning policy a
 
 One other thing to keep in mind, especially when merging pull requests, is where in the release cycle we're currently at. In particular you want to avoid merging any large or risky changes towards the end of each release cycle. If there is a change that is ready to be merged, but you want to hold off until the next main line release, then you can label it with the `merge-after-release` label.
 
+## Configuration
+
+Pull requests that have [configuration related](https://backstage.io/docs/conf/defining) changes or additions need some extra consideration.
+
+- Every configuration field consumed by code should have a corresponding `config.d.ts` declaration.
+- Carefully consider the `@visibility` of configuration fields in the schema. The default is `backend`. Take extra care that sensitive/secret fields are marked as `@visibility secret` so that they don't accidentally leak. Also ensure that fields that the frontend wants to consume are marked as `@visibility frontend`, otherwise they can't be sent to the browser at all.
+- Check that the `config.d.ts` is mentioned in the consuming package's `package.json` as illustrated [in the docs](https://backstage.io/docs/conf/defining). Otherwise it won't get packaged and picked up by the runtime.
+
 ## Changesets
 
 We use changesets to track changes in all published packages. Changesets both define what should go into the changelog of each package, but also what kind of version bump should be done for the next release.
@@ -52,6 +60,7 @@ Some things that changeset should NOT contain are:
 - Information related to a different package.
 - A large amount of content, consider for example a separate migration guide instead, either in the package README or [./docs/](./docs/), and then link to that instead.
 - Documentation - changesets can describe new features, but it should not be relied on for documenting them. Documentation should either be placed in [TSDoc](https://tsdoc.org) comments, package README, or [./docs/](./docs/).
+- Diffs of internal code, for example mirroring what the pull request changes _inside_ a plugin rather than public surfaces. This is not of interest to the reader of a package changelog. Sometimes, however, a small and concise diff can be used in a changeset to illustrate changes that the user will have to make in _their own_ Backstage installation as part of an upgrade, specifically when breaking changes are made to a package.
 
 ### When is a changeset needed?
 
diff --git a/app-config.yaml b/app-config.yaml
index 999bb38005..37cb61f26e 100644
--- a/app-config.yaml
+++ b/app-config.yaml
@@ -73,6 +73,8 @@ proxy:
       target: https://api.newrelic.com/v2
       headers:
         X-Api-Key: ${NEW_RELIC_REST_API_KEY}
+      allowedHeaders:
+        - link
 
     '/newrelic/api':
       target: https://api.newrelic.com
diff --git a/contrib/.devcontainer/devcontainer.json b/contrib/.devcontainer/devcontainer.json
index b312102784..14e7d7f0ae 100644
--- a/contrib/.devcontainer/devcontainer.json
+++ b/contrib/.devcontainer/devcontainer.json
@@ -6,7 +6,7 @@
   "features": {
     "ghcr.io/devcontainers/features/common-utils:1": {},
     "ghcr.io/devcontainers/features/docker-from-docker:1": {},
-    "ghcr.io/devcontainers-contrib/features/mkdocs:1": {}
+    "ghcr.io/devcontainers-contrib/features/mkdocs:2": {}
   },
 
   // Use 'forwardPorts' to make a list of ports inside the container available locally.
diff --git a/contrib/.devcontainer/postCreate.sh b/contrib/.devcontainer/postCreate.sh
index f0631a4af2..88f403de5e 100755
--- a/contrib/.devcontainer/postCreate.sh
+++ b/contrib/.devcontainer/postCreate.sh
@@ -1,3 +1,6 @@
 #!/bin/bash
 yarn install
-pip install mkdocs-techdocs-core
\ No newline at end of file
+export VIRTUAL_ENV=$HOME/venv
+python3 -m venv $VIRTUAL_ENV
+export PATH="$VIRTUAL_ENV/bin:$PATH"
+python3 -m pip install mkdocs-techdocs-core
\ No newline at end of file
diff --git a/contrib/docs/tutorials/aws-alb-aad-oidc-auth.md b/contrib/docs/tutorials/aws-alb-aad-oidc-auth.md
index f28a62c018..b88efbb561 100644
--- a/contrib/docs/tutorials/aws-alb-aad-oidc-auth.md
+++ b/contrib/docs/tutorials/aws-alb-aad-oidc-auth.md
@@ -29,7 +29,7 @@ In the AWS console, configure ALB Authentication:
 - Select `OIDC` under `Authenticate`
 - Set `Issuer` to `https://login.microsoftonline.com/{TENANT_ID}/v2.0`, replacing `{TENANT_ID}` with the value of `Directory (tenant) ID` of the AAD App.
 - Set `Authorization endpoint` to `https://login.microsoftonline.com/{TENANT_ID}/oauth2/v2.0/authorize`, replacing `{TENANT_ID}` with the value of `Directory (tenant) ID` of the AAD App.
-- Set `Token endpoint` to `https://login.microsoftonline.com/{TENANT_ID}/oauth2/v2.0/authorize`, replacing `{TENANT_ID}` with the value of `Directory (tenant) ID` of the AAD App.
+- Set `Token endpoint` to `https://login.microsoftonline.com/{TENANT_ID}/oauth2/v2.0/token`, replacing `{TENANT_ID}` with the value of `Directory (tenant) ID` of the AAD App.
 - Set `User info endpoint` to `https://graph.microsoft.com/oidc/userinfo`
 - Set `Client ID` to the AAD App `Application (client) Id`
 - Set `Client secret` to the AAD APP `client secret`
diff --git a/docs/accessibility/index.md b/docs/accessibility/index.md
index 24685b95ce..b4d63fd4e4 100644
--- a/docs/accessibility/index.md
+++ b/docs/accessibility/index.md
@@ -15,35 +15,35 @@ There are multiple ways to contribute to making Backstage more accessible, you'l
 If your plugin lives in the [Backstage main repository](https://github.com/backstage/backstage/) you can modify the [urls in the Lighthouse config](https://github.com/backstage/backstage/blob/39ba2284d73885b7ca8290cb38e2b1e4d983c8d6/lighthouserc.js#L19-L34) to run the Lighthouse checks on urls where your plugin exists as well. E.g.
 
 ```diff
- ci: {
-    collect: {
-      url: [
+  ci: {
+     collect: {
+       url: [
+         /** Software Catalog */
+         'http://localhost:3000/catalog',
+         'http://localhost:3000/catalog-import',
+         'http://localhost:3000/catalog/default/component/backstage',
+         ...
 +        /** Your plugin paths */
 +        'http://localhost:3000/your-plugin-path,
-        /** Software Catalog */
-        'http://localhost:3000/catalog',
-        'http://localhost:3000/catalog-import',
-        'http://localhost:3000/catalog/default/component/backstage',
+       ],
+       settings: {
         ...
-      ],
-      settings: {
-       ...
-      },
-     ...
-    },
-    assert: {
+       },
       ...
-    },
-  },
+     },
+     assert: {
+       ...
+     },
+   },
 ```
 
-To make sure the [Accessibility Github workflow](https://github.com/backstage/backstage/blob/master/.github/workflows/verify_accessibility.yml) is running when changes are made to your plugin folders, modify the [list of paths](https://github.com/backstage/backstage/blob/10759b6ad2561bd86183ad940256f9a309c7a6b0/.github/workflows/verify_accessibility.yml#L7-L16).
+To make sure the [Accessibility GitHub workflow](https://github.com/backstage/backstage/blob/master/.github/workflows/verify_accessibility.yml) is running when changes are made to your plugin folders, modify the [list of paths](https://github.com/backstage/backstage/blob/10759b6ad2561bd86183ad940256f9a309c7a6b0/.github/workflows/verify_accessibility.yml#L7-L16).
 
 ### Run the Lighthouse CLI locally when developing new features
 
 If you want to use the Lighthouse CLI and run the checks based on the config you can use the following command:
 
-```
+```shell
 yarn dlx @lhci/cli@0.11.x autorun
 ```
 
diff --git a/docs/assets/permissions/permission-framework-overview.drawio.svg b/docs/assets/permissions/permission-framework-overview.drawio.svg
index 3740384748..fe73e92a38 100644
--- a/docs/assets/permissions/permission-framework-overview.drawio.svg
+++ b/docs/assets/permissions/permission-framework-overview.drawio.svg
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Do not edit this file with editors other than diagrams.net -->
+<!-- Do not edit this file with editors other than draw.io -->
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" width="642px" height="240px" viewBox="-0.5 -0.5 642 240" content="&lt;mxfile host=&quot;Electron&quot; modified=&quot;2023-02-03T01:42:11.939Z&quot; agent=&quot;5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) draw.io/20.8.14 Chrome/106.0.5249.199 Electron/21.4.0 Safari/537.36&quot; etag=&quot;b7d8TJtL8TzOSDB05xRz&quot; version=&quot;20.8.14&quot; type=&quot;device&quot;&gt;&lt;diagram id=&quot;TTnOLjRJzGgt66t77H9m&quot; name=&quot;Page-1&quot;&gt;5Vvfc6o4FP5rnNl9sENAUB6r7f0x293ptHun7b6hRGSLhIbY6v71m0AihETAqnh7+6SEkMTzne87OSfYsybL9VfsJYs/kQ+jnmn465511TNNYDkG/WAtm7xlNLDyhgCHPu9UNNyH/0HeyJ8LVqEPU6kjQSgiYSI3zlAcwxmR2jyM0ZvcbY4iedbEC6DScD/zIrX1IfTJgrcCxy1ufINhsOBTj8xhfmPpic78l6QLz0dvpSbrumdNMEIk/7ZcT2DEjCfskj/3Zcfd7cIwjEmbB4Lr6R93wWOf9JObh9H6xy0Mpn0+yqsXrfgP/pFCzBdMNsIKGK1iH7KBjJ41fluEBN4n3ozdfaO407YFWUb0CtCv6sLELBATuC418YV+hWgJCd7QLvzukNuMO82AX74VCIx406Jke9HN45gH23ELs9Av3DJ6K12v//pu3W7Ayz/99bX79O3vmwckrFQyCPSpl/BLhMkCBSj2ouuidSybrOhzg1DCDfUvJGTDXd5bESSbkVoPbx7Z8xe2uHwq37ta88Hzqw2/ytfKFrjTUcTvQSs8gzXeYXLCeTiApMmLVDAxjDwSvsrr0IGTPXqJsbcpdUhQGJO0NPItayh8BADZSYBrVIDORyxg3y6tlSfUWaTEl9toFYTxYYxhxAip5lxGYRDTNsJcZDxHMRE+thvE9qQy7UZWAVNDKzA8Aq+01rQM1ZwQL8M0DRE1qXEH0wTFKTwL/dYheRQEo9+fMiaOhuJewT52Ici3JS0oU9a4GNoNrM3AztcCxKjUFiE1NNXjMrPfQ2RLKwqHMlahpO1WKDkaUe2SBsmXyp8rR6vKUNawcahclpShjkV1q943v2BvCd8Qfj499a1xSjB63m5AzG3LBEUIZ7NahuG6Rq2XtFcK22pWCrtTpbAVMFRNiP1LtuGjV7PIozDNZEvLsAh6A4nedi25388/0JJ/JQPr7CvaDqQpGMnwOhXU2nK0GlCq45yYoI7iE5czkpHTiajBxlMsOYjzsmJb7Yxb/TST2kvawU3WGbTiNv0WsM/f7qDnZ7Z+WcGU/K6NQTfelOY7kpt5nMgz6iRMuRWGL0Pfz0MUpKvwptl4zL34hocObo979pUcFFyt/9VypUr3bZLE5+yV8xCdDBhCcTm+5lG8r18Rl8oAaD5P4Un8Zaj4C91fZK6eHqbhx9ibVcLdsF3GY59Kb03759lz1YtydeP0fpEedbNJAq6jhbpBNVX1deRxgN1uq7V3nuXq5zltnjU8p//tsyn4cP43sPVS01HUHikqLOI1s2SbiA0MGrKVeC20PDNQFrmT0nY9n4EuOJ8kf+Qw1W+1JzeMyeQ0EQJYZw4RrgKklB/doiicbQ4zcZVbioEnE2ZiLRhHMLntNAZlV2Nx81QWB2q5RFXJvbIgpeogyhd948IAplzDAEXDjiJGdtW6atFYVmxbtegma6pWJGy3VbhV9bdaJOlWf4Fa8q/U3LJ8Rxt+u0t3doTSelocIeExHONIWc5AAlkUjk+f5YBBs0gEVAWS9gK5tx0HFQ93R4pwgkGnymk2G2WvyBQxJtAtpg+xLhzVB64YxVAbs+ZhFLUr6dVD3xzhhIYpuGgPAE4Gi6bGitFryGAwjSlb6NibPaeEHdJW8aI/kei1KIJzcpgSsdQg5fjtgq8Mlmh6p4C1x03EopZHN6cjVIuCbMcqYwKNyjidGkWtSH4AldkO19Zbd9UXf1qVUQt/ExTPw2CFC52hCgAD7BGE1WLgL6Q07bGrURqrU1LpCgZnVhpLozTDTo2iJt8fQGlqyiH10H8UpRGT1SpNwl8YMSj1F7+43LQHsEZuOs0UttXa8xx8bIvNT6U7py48c+1orMfwfscrUB/28pCa00mFDJY5wNgvnwbnZV+p1wKh51Tt851vB3gnGCUQa7pdXFwcXXd3UG73Cx/1uuvDubeKSJ2D7FERHcgnwsAYqnzVSW711YDjeYGaQmoYHEVhksJmOLw0yV8inodrBmFLfHYW/7vGB4wqJ/aqnHaaJlpqMUrdqHwadAbVfeS50VGTeOvzouPYMnc0pz3doqNWEwafFx2VO93Bo/1PgLr70Lwy84HQ0WTJCmA70amEHeC0S8ROBo4qbPnfWgy6wU3ZhNkutebl8nO82Ne6TrEPMttHtju2GpvvOMqyh7IwVg4+33OWRS+Lfz7l3Yv/j1nX/wM=&lt;/diagram&gt;&lt;/mxfile&gt;"><defs/><g><rect x="31" y="21" width="80" height="40" fill="rgb(255, 255, 255)" stroke="rgb(0, 0, 0)" pointer-events="all"/><g transform="translate(-0.5 -0.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: 41px; margin-left: 32px;"><div data-drawio-colors="color: rgb(0, 0, 0); " style="box-sizing: border-box; font-size: 0px; text-align: center;"><div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; white-space: normal; overflow-wrap: normal;">User</div></div></div></foreignObject><text x="71" y="45" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="12px" text-anchor="middle">User</text></switch></g><path d="M 211 171 L 71 171 L 71 67.37" fill="none" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="stroke"/><path d="M 71 62.12 L 74.5 69.12 L 71 67.37 L 67.5 69.12 Z" fill="rgb(0, 0, 0)" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="all"/><rect x="211" y="21" width="120" height="170" fill="rgb(255, 255, 255)" stroke="rgb(0, 0, 0)" pointer-events="all"/><g transform="translate(-0.5 -0.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 flex-start; justify-content: unsafe center; width: 118px; height: 1px; padding-top: 28px; margin-left: 212px;"><div data-drawio-colors="color: rgb(0, 0, 0); " style="box-sizing: border-box; font-size: 0px; text-align: center;"><div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; font-weight: bold; white-space: normal; overflow-wrap: normal;">Plugin</div></div></div></foreignObject><text x="271" y="40" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="12px" text-anchor="middle" font-weight="bold">Plugin</text></switch></g><path d="M 491 169.07 L 411 169.1 L 337.37 169.47" fill="none" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="stroke"/><path d="M 332.12 169.49 L 339.1 165.96 L 337.37 169.47 L 339.14 172.96 Z" fill="rgb(0, 0, 0)" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="all"/><g transform="translate(-0.5 -0.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: 1px; height: 1px; padding-top: 170px; margin-left: 411px;"><div data-drawio-colors="color: rgb(0, 0, 0); background-color: rgb(255, 255, 255); " style="box-sizing: border-box; font-size: 0px; text-align: center;"><div style="display: inline-block; font-size: 10px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; background-color: rgb(255, 255, 255); white-space: nowrap;">Permission Response</div></div></div></foreignObject><text x="411" y="173" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="10px" text-anchor="middle">Permission Response</text></switch></g><rect x="491" y="21" width="150" height="170" fill="rgb(255, 255, 255)" stroke="#009900" stroke-width="2" pointer-events="all"/><g transform="translate(-0.5 -0.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 flex-start; justify-content: unsafe center; width: 148px; height: 1px; padding-top: 28px; margin-left: 492px;"><div data-drawio-colors="color: rgb(0, 0, 0); " style="box-sizing: border-box; font-size: 0px; text-align: center;"><div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; font-weight: bold; white-space: normal; overflow-wrap: normal;">Permission Framework</div></div></div></foreignObject><text x="566" y="40" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="12px" text-anchor="middle" font-weight="bold">Permission Framework</text></switch></g><path d="M 111 41 L 204.63 41" fill="none" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="stroke"/><path d="M 209.88 41 L 202.88 44.5 L 204.63 41 L 202.88 37.5 Z" fill="rgb(0, 0, 0)" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="all"/><g transform="translate(-0.5 -0.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: 1px; height: 1px; padding-top: 41px; margin-left: 157px;"><div data-drawio-colors="color: rgb(0, 0, 0); background-color: rgb(255, 255, 255); " style="box-sizing: border-box; font-size: 0px; text-align: center;"><div style="display: inline-block; font-size: 9px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; background-color: rgb(255, 255, 255); white-space: nowrap;">Action<br style="font-size: 9px;" />(Read request)</div></div></div></foreignObject><text x="157" y="43" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="9px" text-anchor="middle">Action...</text></switch></g><rect x="231" y="51" width="80" height="50" fill="rgb(255, 255, 255)" stroke="rgb(0, 0, 0)" pointer-events="all"/><g transform="translate(-0.5 -0.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: 76px; margin-left: 232px;"><div data-drawio-colors="color: rgb(0, 0, 0); " style="box-sizing: border-box; font-size: 0px; text-align: center;"><div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; white-space: normal; overflow-wrap: normal;">Resources</div></div></div></foreignObject><text x="271" y="80" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="12px" text-anchor="middle">Resources</text></switch></g><path d="M 231 136 L 157 136 L 157 57.37" fill="none" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="stroke"/><path d="M 157 52.12 L 160.5 59.12 L 157 57.37 L 153.5 59.12 Z" fill="rgb(0, 0, 0)" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="all"/><path d="M 311 136 L 411 136 L 411 57.37" fill="none" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="stroke"/><path d="M 411 52.12 L 414.5 59.12 L 411 57.37 L 407.5 59.12 Z" fill="rgb(0, 0, 0)" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="all"/><rect x="231" y="111" width="80" height="50" fill="rgb(255, 255, 255)" stroke="#0000cc" stroke-width="2" pointer-events="all"/><g transform="translate(-0.5 -0.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: 136px; margin-left: 232px;"><div data-drawio-colors="color: rgb(0, 0, 0); " style="box-sizing: border-box; font-size: 0px; text-align: center;"><div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; white-space: normal; overflow-wrap: normal;"><font style="font-size: 10px">Resource read permission</font></div></div></div></foreignObject><text x="271" y="140" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="12px" text-anchor="middle">Resource read...</text></switch></g><rect x="521" y="51" width="90" height="20" fill="rgb(255, 255, 255)" stroke="#cc0000" stroke-width="2" pointer-events="all"/><g transform="translate(-0.5 -0.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: 88px; height: 1px; padding-top: 61px; margin-left: 522px;"><div data-drawio-colors="color: rgb(0, 0, 0); " style="box-sizing: border-box; font-size: 0px; text-align: center;"><div style="display: inline-block; font-size: 10px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; white-space: normal; overflow-wrap: normal;">Permission Policy</div></div></div></foreignObject><text x="566" y="64" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="10px" text-anchor="middle">Permission Policy</text></switch></g><path d="M 331 40 L 482.83 40.04" fill="none" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="stroke"/><path d="M 488.08 40.04 L 481.08 43.54 L 482.83 40.04 L 481.08 36.54 Z" fill="rgb(0, 0, 0)" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="all"/><g transform="translate(-0.5 -0.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: 1px; height: 1px; padding-top: 39px; margin-left: 411px;"><div data-drawio-colors="color: rgb(0, 0, 0); background-color: rgb(255, 255, 255); " style="box-sizing: border-box; font-size: 0px; text-align: center;"><div style="display: inline-block; font-size: 10px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; background-color: rgb(255, 255, 255); white-space: nowrap;">Permission Request</div></div></div></foreignObject><text x="411" y="42" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="10px" text-anchor="middle">Permission Request</text></switch></g><rect x="1" y="184" width="20" height="10" fill="#009900" stroke="none" pointer-events="none"/><g transform="translate(-0.5 -0.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 flex-start; width: 1px; height: 1px; padding-top: 189px; margin-left: 33px;"><div data-drawio-colors="color: rgb(0, 0, 0); " style="box-sizing: border-box; font-size: 0px; text-align: left;"><div style="display: inline-block; font-size: 10px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: none; white-space: nowrap;">Provided by Backstage</div></div></div></foreignObject><text x="33" y="192" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="10px">Provided by Backstage</text></switch></g><rect x="1" y="204" width="20" height="10" fill="#cc0000" stroke="none" pointer-events="none"/><g transform="translate(-0.5 -0.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 flex-start; width: 1px; height: 1px; padding-top: 209px; margin-left: 33px;"><div data-drawio-colors="color: rgb(0, 0, 0); " style="box-sizing: border-box; font-size: 0px; text-align: left;"><div style="display: inline-block; font-size: 10px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: none; white-space: nowrap;">Configured by integrators</div></div></div></foreignObject><text x="33" y="212" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="10px">Configured by integrators</text></switch></g><rect x="1" y="224" width="20" height="10" fill="#0000cc" stroke="none" pointer-events="none"/><g transform="translate(-0.5 -0.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 flex-start; width: 1px; height: 1px; padding-top: 229px; margin-left: 33px;"><div data-drawio-colors="color: rgb(0, 0, 0); " style="box-sizing: border-box; font-size: 0px; text-align: left;"><div style="display: inline-block; font-size: 10px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: none; white-space: nowrap;">Configured by plugin authors</div></div></div></foreignObject><text x="33" y="232" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="10px">Configured by plugin authors</text></switch></g><rect x="506" y="88" width="120" height="60" fill="rgb(255, 255, 255)" stroke="#009900" stroke-width="2" pointer-events="none"/><g transform="translate(-0.5 -0.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: 118px; height: 1px; padding-top: 118px; margin-left: 507px;"><div data-drawio-colors="color: rgb(0, 0, 0); " style="box-sizing: border-box; font-size: 0px; text-align: center;"><div style="display: inline-block; font-size: 10px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: none; white-space: normal; overflow-wrap: normal;">Permission Backend<br />Permission hooks<br />Integration helpers<br />...</div></div></div></foreignObject><text x="566" y="121" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="10px" text-anchor="middle">Permission Backend...</text></switch></g><ellipse cx="156" cy="11" rx="10" ry="10" fill="rgb(255, 255, 255)" stroke="#000000" stroke-width="2" pointer-events="none"/><g transform="translate(-0.5 -0.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: 18px; height: 1px; padding-top: 11px; margin-left: 147px;"><div data-drawio-colors="color: rgb(0, 0, 0); " style="box-sizing: border-box; font-size: 0px; text-align: center;"><div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: none; white-space: normal; overflow-wrap: normal;">1</div></div></div></foreignObject><text x="156" y="15" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="12px" text-anchor="middle">1</text></switch></g><ellipse cx="411" cy="11" rx="10" ry="10" fill="rgb(255, 255, 255)" stroke="#000000" stroke-width="2" pointer-events="none"/><g transform="translate(-0.5 -0.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: 18px; height: 1px; padding-top: 11px; margin-left: 402px;"><div data-drawio-colors="color: rgb(0, 0, 0); " style="box-sizing: border-box; font-size: 0px; text-align: center;"><div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: none; white-space: normal; overflow-wrap: normal;">2</div></div></div></foreignObject><text x="411" y="15" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="12px" text-anchor="middle">2</text></switch></g><ellipse cx="626" cy="61" rx="10" ry="10" fill="rgb(255, 255, 255)" stroke="#000000" stroke-width="2" pointer-events="none"/><g transform="translate(-0.5 -0.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: 18px; height: 1px; padding-top: 61px; margin-left: 617px;"><div data-drawio-colors="color: rgb(0, 0, 0); " style="box-sizing: border-box; font-size: 0px; text-align: center;"><div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: none; white-space: normal; overflow-wrap: normal;">3</div></div></div></foreignObject><text x="626" y="65" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="12px" text-anchor="middle">3</text></switch></g><ellipse cx="411" cy="191" rx="10" ry="10" fill="rgb(255, 255, 255)" stroke="#000000" stroke-width="2" pointer-events="none"/><g transform="translate(-0.5 -0.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: 18px; height: 1px; padding-top: 191px; margin-left: 402px;"><div data-drawio-colors="color: rgb(0, 0, 0); " style="box-sizing: border-box; font-size: 0px; text-align: center;"><div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: none; white-space: normal; overflow-wrap: normal;">4</div></div></div></foreignObject><text x="411" y="195" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="12px" text-anchor="middle">4</text></switch></g><ellipse cx="56" cy="156" rx="10" ry="10" fill="rgb(255, 255, 255)" stroke="#000000" stroke-width="2" pointer-events="none"/><g transform="translate(-0.5 -0.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: 18px; height: 1px; padding-top: 156px; margin-left: 47px;"><div data-drawio-colors="color: rgb(0, 0, 0); " style="box-sizing: border-box; font-size: 0px; text-align: center;"><div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: none; white-space: normal; overflow-wrap: normal;">5</div></div></div></foreignObject><text x="56" y="160" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="12px" text-anchor="middle">5</text></switch></g><g transform="translate(-0.5 -0.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: 1px; height: 1px; padding-top: 161px; margin-left: 125px;"><div data-drawio-colors="color: rgb(0, 0, 0); background-color: rgb(255, 255, 255); " style="box-sizing: border-box; font-size: 0px; text-align: center;"><div style="display: inline-block; font-size: 9px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: none; background-color: rgb(255, 255, 255); white-space: nowrap;">User gets a response</div></div></div></foreignObject><text x="125" y="163" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="9px" text-anchor="middle">User gets a response</text></switch></g></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%">Text is not SVG - cannot display</text></a></switch></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" width="661px" height="259px" viewBox="-0.5 -0.5 661 259" content="&lt;mxfile host=&quot;app.diagrams.net&quot; modified=&quot;2023-08-26T22:43:32.067Z&quot; agent=&quot;Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/116.0.0.0 Safari/537.36&quot; etag=&quot;1Jp8IrwoE_BMXggvxxVp&quot; version=&quot;21.6.9&quot; type=&quot;device&quot;&gt;&lt;diagram id=&quot;TTnOLjRJzGgt66t77H9m&quot; name=&quot;Page-1&quot;&gt;5Vtbk6I4FP41Vu0+aBEQhcfW6bnU9m51zexUT+9blIhsI2FCnNb99ZtAEEIiYCs4Pd0vbQ4hwXPO951LcGDNN7sPBMbrP7GHwoFpeLuB9W5gmmBsjdk/LtlnEsexM4FPAk9MKgRfgv+QEBpCug08lEgTKcYhDWJZuMRRhJZUkkFC8LM8bYVDedcY+kgRfFnCUJU+BB5dCymYuMWFjyjw12Jrx5xmFxZw+eQTvI3EfgPTep/+ZZc3MF9LfNFkDT38XBJZtwNrTjCm2afNbo5Crttcbdl9749cPTw3QRFtc4N/u/jjs/9tSIfx3YOz+3qP/MVQrPIDhluhj68JIuKB6T5XUvo1EV/IGFiz53VA0ZcYLvnVZ+YWTLamm5CNAPuoPli+CyIU7Uoi8aAfEN4gSvZsirg6FToTPjUWw+fCQI4QrUumyadB4RL+Yd1CLeyD0IxeS7e7vz5Z93vw/Z/h7tZ9/Pj33QPOtVRSCPKYE4khJnSNfRzB8LaQzmSVFXPuMI6Fov5FlO4FIuCWYlmNTHtk/43fP7Lz4WP52rudWDwb7cXoqPoTvCVLVOMMpoAfJD6izU7DdVBrTIJCSIMfMtB0xklvvSEE7ksTYhxENCmtfM8FhY8AIDsJcI2KobMVC7MfHq2VJ9SpqISX+3DrB9F5iOHACBgl3YSBHzEZ5S4yW+GI5j6mQfvJoDLtRlQBUwMrML0ArrTatAxVnYhsgiQJMFOp8RklMY4SdBX47QL6LQcY+/yYItGZ5tcK9PFBDr4DaEEZssZoajegNjV29iwgX5XpImCKZnx8LrKtThCrQNJ2K5B0nJEtL5I9qrivHK0qS1nTxqUynlKWuhTUrXrffE/gBj1j8tQ99K1ZQgl+OuQn5kEyxyEm6a6WYbiuUesl7ZnCtpqZwu6VKWzFGConRN4NzwfZaBlCZqalrGnZLDm8gQRvuxbcL8df24hZUrBOv7nsTJgCRzbvpGK1thitBpTqOh0DdKL4xM2SpuCchExhswWRHGTyfctT7RRbwySl2hs2wY13qWnzy+yTz///9hlBL9X19y1K6O/aGHQHF6wcktwMCiAvmZNw5lYQvgk8LwtRiD0FXKTrcfcSCQ9b3J4N7HdyUHC1/leLlSrcDzWU2HNQrkN0NGDkjCvsa17E+4YVcqksgFerBHXiL1PFX1h+kbp6ch6HXyI3q4S7abuKx+6Kb03758m56km5mji9nKSdfpIk4E60pm5gTZV9J/I6wG6Xap1cZ7n6fbqts6bX9L9TkoJX539jW081PUVtR2HhPF5zTbaJ2MBgIVuJ1zmXpwpKI3dcStezHdgDZ5tkt5zH+q1ycsOYz7uJEMC6cohwFUNK9dE9DoPl/jwVV7GlKHg+5yrWGuMCKrcnjUHZ1Wjc7ErjQG2XqCx5UhWkdB3y9sXQGBnAlHsYoBAcaWKko9Zdi8Y+Y9uuRT9VU7UjYbutwq3Kv9UmSb/8C9SWf6XnltY72vDbX7lzJJTWw+ICBY8xMS5U5YwlI+eN4+6rHDBuJgl+bBW3J8iT9TiueLjrKMQJxr0yp9mslJMiU8iRwFJMDxFdOKoPXBGOkDZmrYIwbNfSqzd9c4TLOUyxi/YAoDOzaHqsBP8IuBlMY8EfdAaXTwnlZ7hVe7GvSPVcFKIVPY+JeGmQCPsdM1/ZWLnohQTW3m55LGp5dNMdoFo0ZHtmGRNoWGbSq1LUjuQrYJnDcm299Vh/8adlGbXxN8fRKvC3pOAZxgDIJ5BiojYDfyGmaW+7GqaxegWVrmFwZaaxNEwz7VUpavH9Cpimph1Sb/rXwjT5ZrVME4sXRgwG/fUvTjftDVhDN71WCodu7XUOPg7N5sfSla4bz4I7GvsxYt7lGtTnvTyk1nRSI4NXDijyyqfBWdtXmrXG+ClR53wS6YCYhMIYEc200Wh0cd49ArnjL3zU866HVnAb0joHOaEjOpZPhIExVfGqo9zqqwGX8wK1hNQgOAyDOEHN5oBJnL1jvAp23IQt7XO0+d+3fYBTObFX6bTXMtFSm1FqovJmrDOu5pHXto5axFtv1zoTW8aO5rSnX+uo3YTx27WOip3+zKP9TYCafWhemXkr1qmEHTBpV4h1ZhyV2LKftRgswU34hmmWWvNy+bVf7LtY6+Kg40PGVqPzI0dZ9lQmxsrB50vOstiw+OVTNr34eZl1+z8=&lt;/diagram&gt;&lt;/mxfile&gt;" style="background-color: rgb(255, 255, 255);"><defs/><g><rect x="40" y="31" width="80" height="40" fill="rgb(255, 255, 255)" stroke="rgb(0, 0, 0)" pointer-events="all"/><g transform="translate(-0.5 -0.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: 51px; margin-left: 41px;"><div data-drawio-colors="color: rgb(0, 0, 0); " style="box-sizing: border-box; font-size: 0px; text-align: center;"><div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; white-space: normal; overflow-wrap: normal;">User</div></div></div></foreignObject><text x="80" y="55" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="12px" text-anchor="middle">User</text></switch></g><path d="M 220 181 L 80 181 L 80 77.37" fill="none" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="stroke"/><path d="M 80 72.12 L 83.5 79.12 L 80 77.37 L 76.5 79.12 Z" fill="rgb(0, 0, 0)" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="all"/><rect x="220" y="31" width="120" height="170" fill="rgb(255, 255, 255)" stroke="rgb(0, 0, 0)" pointer-events="all"/><g transform="translate(-0.5 -0.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 flex-start; justify-content: unsafe center; width: 118px; height: 1px; padding-top: 38px; margin-left: 221px;"><div data-drawio-colors="color: rgb(0, 0, 0); " style="box-sizing: border-box; font-size: 0px; text-align: center;"><div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; font-weight: bold; white-space: normal; overflow-wrap: normal;">Plugin</div></div></div></foreignObject><text x="280" y="50" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="12px" text-anchor="middle" font-weight="bold">Plugin</text></switch></g><path d="M 500 179.07 L 420.5 179.1 L 346.37 179.47" fill="none" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="stroke"/><path d="M 341.12 179.49 L 348.1 175.96 L 346.37 179.47 L 348.14 182.96 Z" fill="rgb(0, 0, 0)" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="all"/><g transform="translate(-0.5 -0.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: 1px; height: 1px; padding-top: 180px; margin-left: 421px;"><div data-drawio-colors="color: rgb(0, 0, 0); background-color: rgb(255, 255, 255); " style="box-sizing: border-box; font-size: 0px; text-align: center;"><div style="display: inline-block; font-size: 10px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; background-color: rgb(255, 255, 255); white-space: nowrap;">Permission Response</div></div></div></foreignObject><text x="421" y="183" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="10px" text-anchor="middle">Permission Response</text></switch></g><rect x="500" y="31" width="150" height="170" fill="rgb(255, 255, 255)" stroke="#009900" stroke-width="2" pointer-events="all"/><g transform="translate(-0.5 -0.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 flex-start; justify-content: unsafe center; width: 148px; height: 1px; padding-top: 38px; margin-left: 501px;"><div data-drawio-colors="color: rgb(0, 0, 0); " style="box-sizing: border-box; font-size: 0px; text-align: center;"><div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; font-weight: bold; white-space: normal; overflow-wrap: normal;">Permission Framework</div></div></div></foreignObject><text x="575" y="50" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="12px" text-anchor="middle" font-weight="bold">Permission Framework</text></switch></g><path d="M 120 51 L 213.63 51" fill="none" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="stroke"/><path d="M 218.88 51 L 211.88 54.5 L 213.63 51 L 211.88 47.5 Z" fill="rgb(0, 0, 0)" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="all"/><g transform="translate(-0.5 -0.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: 1px; height: 1px; padding-top: 51px; margin-left: 166px;"><div data-drawio-colors="color: rgb(0, 0, 0); background-color: rgb(255, 255, 255); " style="box-sizing: border-box; font-size: 0px; text-align: center;"><div style="display: inline-block; font-size: 9px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; background-color: rgb(255, 255, 255); white-space: nowrap;">Action<br style="font-size: 9px;" />(Read request)</div></div></div></foreignObject><text x="166" y="53" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="9px" text-anchor="middle">Action...</text></switch></g><rect x="240" y="61" width="80" height="50" fill="rgb(255, 255, 255)" stroke="rgb(0, 0, 0)" pointer-events="all"/><g transform="translate(-0.5 -0.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: 86px; margin-left: 241px;"><div data-drawio-colors="color: rgb(0, 0, 0); " style="box-sizing: border-box; font-size: 0px; text-align: center;"><div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; white-space: normal; overflow-wrap: normal;">Resources</div></div></div></foreignObject><text x="280" y="90" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="12px" text-anchor="middle">Resources</text></switch></g><path d="M 240 146 L 166 146 L 166 67.37" fill="none" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="stroke"/><path d="M 166 62.12 L 169.5 69.12 L 166 67.37 L 162.5 69.12 Z" fill="rgb(0, 0, 0)" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="all"/><path d="M 320 146 L 420.5 146 L 420.04 67.37" fill="none" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="stroke"/><path d="M 420.01 62.12 L 423.55 69.1 L 420.04 67.37 L 416.55 69.14 Z" fill="rgb(0, 0, 0)" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="all"/><rect x="240" y="121" width="80" height="50" fill="rgb(255, 255, 255)" stroke="#0000cc" stroke-width="2" pointer-events="all"/><g transform="translate(-0.5 -0.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: 146px; margin-left: 241px;"><div data-drawio-colors="color: rgb(0, 0, 0); " style="box-sizing: border-box; font-size: 0px; text-align: center;"><div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; white-space: normal; overflow-wrap: normal;"><font style="font-size: 10px">Resource read permission</font></div></div></div></foreignObject><text x="280" y="150" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="12px" text-anchor="middle">Resource read...</text></switch></g><rect x="530" y="61" width="90" height="20" fill="rgb(255, 255, 255)" stroke="#cc0000" stroke-width="2" pointer-events="all"/><g transform="translate(-0.5 -0.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: 88px; height: 1px; padding-top: 71px; margin-left: 531px;"><div data-drawio-colors="color: rgb(0, 0, 0); " style="box-sizing: border-box; font-size: 0px; text-align: center;"><div style="display: inline-block; font-size: 10px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; white-space: normal; overflow-wrap: normal;">Permission Policy</div></div></div></foreignObject><text x="575" y="74" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="10px" text-anchor="middle">Permission Policy</text></switch></g><path d="M 340 50 L 491.83 50.04" fill="none" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="stroke"/><path d="M 497.08 50.04 L 490.08 53.54 L 491.83 50.04 L 490.08 46.54 Z" fill="rgb(0, 0, 0)" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="all"/><g transform="translate(-0.5 -0.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: 1px; height: 1px; padding-top: 49px; margin-left: 420px;"><div data-drawio-colors="color: rgb(0, 0, 0); background-color: rgb(255, 255, 255); " style="box-sizing: border-box; font-size: 0px; text-align: center;"><div style="display: inline-block; font-size: 10px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; background-color: rgb(255, 255, 255); white-space: nowrap;">Permission Request</div></div></div></foreignObject><text x="420" y="52" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="10px" text-anchor="middle">Permission Request</text></switch></g><rect x="10" y="194" width="20" height="10" fill="#009900" stroke="none" pointer-events="none"/><g transform="translate(-0.5 -0.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 flex-start; width: 1px; height: 1px; padding-top: 199px; margin-left: 42px;"><div data-drawio-colors="color: rgb(0, 0, 0); " style="box-sizing: border-box; font-size: 0px; text-align: left;"><div style="display: inline-block; font-size: 10px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: none; white-space: nowrap;">Provided by Backstage</div></div></div></foreignObject><text x="42" y="202" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="10px">Provided by Backstage</text></switch></g><rect x="10" y="214" width="20" height="10" fill="#cc0000" stroke="none" pointer-events="none"/><g transform="translate(-0.5 -0.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 flex-start; width: 1px; height: 1px; padding-top: 219px; margin-left: 42px;"><div data-drawio-colors="color: rgb(0, 0, 0); " style="box-sizing: border-box; font-size: 0px; text-align: left;"><div style="display: inline-block; font-size: 10px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: none; white-space: nowrap;">Configured by integrators</div></div></div></foreignObject><text x="42" y="222" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="10px">Configured by integrators</text></switch></g><rect x="10" y="234" width="20" height="10" fill="#0000cc" stroke="none" pointer-events="none"/><g transform="translate(-0.5 -0.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 flex-start; width: 1px; height: 1px; padding-top: 239px; margin-left: 42px;"><div data-drawio-colors="color: rgb(0, 0, 0); " style="box-sizing: border-box; font-size: 0px; text-align: left;"><div style="display: inline-block; font-size: 10px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: none; white-space: nowrap;">Configured by plugin authors</div></div></div></foreignObject><text x="42" y="242" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="10px">Configured by plugin authors</text></switch></g><rect x="515" y="98" width="120" height="60" fill="rgb(255, 255, 255)" stroke="#009900" stroke-width="2" pointer-events="none"/><g transform="translate(-0.5 -0.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: 118px; height: 1px; padding-top: 128px; margin-left: 516px;"><div data-drawio-colors="color: rgb(0, 0, 0); " style="box-sizing: border-box; font-size: 0px; text-align: center;"><div style="display: inline-block; font-size: 10px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: none; white-space: normal; overflow-wrap: normal;">Permission Backend<br />Permission hooks<br />Integration helpers<br />...</div></div></div></foreignObject><text x="575" y="131" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="10px" text-anchor="middle">Permission Backend...</text></switch></g><ellipse cx="165" cy="21" rx="10" ry="10" fill="rgb(255, 255, 255)" stroke="#000000" stroke-width="2" pointer-events="none"/><g transform="translate(-0.5 -0.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: 18px; height: 1px; padding-top: 21px; margin-left: 156px;"><div data-drawio-colors="color: rgb(0, 0, 0); " style="box-sizing: border-box; font-size: 0px; text-align: center;"><div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: none; white-space: normal; overflow-wrap: normal;">1</div></div></div></foreignObject><text x="165" y="25" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="12px" text-anchor="middle">1</text></switch></g><ellipse cx="420" cy="21" rx="10" ry="10" fill="rgb(255, 255, 255)" stroke="#000000" stroke-width="2" pointer-events="none"/><g transform="translate(-0.5 -0.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: 18px; height: 1px; padding-top: 21px; margin-left: 411px;"><div data-drawio-colors="color: rgb(0, 0, 0); " style="box-sizing: border-box; font-size: 0px; text-align: center;"><div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: none; white-space: normal; overflow-wrap: normal;">2</div></div></div></foreignObject><text x="420" y="25" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="12px" text-anchor="middle">2</text></switch></g><ellipse cx="635" cy="71" rx="10" ry="10" fill="rgb(255, 255, 255)" stroke="#000000" stroke-width="2" pointer-events="none"/><g transform="translate(-0.5 -0.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: 18px; height: 1px; padding-top: 71px; margin-left: 626px;"><div data-drawio-colors="color: rgb(0, 0, 0); " style="box-sizing: border-box; font-size: 0px; text-align: center;"><div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: none; white-space: normal; overflow-wrap: normal;">3</div></div></div></foreignObject><text x="635" y="75" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="12px" text-anchor="middle">3</text></switch></g><ellipse cx="420" cy="201" rx="10" ry="10" fill="rgb(255, 255, 255)" stroke="#000000" stroke-width="2" pointer-events="none"/><g transform="translate(-0.5 -0.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: 18px; height: 1px; padding-top: 201px; margin-left: 411px;"><div data-drawio-colors="color: rgb(0, 0, 0); " style="box-sizing: border-box; font-size: 0px; text-align: center;"><div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: none; white-space: normal; overflow-wrap: normal;">4</div></div></div></foreignObject><text x="420" y="205" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="12px" text-anchor="middle">4</text></switch></g><ellipse cx="65" cy="166" rx="10" ry="10" fill="rgb(255, 255, 255)" stroke="#000000" stroke-width="2" pointer-events="none"/><g transform="translate(-0.5 -0.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: 18px; height: 1px; padding-top: 166px; margin-left: 56px;"><div data-drawio-colors="color: rgb(0, 0, 0); " style="box-sizing: border-box; font-size: 0px; text-align: center;"><div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: none; white-space: normal; overflow-wrap: normal;">5</div></div></div></foreignObject><text x="65" y="170" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="12px" text-anchor="middle">5</text></switch></g><g transform="translate(-0.5 -0.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: 1px; height: 1px; padding-top: 171px; margin-left: 134px;"><div data-drawio-colors="color: rgb(0, 0, 0); background-color: rgb(255, 255, 255); " style="box-sizing: border-box; font-size: 0px; text-align: center;"><div style="display: inline-block; font-size: 9px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: none; background-color: rgb(255, 255, 255); white-space: nowrap;">User gets a response</div></div></div></foreignObject><text x="134" y="173" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="9px" text-anchor="middle">User gets a response</text></switch></g></g><switch><g requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility"/><a transform="translate(0,-5)" xlink:href="https://www.drawio.com/doc/faq/svg-export-text-problems" target="_blank"><text text-anchor="middle" font-size="10px" x="50%" y="100%">Text is not SVG - cannot display</text></a></switch></svg>
\ No newline at end of file
diff --git a/docs/backend-system/architecture/03-services.md b/docs/backend-system/architecture/03-services.md
index 8a86d90efb..e67d467453 100644
--- a/docs/backend-system/architecture/03-services.md
+++ b/docs/backend-system/architecture/03-services.md
@@ -40,7 +40,7 @@ export const fooServiceRef = createServiceRef<FooService>({
 
 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.
+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 patterns 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.
 
diff --git a/docs/backend-system/building-plugins-and-modules/01-index.md b/docs/backend-system/building-plugins-and-modules/01-index.md
index 644816b053..750e18baf5 100644
--- a/docs/backend-system/building-plugins-and-modules/01-index.md
+++ b/docs/backend-system/building-plugins-and-modules/01-index.md
@@ -85,6 +85,8 @@ 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.
 
+To create a Backend module, run `yarn new`, select `backend-module`, and fill out the rest of the prompts. This will create a new package at `plugins/<pluginId>-backend-module-<moduleId>`.
+
 The following is an example of how to create a module that adds a new processor
 using the `catalogProcessingExtensionPoint`:
 
diff --git a/docs/backend-system/building-plugins-and-modules/02-testing.md b/docs/backend-system/building-plugins-and-modules/02-testing.md
index fdd8cdb1e3..8ede8855e4 100644
--- a/docs/backend-system/building-plugins-and-modules/02-testing.md
+++ b/docs/backend-system/building-plugins-and-modules/02-testing.md
@@ -118,7 +118,7 @@ describe('MyDatabaseClass', () => {
   // "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'],
+    ids: ['POSTGRES_13', 'POSTGRES_9', 'SQLITE_3', 'MYSQL_8'],
   });
 
   // Just an example of how to conveniently bundle up the setup code
diff --git a/docs/backend-system/core-services/01-index.md b/docs/backend-system/core-services/01-index.md
index a51db3c993..b4fcdd5c6c 100644
--- a/docs/backend-system/core-services/01-index.md
+++ b/docs/backend-system/core-services/01-index.md
@@ -373,7 +373,7 @@ createBackendPlugin({
         discovery: coreServices.discovery,
       },
       async init({ discovery }) {
-        const url = await discoverty.getBaseUrl('derp'); // can also use discovery.getBaseUrl to retrieve external URL
+        const url = await discovery.getBaseUrl('derp'); // can also use discovery.getExternalBaseUrl to retrieve external URL
         const response = await fetch(`${url}/hello`);
       },
     });
diff --git a/docs/deployment/docker.md b/docs/deployment/docker.md
index dc436129c5..3bbf06d614 100644
--- a/docs/deployment/docker.md
+++ b/docs/deployment/docker.md
@@ -67,6 +67,7 @@ RUN --mount=type=cache,target=/var/cache/apt,sharing=locked \
 # in which case you should also move better-sqlite3 to "devDependencies" in package.json.
 RUN --mount=type=cache,target=/var/cache/apt,sharing=locked \
     --mount=type=cache,target=/var/lib/apt,sharing=locked \
+    apt-get update && \
     apt-get install -y --no-install-recommends libsqlite3-dev
 
 # From here on we use the least-privileged `node` user to run the backend.
@@ -185,6 +186,7 @@ RUN --mount=type=cache,target=/var/cache/apt,sharing=locked \
 # in which case you should also move better-sqlite3 to "devDependencies" in package.json.
 RUN --mount=type=cache,target=/var/cache/apt,sharing=locked \
     --mount=type=cache,target=/var/lib/apt,sharing=locked \
+    apt-get update && \
     apt-get install -y --no-install-recommends libsqlite3-dev
 
 USER node
@@ -222,6 +224,7 @@ RUN --mount=type=cache,target=/var/cache/apt,sharing=locked \
 # in which case you should also move better-sqlite3 to "devDependencies" in package.json.
 RUN --mount=type=cache,target=/var/cache/apt,sharing=locked \
     --mount=type=cache,target=/var/lib/apt,sharing=locked \
+    apt-get update && \
     apt-get install -y --no-install-recommends libsqlite3-dev
 
 # From here on we use the least-privileged `node` user to run the backend.
diff --git a/docs/deployment/flightcontrol.md b/docs/deployment/flightcontrol.md
new file mode 100644
index 0000000000..482e9341ea
--- /dev/null
+++ b/docs/deployment/flightcontrol.md
@@ -0,0 +1,78 @@
+---
+id: flightcontrol
+title: Deploying with Flightcontrol
+sidebar_label: AWS Fargate via Flightcontrol
+description: Deploying Backstage to AWS Fargate via Flightcontrol
+---
+
+This guide explains how to deploy Backstage to [Flightcontrol](https://www.flightcontrol.dev?ref=backstage), a platform that fully automates deployments to Amazon Web Services (AWS). Flightcontrol supports git-driven and image registry deployments.
+
+Before you begin, make sure you have a [Flightcontrol account](https://app.flightcontrol.dev/signup?ref=backstage) and a [Github account](https://github.com/login) to follow this guide.
+
+# Deployment Via Dashboard
+
+1. Create a new project from the Flightcontrol Dashboard
+
+2. Select the GitHub repo for your Backstage project
+
+3. Select `GUI` as the config type:
+
+4. Then, choose `+ Add Web Server (Fargate)` under Services before entering the following server information:
+
+| Field Name        | Value             |
+| ----------------- | ----------------- |
+| Build Type        | Custom Dockerfile |
+| Health Check Path | /catalog          |
+| Port              | 7007              |
+
+5. Click `Create Project` and complete any required steps (like linking your AWS account).
+
+# Deployment via Code
+
+1. Create a new project from the Flightcontrol Dashboard
+
+2. Select the GitHub repo for your Backstage project
+
+3. Select the `flightcontrol.json` Config Type.
+
+```json filename="flightcontrol.json"
+{
+  "$schema": "https://app.flightcontrol.dev/schema.json",
+  "environments": [
+    {
+      "id": "backstage",
+      "name": "Backstage",
+      "region": "us-west-2",
+      "source": {
+        "branch": "main"
+      },
+      "services": [
+        {
+          "id": "backstage",
+          "name": "Backstage",
+          "type": "fargate",
+          "buildType": "docker",
+          "dockerfilePath": "Dockerfile",
+          "dockerContext": ".",
+          "healthCheckPath": "/catalog",
+          "cpu": 0.5,
+          "memory": 1,
+          "domain": "backstage.yourapp.com",
+          "port": 7007,
+          "minInstances": 1,
+          "maxInstances": 1
+        }
+      ]
+    }
+  ]
+}
+```
+
+# Databases and Redis
+
+If you need a database or Redis for your Backstage plugins, you can easily add those to your Flightcontrol deployment. For more information, see [the flightcontrol docs](https://www.flightcontrol.dev/docs/guides/flightcontrol/using-code?ref=backstage#redis).
+
+## Troubleshooting
+
+- [Flightcontrol Documentation](https://www.flightcontrol.dev/docs?ref=backstage)
+- [Troubleshooting](https://www.flightcontrol.dev/docs/troubleshooting?ref=backstage)
diff --git a/docs/features/kubernetes/authentication.md b/docs/features/kubernetes/authentication.md
index ddeabb5db0..f30521189f 100644
--- a/docs/features/kubernetes/authentication.md
+++ b/docs/features/kubernetes/authentication.md
@@ -28,6 +28,53 @@ The providers available as server side are:
 - `localKubectlProxy`
 - `serviceAccount`
 
+### AWS
+
+For AWS, in addition to the "kubernetes" configuration, you will have to set up AWS authentication. The AWS server-side authentication provider uses [AWS Identity and Access Management (IAM)][3] to authenticate to the target Account(s), you can read more about it on the page for the [Integration AWS node][4].
+
+Using the plugin, you can authenticate to several AWS accounts using either [static AWS Access keys][5] or short-lived Access keys generated by [assuming a role][6], for either case you will need to install the [AWS CLI utility][7] and set it up following the steps in the linked documentation.
+
+If you have generated static AWS security credentials, the configuration block for AWS will look like this:
+
+```yaml
+aws:
+  mainAccount:
+  accounts:
+    - accountId: '<account-number>'
+      accessKeyId: ${AWS_ACCESS_KEY_ID}
+      secretAccessKey: ${AWS_SECRET_ACCESS_KEY}
+      region: <region>
+  accountDefaults:
+```
+
+If your environment is set up to assume a role, the configuration would instead look like this:
+
+```yaml
+aws:
+  mainAccount:
+    roleName: <name-of-the-role-to-assume>
+    region: <region>
+  accounts:
+  accountDefaults:
+```
+
+Either of these sections needs to be present for the Kubernetes configuration to use the `aws` `authProvider`. The Kubernetes configuration looks like this:
+
+```yaml
+kubernetes:
+  serviceLocatorMethod:
+    type: 'multiTenant'
+  clusterLocatorMethods:
+    - type: 'config'
+      clusters:
+        - url: https://<unique-identifier>.<region>.eks.amazonaws.com
+          name: <cluster-name-to-use>
+          authProvider: 'aws'
+          caData: ${EKS_CA_DATA}
+```
+
+You get both, the cluster `url` and `caData` directly from the AWS console by going to `EKS` > `Your cluster` > `Overview` > `Details`. You will find them under 'API server endpoint' and 'Certificate authority' respectively.
+
 ### Azure
 
 The Azure server side authentication provider works by authenticating on the server with
@@ -72,3 +119,8 @@ The providers available as client side are:
 
 [1]: https://docs.microsoft.com/en-us/azure/aks/managed-aad
 [2]: https://docs.microsoft.com/en-us/cli/azure/install-azure-cli?view=azure-cli-latest
+[3]: https://docs.aws.amazon.com/IAM/latest/UserGuide/when-to-use-iam.html
+[4]: https://github.com/backstage/backstage/blob/master/packages/integration-aws-node/README.md
+[5]: https://docs.aws.amazon.com/IAM/latest/UserGuide/id_credentials_access-keys.html
+[6]: https://docs.aws.amazon.com/IAM/latest/UserGuide/id_roles_use.html
+[7]: https://docs.aws.amazon.com/cli/latest/userguide/getting-started-install.html
diff --git a/docs/features/software-catalog/api.md b/docs/features/software-catalog/api.md
index 3ca7e5ef49..3ccd89b286 100644
--- a/docs/features/software-catalog/api.md
+++ b/docs/features/software-catalog/api.md
@@ -279,7 +279,65 @@ where the `items` array has _the same length_ and _the same order_ as the input
 
 ## Locations
 
-TODO
+### `GET /locations`
+
+Lists locations.
+
+Response type is JSON, on the form
+
+```json
+[
+  {
+    "data": {
+      "id": "b9784c38-7118-472f-9e22-5638fc73bab0",
+      "target": "https://git.example.com/example-project/example-repository/blob/main/catalog-info.yaml",
+      "type": "url"
+    }
+  }
+]
+```
+
+### `POST /locations`
+
+Adds a location to be ingested by the catalog.
+
+If successful the response code will be `HTTP/1.1 201 Created` and a JSON on the form
+
+```json
+{
+  "entities": [],
+  "location": {
+    "id": "b9784c38-7118-472f-9e22-5638fc73bab0",
+    "target": "https://git.example.com/example-project/example-repository/blob/main/catalog-info.yaml",
+    "type": "url"
+  }
+}
+```
+
+If the location already exists the response will be `HTTP/1.1 409 Conflict` and a JSON on the form
+
+```json
+{
+  "error": {
+    "message": "Location url:https://git.example.com/example-project/example-repository/blob/main/catalog-info.yaml already exists",
+    "name": "ConflictError",
+    "stack": "ConflictError: Location url:https://git.example.com/example-project/example-repository/blob/main/catalog-info.yaml already exists\n..."
+  },
+  "request": {
+    "method": "POST",
+    "url": "/locations"
+  },
+  "response": {
+    "statusCode": 409
+  }
+}
+```
+
+Supports the `?dryRun=true` query parameter, which will perform validation and not write anything to the database. In the event of successfully passing validation, the `entities` field of the response JSON will be populated with entities present in the location.
+
+### `DELETE /locations/<uid>`
+
+Delete a location by its id. On success response code will be `HTTP/1.1 204 No Content`.
 
 ## Other
 
diff --git a/docs/features/software-catalog/configuration.md b/docs/features/software-catalog/configuration.md
index 5abd266099..bd914cc56c 100644
--- a/docs/features/software-catalog/configuration.md
+++ b/docs/features/software-catalog/configuration.md
@@ -123,3 +123,43 @@ source that should be mirrored into Backstage. To make Backstage a mirror of
 this remote source, users cannot also register new entities with e.g. the
 [catalog-import](https://github.com/backstage/backstage/tree/master/plugins/catalog-import)
 plugin.
+
+## Clean up orphaned entities
+
+In short entities can become orphaned through multiple means, such as when a catalog-info YAML file is moved from one place to another in the version control system without updating the registration in the catalog. For safety reasons the default behavior is to just tag the orphaned entities, and keep them around. You can read more about orphaned entities [here](life-of-an-entity.md#orphaning).
+
+However, if you do with to automatically remove the orphaned entities, you can use the following configuration, and everything with an orphaned entity tag will be eventually deleted.
+
+```yaml
+catalog:
+  orphanStrategy: delete
+```
+
+## Processing Interval
+
+The [processing loop](https://backstage.io/docs/features/software-catalog/life-of-an-entity) is
+responsible for running your registered processors on all entities, on a certain
+interval. That interval can be configured with the `processingInterval`
+app-config parameter.
+
+```yaml
+catalog:
+  processingInterval: { minutes: 45 }
+```
+
+The value is a duration object, that has one or more of the fields `years`,
+`months`, `weeks`, `days`, `hours`, `minutes`, `seconds`, and `milliseconds`.
+You can combine them, for example as `{ hours: 1, minutes: 15 }` which
+essentially means that you want the processing loop to visit entities roughly
+once every 75 minutes.
+
+Note that this is only a suggested minimum, and the actual interval may be
+longer. Internally, the catalog will scale up this number by a small factor and
+choose random numbers in that range to spread out the load. If the catalog is
+overloaded and cannot process all entities during the interval, the time taken
+between processing runs of any given entity may also be longer than specified
+here.
+
+Setting this value too low risks exhausting rate limits on external systems that
+are queried by processors, such as version control systems housing catalog-info
+files.
diff --git a/docs/features/software-catalog/descriptor-format.md b/docs/features/software-catalog/descriptor-format.md
index 0be2bf0292..924c59a6fa 100644
--- a/docs/features/software-catalog/descriptor-format.md
+++ b/docs/features/software-catalog/descriptor-format.md
@@ -978,9 +978,9 @@ way.
 The entries of this array are
 [entity references](https://backstage.io/docs/features/software-catalog/references).
 
-| [`kind`](#apiversion-and-kind-required) | Default [`namespace`](#namespace-optional) | Generated [relation](well-known-relations.md) type                                    |
-| --------------------------------------- | ------------------------------------------ | ------------------------------------------------------------------------------------- |
-| [`Group`](#kind-group) (default)        | Same as this entity, typically `default`   | [`hasMember`, and reverse `memberOf`](well-known-relations.md#memberof-and-hasmember) |
+| [`kind`](#apiversion-and-kind-required) | Default [`namespace`](#namespace-optional) | Generated [relation](well-known-relations.md) type                                |
+| --------------------------------------- | ------------------------------------------ | --------------------------------------------------------------------------------- |
+| [`Group`](#kind-group) (default)        | Same as this entity, typically `default`   | [`parentOf`, and reverse `childOf`](well-known-relations.md#parentof-and-childof) |
 
 ### `spec.members` [optional]
 
diff --git a/docs/features/software-catalog/life-of-an-entity.md b/docs/features/software-catalog/life-of-an-entity.md
index 618923289e..583be7df20 100644
--- a/docs/features/software-catalog/life-of-an-entity.md
+++ b/docs/features/software-catalog/life-of-an-entity.md
@@ -222,7 +222,8 @@ either, it becomes _orphaned_. The end result is as follows:
 - The stitching process injects a `backstage.io/orphan: 'true'` annotation on
   the child entity.
 - The child entity is _not_ removed from the catalog, but stays around until
-  explicitly deleted via the catalog API, or "reclaimed" by the original parent
+  explicitly deleted via the catalog API, implicitly if `orphanStrategy: delete`
+  configuration is set, or until it is "reclaimed" by the original parent
   or another parent starting to reference it.
 - The catalog page in Backstage for the child entity detects the new annotation
   and informs users about the orphan status.
@@ -259,9 +260,13 @@ entities without explicit owner consent. The catalog therefore takes the stance
 that entities that often were added by direct user action should also be deleted
 only by direct user action.
 
-It is possible to use the catalog API to build automated "reaper" systems that
-finally delete entities that are orphaned. This is however not something that's
-provided out of the box.
+However, if you want to delete orphaned entities automatically anyway, you can
+enable the automated clean up with the following app-config option.
+
+```
+catalog:
+  orphanStrategy: delete
+```
 
 ## Implicit Deletion
 
diff --git a/docs/features/software-catalog/references.md b/docs/features/software-catalog/references.md
index 6e0304b2e8..2240d376ce 100644
--- a/docs/features/software-catalog/references.md
+++ b/docs/features/software-catalog/references.md
@@ -23,9 +23,9 @@ compound reference structure.
 
 ## String References
 
-This is the most common alternative, that is used in almost all circumstances.
+This is the most common alternative and is used in almost all circumstances.
 
-The string is on the form `[<kind>:][<namespace>/]<name>`, that is, it is
+The string is of the form `[<kind>:][<namespace>/]<name>`. That is, it is
 composed of between one and three parts in this specific order, without any
 additional encoding:
 
diff --git a/docs/features/software-catalog/well-known-annotations.md b/docs/features/software-catalog/well-known-annotations.md
index 0a4f5ee400..70f5ff5e14 100644
--- a/docs/features/software-catalog/well-known-annotations.md
+++ b/docs/features/software-catalog/well-known-annotations.md
@@ -100,6 +100,21 @@ alongside the entity's source code, the value of this annotation can point to an
 absolute URL, matching the location reference string format outlined above, for
 example: `url:https://github.com/backstage/backstage/tree/master`
 
+### backstage.io/techdocs-entity
+
+```yaml
+# Example:
+metadata:
+  annotations:
+    backstage.io/techdocs-entity: component:default/example
+```
+
+The value of this annotation informs of an external entity that owns the TechDocs.
+This allows you to reference TechDocs from a single source without either duplicating
+the TechDocs in the TechDocs page or needing multiple builds of the same docs.
+
+This is for situations where you have complex systems where they share a single repo, and likely a single TechDoc location.
+
 ### backstage.io/view-url, backstage.io/edit-url
 
 ```yaml
diff --git a/docs/features/software-templates/writing-custom-actions.md b/docs/features/software-templates/writing-custom-actions.md
index c2f14d0ca0..929ba150d2 100644
--- a/docs/features/software-templates/writing-custom-actions.md
+++ b/docs/features/software-templates/writing-custom-actions.md
@@ -207,5 +207,9 @@ scaffolder backend:
 | Azure Pipeline Actions   | [scaffolder-backend-module-azure-pipelines](https://www.npmjs.com/package/@parfuemerie-douglas/scaffolder-backend-module-azure-pipelines)       | [Parfümerie Douglas](https://github.com/Parfuemerie-Douglas) |
 | Azure Repository Actions | [scaffolder-backend-module-azure-repositories](https://www.npmjs.com/package/@parfuemerie-douglas/scaffolder-backend-module-azure-repositories) | [Parfümerie Douglas](https://github.com/Parfuemerie-Douglas) |
 | Snyk Import Project      | [plugin-scaffolder-backend-module-snyk](https://www.npmjs.com/package/@ma11hewthomas/plugin-scaffolder-backend-module-snyk)                     | [Matthew Thomas](https://github.com/Ma11hewThomas)           |
+| JSON Merge Actions       | [plugin-scaffolder-json-merge-actions](https://www.npmjs.com/package/@mdude2314/backstage-plugin-scaffolder-json-merge-actions)                 | [Drew Hill](https://github.com/arhill05)                     |
+| NPM Actions              | [plugin-scaffolder-npm-actions](https://www.npmjs.com/package/@mdude2314/backstage-plugin-scaffolder-npm-actions)                               | [Drew Hill](https://github.com/arhill05)                     |
+| Slack Actions            | [plugin-scaffolder-backend-module-slack](https://www.npmjs.com/package/@mdude2314/backstage-plugin-scaffolder-backend-module-slack)             | [Drew Hill](https://github.com/arhill05)                     |
+| Microsoft Teams Actions  | [plugin-scaffolder-backend-module-ms-teams](https://www.npmjs.com/package/@grvpandey11/backstage-plugin-scaffolder-backend-module-ms-teams)     | [Gaurav Pandey](https://github.com/grvpandey11)              |
 
 Have fun! 🚀
diff --git a/docs/features/software-templates/writing-custom-field-extensions.md b/docs/features/software-templates/writing-custom-field-extensions.md
index 20575a0b4a..f22cecd22c 100644
--- a/docs/features/software-templates/writing-custom-field-extensions.md
+++ b/docs/features/software-templates/writing-custom-field-extensions.md
@@ -89,10 +89,8 @@ export const validateKebabCaseValidation = (
   then please use `scaffolderPlugin.provide` from there instead and export it part of your `plugin.ts` rather than re-using the `scaffolder.plugin`.
 */
 
-import {
-  scaffolderPlugin,
-  createScaffolderFieldExtension,
-} from '@backstage/plugin-scaffolder';
+import { scaffolderPlugin } from '@backstage/plugin-scaffolder';
+import { createScaffolderFieldExtension } from '@backstage/plugin-scaffolder-react';
 import {
   ValidateKebabCase,
   validateKebabCaseValidation,
@@ -133,7 +131,7 @@ Should look something like this instead:
 
 ```tsx
 import { ValidateKebabCaseFieldExtension } from './scaffolder/ValidateKebabCase';
-import { ScaffolderFieldExtensions } from '@backstage/plugin-scaffolder';
+import { ScaffolderFieldExtensions } from '@backstage/plugin-scaffolder-react';
 
 const routes = (
   <FlatRoutes>
diff --git a/docs/features/software-templates/writing-custom-step-layouts.md b/docs/features/software-templates/writing-custom-step-layouts.md
index 69d61b93dc..b965f60f6b 100644
--- a/docs/features/software-templates/writing-custom-step-layouts.md
+++ b/docs/features/software-templates/writing-custom-step-layouts.md
@@ -4,7 +4,7 @@ title: Writing custom step layouts
 description: How to override the default step form layout
 ---
 
-Every form in each step rendered in the frontend uses the default form layout from [react-json-schema-form](https://react-jsonschema-form.readthedocs.io/). It is possible to override this behaviour by supplying a `ui:ObjectFieldTemplate` property for a particular step:
+Every form in each step rendered in the frontend uses the default form layout from [react-jsonschema-form](https://rjsf-team.github.io/react-jsonschema-form/docs/). It is possible to override this behaviour by supplying a `ui:ObjectFieldTemplate` property for a particular step:
 
 ```yaml
 parameters:
@@ -12,7 +12,7 @@ parameters:
     ui:ObjectFieldTemplate: TwoColumn
 ```
 
-This is the same [field](https://react-jsonschema-form.readthedocs.io/en/latest/advanced-customization/custom-templates/#objectfieldtemplate) used by [react-json-schema-form](https://react-jsonschema-form.readthedocs.io/) but we need to add a couple of steps to ensure that the string value of `TwoColumn` above is resolved to a react component.
+This is the same [field](https://rjsf-team.github.io/react-jsonschema-form/docs/advanced-customization/custom-templates#objectfieldtemplate) used by [react-jsonschema-form](https://rjsf-team.github.io/react-jsonschema-form/docs/) but we need to add a couple of steps to ensure that the string value of `TwoColumn` above is resolved to a react component.
 
 ## Registering a React component as a custom step layout
 
diff --git a/docs/features/software-templates/writing-templates.md b/docs/features/software-templates/writing-templates.md
index 6e7b66fcc9..135d508513 100644
--- a/docs/features/software-templates/writing-templates.md
+++ b/docs/features/software-templates/writing-templates.md
@@ -499,6 +499,7 @@ template. These follow the same standard format:
 - id: fetch-base # A unique id for the step
   name: Fetch Base # A title displayed in the frontend
   if: ${{ parameters.name }} # Optional condition, skip the step if not truthy
+  each: ${{ parameters.iterable }} # Optional iterable, run the same step multiple times
   action: fetch:template # An action to call
   input: # Input that is passed as arguments to the action handler
     url: ./template
@@ -510,6 +511,27 @@ By default we ship some [built in actions](./builtin-actions.md) that you can
 take a look at, or you can
 [create your own custom actions](./writing-custom-actions.md).
 
+When `each` is provided, the current iteration value is available in the `${{ each }}` input.
+
+Examples:
+
+```yaml
+each: ['apples', 'oranges']
+input:
+  values:
+    fruit: ${{ each.value }}
+```
+
+```yaml
+each: [{ name: 'apple', count: 3 }, { name: 'orange', count: 1 }]
+input:
+  values:
+    fruit: ${{ each.value.name }}
+    count: ${{ each.value.count }}
+```
+
+When `each` is used, the outputs of a repeated step are returned as an array of outputs from each iteration.
+
 ## Outputs
 
 Each individual step can output some variables that can be used in the
diff --git a/docs/features/techdocs/addons.md b/docs/features/techdocs/addons.md
index bd709ee15f..a41995c260 100644
--- a/docs/features/techdocs/addons.md
+++ b/docs/features/techdocs/addons.md
@@ -122,12 +122,12 @@ page header, TechDocs Addons whose location is `Header` will not be rendered.
 Addons can, in principle, be provided by any plugin! To make it easier to
 discover available Addons, we've compiled a list of them here:
 
-| Addon                                                                                                                        | Package/Plugin                                     | Description                                                                                                                                                                                                                                                                                             |
-| ---------------------------------------------------------------------------------------------------------------------------- | -------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
-| [`<ExpandableNavigation />`](https://backstage.io/docs/reference/plugin-techdocs-module-addons-contrib.expandablenavigation) | `@backstage/plugin-techdocs-module-addons-contrib` | Allows TechDocs users to expand or collapse the entire TechDocs main navigation, and keeps the user's preferred state between documentation sites.                                                                                                                                                      |
-| [`<ReportIssue />`](https://backstage.io/docs/reference/plugin-techdocs-module-addons-contrib.reportissue)                   | `@backstage/plugin-techdocs-module-addons-contrib` | Allows TechDocs users to select a portion of text on a TechDocs page and open an issue against the repository that contains the documentation, populating the issue description with the selected text according to a configurable template.                                                            |
-| [`<TextSize />`](https://backstage.io/docs/reference/plugin-techdocs-module-addons-contrib.textsize)                         | `@backstage/plugin-techdocs-module-addons-contrib` | This TechDocs addon allows users to customize text size on documentation pages, they can select how much they want to increase or decrease the font size via slider or buttons. The default value for font size is 100% and this setting is kept in the browser's local storage whenever it is changed. |
-| [`<LightBox />`](https://backstage.io/docs/reference/plugin-techdocs-module-addons-contrib.lightbox)                         | `@backstage/plugin-techdocs-module-addons-contrib` | This TechDocs addon allows users to open images in a light-box on documentation pages, they can navigate between images if there are several on one page. The image size of the light-box image is the same as the image size on the document page.                                                     |
+| Addon                                                                                                                        | Package/Plugin                                     | Description                                                                                                                                                                                                                                                                                                                                                         |
+| ---------------------------------------------------------------------------------------------------------------------------- | -------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
+| [`<ExpandableNavigation />`](https://backstage.io/docs/reference/plugin-techdocs-module-addons-contrib.expandablenavigation) | `@backstage/plugin-techdocs-module-addons-contrib` | Allows TechDocs users to expand or collapse the entire TechDocs main navigation, and keeps the user's preferred state between documentation sites.                                                                                                                                                                                                                  |
+| [`<ReportIssue />`](https://backstage.io/docs/reference/plugin-techdocs-module-addons-contrib.reportissue)                   | `@backstage/plugin-techdocs-module-addons-contrib` | Allows TechDocs users to select a portion of text on a TechDocs page and open an issue against the repository that contains the documentation, populating the issue description with the selected text according to a configurable template.                                                                                                                        |
+| [`<TextSize />`](https://backstage.io/docs/reference/plugin-techdocs-module-addons-contrib.textsize)                         | `@backstage/plugin-techdocs-module-addons-contrib` | This TechDocs addon allows users to customize text size on documentation pages, they can select how much they want to increase or decrease the font size via slider or buttons. The default value for font size is 100% and this setting is kept in the browser's local storage whenever it is changed.                                                             |
+| [`<LightBox />`](https://backstage.io/docs/reference/plugin-techdocs-module-addons-contrib.lightbox)                         | `@backstage/plugin-techdocs-module-addons-contrib` | This TechDocs addon allows users to open images in a light-box on documentation pages, they can navigate between images if there are several on one page. The image size of the light-box image is the same as the image size on the document page. When clicking on the zoom icon it zooms the image to fit in the screen (similar to `background-size: contain`). |
 
 Got an Addon to contribute? Feel free to add a row above!
 
diff --git a/docs/features/techdocs/cli.md b/docs/features/techdocs/cli.md
index 76589de5a8..87eb67d04a 100644
--- a/docs/features/techdocs/cli.md
+++ b/docs/features/techdocs/cli.md
@@ -141,6 +141,7 @@ Options:
                                   if not found.
   --etag <ETAG>                   A unique identifier for the prepared tree e.g. commit SHA. If provided it will be stored
                                   in techdocs_metadata.json.
+  --defaultPlugin <PLUGIN_NAME>   Plugins which should be added automatically to the mkdocs.yaml file. (default: [])
   --omitTechdocsCoreMkdocsPlugin  An option to disable automatic addition of techdocs-core plugin to the mkdocs.yaml files.
                                   Defaults to false, which means that the techdocs-core plugin is always added to the mkdocs file.
   --legacyCopyReadmeMdToIndexMd   Attempt to ensure an index.md exists falling back to using <docs-dir>/README.md or README.md
diff --git a/docs/features/techdocs/configuration.md b/docs/features/techdocs/configuration.md
index 49ee9d72c2..a861a50c87 100644
--- a/docs/features/techdocs/configuration.md
+++ b/docs/features/techdocs/configuration.md
@@ -49,6 +49,15 @@ techdocs:
       # will be broken in these scenarios.
       legacyCopyReadmeMdToIndexMd: false
 
+      # (Optional) Configures the default plugins which should be added
+      # automatically to every mkdocs.yaml file. This simplifies the usage as
+      # e.g. styling plugins can be added once for all.
+      # Make sure that the defined plugins are installed locally / in the Docker
+      # image.
+      # By default, only the techdocs-core plugin will be added (except if
+      # omitTechdocsCorePlugin: true).
+      defaultPlugins: ['techdocs-core']
+
   # 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 afterwards.
@@ -158,6 +167,12 @@ techdocs:
       # (Required) Azure Blob Storage Container Name
       containerName: 'techdocs-storage'
 
+      # (Optional) Azure blob storage connection string.
+      # Can be useful for local testing through azurite
+      # Defaults to undefined
+      # if provided, takes higher priority, 'techdocs.publisher.azureBlobStorage.credentials' will become irrelevant
+      connectionString: ''
+
       # (Required) An account name is required to write to a storage blob container.
       # https://docs.microsoft.com/en-us/rest/api/storageservices/authorize-with-shared-key
       credentials:
diff --git a/docs/features/techdocs/how-to-guides.md b/docs/features/techdocs/how-to-guides.md
index ab554db3bd..c64018ab97 100644
--- a/docs/features/techdocs/how-to-guides.md
+++ b/docs/features/techdocs/how-to-guides.md
@@ -188,15 +188,12 @@ import {
 } from '@backstage/plugin-techdocs';
 import { Entity } from '@backstage/catalog-model';
 
-import {
-  EntityListDocsGrid,
-  DocsGroupConfig,
-} from '@backstage/plugin-techdocs';
+import { EntityListDocsGrid } from '@backstage/plugin-techdocs';
 
 export type CustomTechDocsHomeProps = {
   groups?: Array<{
     title: React.ReactNode;
-    filterPredicate: (entity: Entity) => boolean;
+    filterPredicate: ((entity: Entity) => boolean) | string;
   }>;
 };
 
@@ -678,3 +675,32 @@ entity. If the value of this annotation is `'local'`, the TechDocs backend will
 and publish the documentation for them. If the value of the `company.com/techdocs-builder`
 annotation is anything other than `'local'`, the user is responsible for publishing
 documentation to the appropriate location in the TechDocs external storage.
+
+## Reference another components TechDocs
+
+In systems where you might have multiple entities for example a System with a Website and an API, when served from a Monorepo you might want to keep the TechDocs in one location in the repository.
+
+In this case you can add the `backstage.io/techdocs-entity` annotation and point to the owners `entityRef` and use its TechDocs. This allows the Subcomponents to read the parents docs, filling the TechDocs link on the `AboutCard` element and the Techdocs tab
+
+```yaml
+apiVersion: backstage.io/v1alpha1
+kind: System
+metadata:
+  name: example
+  namespace: default
+  title: Example
+  description: This is the parent entity
+  annotations:
+    backstage.io/techdocs-ref: dir:.
+
+---
+apiVersion: backstage.io/v1alpha1
+kind: Component
+metadata:
+  name: example-platfrom
+  title: Example Application Platform
+  namespace: default
+  description: This is the child entity
+  annotations:
+    backstage.io/techdocs-entity: system:default/example
+```
diff --git a/docs/integrations/azure/locations.md b/docs/integrations/azure/locations.md
index 5647a6cba4..7553df4081 100644
--- a/docs/integrations/azure/locations.md
+++ b/docs/integrations/azure/locations.md
@@ -19,10 +19,10 @@ Using a service principal:
 integrations:
   azure:
     - host: dev.azure.com
-      credential:
-        clientId: ${CLIENT_ID}
-        clientSecret: ${CLIENT_SECRET}
-        tenantId: ${TENANT_ID}
+      credentials:
+        - clientId: ${AZURE_CLIENT_ID}
+          clientSecret: ${AZURE_CLIENT_SECRET}
+          tenantId: ${AZURE_TENANT_ID}
 ```
 
 Using a managed identity:
@@ -31,8 +31,8 @@ Using a managed identity:
 integrations:
   azure:
     - host: dev.azure.com
-      credential:
-        clientId: ${CLIENT_ID}
+      credentials:
+        - clientId: ${AZURE_CLIENT_ID}
 ```
 
 Using a personal access token (PAT):
@@ -41,24 +41,54 @@ Using a personal access token (PAT):
 integrations:
   azure:
     - host: dev.azure.com
-      token: ${AZURE_TOKEN}
+      credentials:
+        - personalAccessToken: ${PERSONAL_ACCESS_TOKEN}
 ```
 
+You can use specific credentials for different Azure DevOps organizations by specifying the `organizations` field on the credential:
+
+```yaml
+integrations:
+  azure:
+    - host: dev.azure.com
+      credentials:
+        - organizations:
+            - my-org
+            - my-other-org
+          clientId: ${AZURE_CLIENT_ID}
+          clientSecret: ${AZURE_CLIENT_SECRET}
+          tenantId: ${AZURE_TENANT_ID}
+        - organizations:
+            - another-org
+          clientId: ${AZURE_CLIENT_ID}
+        - organizations:
+            - yet-another-org
+          personalAccessToken: ${PERSONAL_ACCESS_TOKEN}
+```
+
+If you do not specify the `organizations` field the credential will be used for all organizations for which no other credential is configured.
+
 > Note: An Azure DevOps provider is added automatically at startup for
 > convenience, so you only need to list it if you want to supply a
-> [token](https://docs.microsoft.com/en-us/azure/devops/organizations/accounts/use-personal-access-tokens-to-authenticate),
+> [personalAccessToken](https://docs.microsoft.com/en-us/azure/devops/organizations/accounts/use-personal-access-tokens-to-authenticate),
 > a [service principal](https://learn.microsoft.com/en-us/azure/devops/integrate/get-started/authentication/service-principal-managed-identity),
 > or a [managed identity](https://learn.microsoft.com/en-us/azure/devops/integrate/get-started/authentication/service-principal-managed-identity)
 
 The configuration is a structure with these elements:
 
-- `host`: The DevOps host; only `dev.azure.com` is supported.
-- `token` (optional): A personal access token as expected by Azure DevOps.
-- `credential`: (optional): A service principal or managed identity
+- `credentials`: (optional): A service principal, managed identity, or personal access token
+
+The `credentials` element is a structure with these elements:
+
+- `organizations`: (optional): A list of organizations for which this credential should be used. If not specified the credential will be used for all organizations for which no other credential is configured.
+- `clientId`: The client ID of the service principal or managed identity (required for service principal and managed identities)
+- `clientSecret`: The client secret of the service principal (required for service principal)
+- `tenantId`: The tenant ID of the service principal (required for service principal)
+- `personalAccessToken`: The personal access token (required for personal access token)
 
 > Note:
 >
-> - `token` and `credential` are mutually exclusive.
 > - You cannot use a service principal or managed identity for Azure DevOps Server (on-premises) organizations
 > - You can only use a service principal or managed identity for Azure AD backed Azure DevOps organizations
-> - The token should just be provided as the raw token generated by Azure DevOps using the format `raw_token` with no base64 encoding. Formatting and base64'ing is handled by dependent libraries handling the Azure DevOps API
+> - You can only specify one credential per host without any organizations specified
+> - The personal access token should just be provided as the raw token generated by Azure DevOps using the format `raw_token` with no base64 encoding. Formatting and base64'ing is handled by dependent libraries handling the Azure DevOps API
diff --git a/docs/overview/glossary.md b/docs/overview/glossary.md
index 97a2823365..ab7d224f4d 100644
--- a/docs/overview/glossary.md
+++ b/docs/overview/glossary.md
@@ -2,25 +2,25 @@
 id: glossary
 title: Backstage Glossary
 # prettier-ignore
-description: List of all the terms, abbreviations, and phrases used in Backstage, together with their explanations.
+description: List of terms, abbreviations, and phrases used in Backstage, together with their explanations.
 ---
 
-The Backstage Glossary lists all the terms, abbreviations, and phrases used in
+The Backstage Glossary lists terms, abbreviations, and phrases used in
 Backstage, together with their explanations. We encourage you to use the
 terminology below for clarity and consistency when discussing Backstage.
 
-### Authentication Glossary
-
-This [page](../auth/glossary.md) directs to the terms and phrases related to
-authentication and identity section of Backstage.
+See also [Authentication Glossary](../auth/glossary.md), a separate glossary of terms and phrases
+specifically related to the authentication and identity section of Backstage.
 
 ### Backstage User Profiles
 
 There are three main user profiles for Backstage: the integrator, the
-contributor, and the software engineer.
+contributor, and the end user (typically a software engineer).
 
-| Term              | Explanation                                                                                                                                                                                                                                                                            |
-| ----------------- | -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
-| Integrator        | The **integrator** hosts the Backstage app and configures which plugins are available to use in the app.                                                                                                                                                                               |
-| Contributor       | The **contributor** adds functionality to the app by writing plugins.                                                                                                                                                                                                                  |
-| Software Engineer | The **software engineer** uses the app's functionality and interacts with its plugins. In practice, this profile covers the various roles that help deliver software, from the Software Engineer themselves, to Designers, Data Scientists, Product Owners, Engineering Managers, etc. |
+| Term              | Explanation                                                                                                                                                                                                                                                                                                                                                 |
+| ----------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
+| Integrator        | The **integrator** hosts the Backstage app and configures which plugins are available to use in the app.                                                                                                                                                                                                                                                    |
+| Contributor       | The **contributor** adds functionality to the app by writing plugins.                                                                                                                                                                                                                                                                                       |
+| End user          | The **end user** uses the app's functionality and interacts with its plugins. This profile covers the various roles that help deliver software. The typical end user is a **software engineer**, but users might also consider themselves _designers_, _data scientists_, _product owners_, _engineering managers_, _technical writers_, and so on.         |
+| Software engineer | The **software engineer** is an **end user** who uses the app's functionality and interacts with its plugins in the course of writing and documenting code. This user is more likely to embed documentation in the code files they produce, and create rough drafts of conceptual pages in collaboration with a **technical writer** or _technical editor_. |
+| Technical writer  | The **technical writer** is an **end user** who uses the app's functionality and interacts with its plugins in the course of writing and editing documentation. This user is more likely to produce and customize templates and produce conceptual pages to supplement documentation embedded in code files.                                                |
diff --git a/docs/overview/versioning-policy.md b/docs/overview/versioning-policy.md
index a44a6a932d..c38ba404b5 100644
--- a/docs/overview/versioning-policy.md
+++ b/docs/overview/versioning-policy.md
@@ -53,7 +53,7 @@ bound to the regular cadence and are instead released whenever needed.
 
 ## Next Release Line
 
-Release cadence: Weekly
+Release cadence: Weekly, specifically on Tuesdays.
 
 The next release line is a weekly release of the project. Consuming these
 releases gives you early access to upcoming functionality in Backstage. There
diff --git a/docs/plugins/integrating-plugin-into-software-catalog.md b/docs/plugins/integrating-plugin-into-software-catalog.md
index a44e6d01c0..1ec3df69cf 100644
--- a/docs/plugins/integrating-plugin-into-software-catalog.md
+++ b/docs/plugins/integrating-plugin-into-software-catalog.md
@@ -37,7 +37,7 @@ You can access the currently selected entity using the backstage api
 import { useEntity } from '@backstage/plugin-catalog-react';
 
 export const MyPluginEntityContent = () => {
-  const { entity, loading, error, refresh } = useEntity();
+  const entity = useEntity();
 
   // Do something with the entity data...
 };
diff --git a/docs/plugins/internationalization.md b/docs/plugins/internationalization.md
new file mode 100644
index 0000000000..eac6ad85e2
--- /dev/null
+++ b/docs/plugins/internationalization.md
@@ -0,0 +1,61 @@
+---
+id: internationalization
+title: Internationalization (Experimental)
+description: Documentation on adding internationalization to the plugin
+---
+
+## Overview
+
+The Backstage core function provides internationalization for plugins
+
+## For a plugin developer
+
+When you are creating your plugin, you have the possibility to use `createTranslationRef` to define all messages for your plugin. For example
+
+```typescript jsx
+import { createTranslationRef } from '@backstage/core-plugin-api/alpha';
+
+/** @alpha */
+export const userSettingsTranslationRef = createTranslationRef({
+  id: 'user-settings',
+  messages: {
+    language: 'Language',
+    change_the_language: 'Change the language',
+  },
+});
+```
+
+And the using this messages in your components like:
+
+```typescript jsx
+const t = useTranslationRef(userSettingsTranslationRef);
+
+return (
+  <ListItemText
+    className={classes.listItemText}
+    primary={t('language')}
+    secondary={t('change_the_language')}
+  />
+);
+```
+
+## For an application developer overwrite plugin messages
+
+```diff typescript jsx
+const app = createApp({
++  __experimentalI18n: {
++    supportedLanguages: ['zh', 'en'],
++    messages: [
++      createTranslationResource({
++        ref: userSettingsTranslationRef,
++        messages: {
++          zh: {
++            select_lng: '选择中文-app',
++          },
++        },
++      }),
++    ],
++  },
+  ...
+})
+```
diff --git a/docs/publishing.md b/docs/publishing.md
index 12e4878d5a..be94406a40 100644
--- a/docs/publishing.md
+++ b/docs/publishing.md
@@ -13,11 +13,55 @@ npm.
 Releases are handled by changesets and trigger whenever the "Version Packages"
 PR is merged. This is typically done every Tuesday around noon CET.
 
+## Next Line Release Process
+
+- PR Checks: Ensure there are no outstanding PRs pending to be merged for this version. If there are any, reach out to maintainers and relevant owners of the affected code reminding them of the deadline for the release.
+- [optional] Lock main branch
+  - Lock the main branch to prevent any new merges.
+  - Note: Admin rights are required to lock the branch. If you lack the necessary permissions, contact a core maintainer to perform this action on your behalf.
+- Check [`Version Packages (next)` Pull Request](https://github.com/backstage/backstage/pulls?q=is%3Aopen+is%3Apr+in%3Atitle+%22Version+Packages+%28next%29%22)
+  - Verify the version we are shipping is correct, by looking at the version packages PR title. It should be "Version Packages (next)"
+  - Check [`.changeset/pre.json`](https://github.com/backstage/backstage/blob/master/.changeset/pre.json) if the `mode` is set to `pre`. If you encounter `mode: "exit"` or if it's not defined, it indicates a mainline release.
+- Verify that there are no active/unfinished `sync_version-packages` actions running (https://github.com/backstage/backstage/actions/workflows/sync_version-packages.yml)
+  - Locking the main branch will prevent new ones to be created, but be sure to check for running actions again after unlocking, since it may cause pending auto-merge PRs to be merged.
+- Check [`Version Packages (next)` Pull Request](https://github.com/backstage/backstage/pulls?q=is%3Aopen+is%3Apr+in%3Atitle+%22Version+Packages+%28next%29%22) for sufficient approval to be merged
+  - Check generated `changelog` in the changed files of the pull request under `docs/releases` to see if there are any unexpected major bumps e.g. by searching the file
+  - Review & approve changes
+  - Reach out to core maintainer to merge the pull request
+  - Heads-up: The microsite building step can be skipped as long as the `prettier` task passes & everything else looks green
+
+Merging the `Version Packages (next)` Pull Request will trigger the deployment workflows. Follow along the [deployment workflow](https://github.com/backstage/backstage/actions/workflows/deploy_packages.yml). If you notice flakiness (e.g. if the build is flaky or if the release step runs into an error with releasing to npm) just restart the workflow.
+
+Congratulations on the release! There should be now a post in the [`#announcements` channel](https://discord.com/channels/687207715902193673/705123584468582400) in Discord linking to the release tag - check if links & tag look as expected. Finally unlock the main branch again. Merging PRs in master directly after release should be done with caution as it potential complicates fixing issues introduced in the release.
+
+## Switching Release Modes
+
+- To enter pre-release mode: `yarn changeset pre enter next` & create PR + merge changes
+- To exit pre-release mode: `yarn changeset pre exit` & create PR + merge changes
+  - Has to be done before the mainline release
+- It's not time critical; Affects the next release happening
+
 ## Emergency Release Process
 
 **This emergency release process is intended only for the Backstage
 maintainers.**
 
+Given one or more PRs towards master that we want to create a patch release for, run the following script from the repo root:
+
+```bash
+./scripts/patch-release-for-pr.js <pr-number> <pr-number-2> ...
+```
+
+Wait until the script has finished executing, at the end of the output you will find a link of the format `https://github.com/backstage/backstage/compare/patch/...`. Open this link in your browser to create a PR for the patch release. Finish the sentence "This release fixes an issue where..." and create the PR.
+
+Once the PR has been approved and merged, the patch release will be automatically created. The patch release is complete when a notification has been posted to Discord in the `#announcements` channel. Keep an eye on "Deploy Packages" workflow and re-trigger if it fails. It is safe to re-trigger any part of this workflow, including the release step.
+
+If the above process fails, you can fall back to the manual process documented below.
+
+### Old Process
+
+This is the old and manual process that we used before the patch script, provided here as a reference:
+
 For this example we will be using the `@backstage/plugin-foo` package as an
 example and assume that it is currently version `6.5.0` in the master branch.
 
diff --git a/docs/releases/v1.16.0.md b/docs/releases/v1.16.0.md
index 5435d15994..37a458cc32 100644
--- a/docs/releases/v1.16.0.md
+++ b/docs/releases/v1.16.0.md
@@ -84,4 +84,4 @@ Below you can find a list of links and references to help you learn about and st
 - [Changelog](https://github.com/backstage/backstage/tree/master/docs/releases/v1.16.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.
+Sign up for our [newsletter](https://info.backstage.spotify.com/newsletter_subscribe) if you want to be informed about what is happening in the world of Backstage.
diff --git a/docs/releases/v1.17.0-changelog.md b/docs/releases/v1.17.0-changelog.md
new file mode 100644
index 0000000000..a67226ca9e
--- /dev/null
+++ b/docs/releases/v1.17.0-changelog.md
@@ -0,0 +1,2999 @@
+# Release v1.17.0
+
+## @backstage/backend-app-api@0.5.0
+
+### Minor Changes
+
+- b9c57a4f857e: **BREAKING**: Renamed `configServiceFactory` to `rootConfigServiceFactory`.
+- a6d7983f349c: **BREAKING**: Removed the `services` option from `createBackend`. Service factories are now `BackendFeature`s and should be installed with `backend.add(...)` instead. The following should be migrated:
+
+  ```ts
+  const backend = createBackend({ services: [myCustomServiceFactory] });
+  ```
+
+  To instead pass the service factory via `backend.add(...)`:
+
+  ```ts
+  const backend = createBackend();
+  backend.add(customRootLoggerServiceFactory);
+  ```
+
+### Patch Changes
+
+- e65c4896f755: Do not throw in backend.stop, if start failed
+- c7aa4ff1793c: Allow modules to register extension points.
+- 57a10c6c69cc: Add validation to make sure that extension points do not cross plugin boundaries.
+- cc9256a33bcc: Added new experimental `featureDiscoveryServiceFactory`, available as an `/alpha` export.
+- Updated dependencies
+  - @backstage/backend-common@0.19.2
+  - @backstage/config-loader@1.4.0
+  - @backstage/backend-plugin-api@0.6.0
+  - @backstage/cli-node@0.1.3
+  - @backstage/plugin-auth-node@0.2.17
+  - @backstage/backend-tasks@0.5.5
+  - @backstage/plugin-permission-node@0.7.11
+  - @backstage/cli-common@0.1.12
+  - @backstage/config@1.0.8
+  - @backstage/errors@1.2.1
+  - @backstage/types@1.1.0
+
+## @backstage/backend-defaults@0.2.0
+
+### Minor Changes
+
+- d008aefef808: **BREAKING**: Removing shared environments concept from the new experimental backend system.
+- a6d7983f349c: **BREAKING**: Removed the `services` option from `createBackend`. Service factories are now `BackendFeature`s and should be installed with `backend.add(...)` instead. The following should be migrated:
+
+  ```ts
+  const backend = createBackend({ services: [myCustomServiceFactory] });
+  ```
+
+  To instead pass the service factory via `backend.add(...)`:
+
+  ```ts
+  const backend = createBackend();
+  backend.add(customRootLoggerServiceFactory);
+  ```
+
+### Patch Changes
+
+- 629cbd194a87: Use `coreServices.rootConfig` instead of `coreService.config`
+- Updated dependencies
+  - @backstage/backend-common@0.19.2
+  - @backstage/backend-app-api@0.5.0
+  - @backstage/backend-plugin-api@0.6.0
+
+## @backstage/backend-plugin-api@0.6.0
+
+### Minor Changes
+
+- c49785f00cab: **BREAKING**: It is no longer possible to declare options as being required with `createServiceFactory`.
+- 629cbd194a87: **BREAKING**: Renamed `coreServices.config` to `coreServices.rootConfig`.
+- 51987dbdaf87: **BREAKING**: Removed the ability to define options for plugins and modules. Existing options should be migrated to instead use either static configuration or extension points.
+- d008aefef808: **BREAKING**: Removing shared environments concept from the new experimental backend system.
+
+### Patch Changes
+
+- c7aa4ff1793c: Allow modules to register extension points.
+
+- cc9256a33bcc: Added new experimental `featureDiscoveryServiceRef`, available as an `/alpha` export.
+
+- a6d7983f349c: **BREAKING**: Removed the `services` option from `createBackend`. Service factories are now `BackendFeature`s and should be installed with `backend.add(...)` instead. The following should be migrated:
+
+  ```ts
+  const backend = createBackend({ services: [myCustomServiceFactory] });
+  ```
+
+  To instead pass the service factory via `backend.add(...)`:
+
+  ```ts
+  const backend = createBackend();
+  backend.add(customRootLoggerServiceFactory);
+  ```
+
+- Updated dependencies
+  - @backstage/plugin-auth-node@0.2.17
+  - @backstage/backend-tasks@0.5.5
+  - @backstage/config@1.0.8
+  - @backstage/types@1.1.0
+  - @backstage/plugin-permission-common@0.7.7
+
+## @backstage/backend-test-utils@0.2.0
+
+### Minor Changes
+
+- b9c57a4f857e: **BREAKING**: Renamed `mockServices.config` to `mockServices.rootConfig`.
+- a6d7983f349c: **BREAKING**: Removed the `services` option from `createBackend`. Service factories are now `BackendFeature`s and should be installed with `backend.add(...)` instead. The following should be migrated:
+
+  ```ts
+  const backend = createBackend({ services: [myCustomServiceFactory] });
+  ```
+
+  To instead pass the service factory via `backend.add(...)`:
+
+  ```ts
+  const backend = createBackend();
+  backend.add(customRootLoggerServiceFactory);
+  ```
+
+### Patch Changes
+
+- ae9304818136: Add needed constants and constructs to support PostgreSQL version 14 as test database
+- Updated dependencies
+  - @backstage/backend-common@0.19.2
+  - @backstage/backend-app-api@0.5.0
+  - @backstage/backend-plugin-api@0.6.0
+  - @backstage/plugin-auth-node@0.2.17
+  - @backstage/config@1.0.8
+  - @backstage/types@1.1.0
+
+## @backstage/config-loader@1.4.0
+
+### Minor Changes
+
+- 2f1859585998: Loading invalid TypeScript configuration schemas will now throw an error rather than silently being ignored.
+
+  In particular this includes defining any additional types other than `Config` in the schema file, or use of unsupported types such as `Record` or `Partial`.
+
+- cd514545d1d0: Adds a new `deepVisibility` schema keyword that sets child visibility recursively to the defined value, respecting preexisting values or child `deepVisibility`.
+
+  Example usage:
+
+  ```ts
+  export interface Config {
+    /**
+     * Enforces a default of `secret` instead of `backend` for this object.
+     * @deepVisibility secret
+     */
+    mySecretProperty: {
+      type: 'object';
+      properties: {
+        secretValue: {
+          type: 'string';
+        };
+
+        verySecretProperty: {
+          type: 'string';
+        };
+      };
+    };
+  }
+  ```
+
+  Example of a schema that would not be allowed:
+
+  ```ts
+  export interface Config {
+    /**
+     * Set the top level property to secret, enforcing a default of `secret` instead of `backend` for this object.
+     * @deepVisibility secret
+     */
+    mySecretProperty: {
+      type: 'object';
+      properties: {
+        frontendUrl: {
+          /**
+           * We can NOT override the visibility to reveal a property to the front end.
+           * @visibility frontend
+           */
+          type: 'string';
+        };
+
+        verySecretProperty: {
+          type: 'string';
+        };
+      };
+    };
+  }
+  ```
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/cli-common@0.1.12
+  - @backstage/config@1.0.8
+  - @backstage/errors@1.2.1
+  - @backstage/types@1.1.0
+
+## @backstage/integration@1.6.0
+
+### Minor Changes
+
+- 443afcf7f567: Added `buildGerritGitilesArchiveUrl()` to construct a Gitiles URL to download an archive.
+  Gitiles URL that uses an authenticated prefix (`/a/`) can now be parsed by the integration.
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config@1.0.8
+  - @backstage/errors@1.2.1
+
+## @backstage/plugin-app-node@0.1.0
+
+### Minor Changes
+
+- 9fbe95ef6503: Added the `app` plugin node library, initially providing an extension point that can be used to configure a static fallback handler.
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@0.6.0
+
+## @backstage/plugin-catalog-backend@1.12.0
+
+### Minor Changes
+
+- b8cccd8ee858: Support configuring applicable kinds for `AnnotateScmSlugEntityProcessor`
+- f32252cdf631: Added OpenTelemetry spans for catalog processing
+- ebeb77586975: Now performs request validation based on OpenAPI schema through `@backstage/backend-openapi-utils`. Error responses for invalid input, like `"a"` instead of a number, may have changed.
+
+### Patch Changes
+
+- 629cbd194a87: Use `coreServices.rootConfig` instead of `coreService.config`
+- b8d6b22acd57: Internal refactor for load test
+- Updated dependencies
+  - @backstage/plugin-search-backend-module-catalog@0.1.4
+  - @backstage/backend-common@0.19.2
+  - @backstage/backend-plugin-api@0.6.0
+  - @backstage/backend-openapi-utils@0.0.3
+  - @backstage/plugin-catalog-node@1.4.1
+  - @backstage/plugin-events-node@0.2.9
+  - @backstage/plugin-auth-node@0.2.17
+  - @backstage/integration@1.6.0
+  - @backstage/backend-tasks@0.5.5
+  - @backstage/plugin-scaffolder-common@1.4.0
+  - @backstage/plugin-permission-node@0.7.11
+  - @backstage/catalog-client@1.4.3
+  - @backstage/catalog-model@1.4.1
+  - @backstage/config@1.0.8
+  - @backstage/errors@1.2.1
+  - @backstage/types@1.1.0
+  - @backstage/plugin-catalog-common@1.0.15
+  - @backstage/plugin-permission-common@0.7.7
+  - @backstage/plugin-search-common@1.2.5
+
+## @backstage/plugin-catalog-backend-module-gcp@0.1.0
+
+### Minor Changes
+
+- 290eff6692aa: Added GCP catalog plugin with GKE provider
+
+### Patch Changes
+
+- 629cbd194a87: Use `coreServices.rootConfig` instead of `coreService.config`
+- Updated dependencies
+  - @backstage/backend-common@0.19.2
+  - @backstage/backend-plugin-api@0.6.0
+  - @backstage/plugin-catalog-node@1.4.1
+  - @backstage/backend-tasks@0.5.5
+  - @backstage/config@1.0.8
+  - @backstage/plugin-kubernetes-common@0.6.5
+
+## @backstage/plugin-catalog-backend-module-unprocessed@0.2.0
+
+### Minor Changes
+
+- 5156a94c2e2a: **BREAKING**: Fixing typo in exported module. You will have to rename the import to the correct spelling. `UnprocessedEntites` -> `UnprocessedEntities`
+
+### Patch Changes
+
+- 12a8c94eda8d: Add package repository and homepage metadata
+- Updated dependencies
+  - @backstage/backend-plugin-api@0.6.0
+  - @backstage/plugin-auth-node@0.2.17
+  - @backstage/catalog-model@1.4.1
+
+## @backstage/plugin-kubernetes@0.10.0
+
+### Minor Changes
+
+- 4b6d41737aad: **BREAKING**: Fixed typos in exported module attributes. Many users may see no changes, but if you have customized the plugin output, you may have to rename the following:
+
+  - Component attribute: `<ResourceUtilization totalFormated={} />` to `<ResourceUtilization totalFormatted={} />`
+  - Interface attribute: `DetectedError.occuranceCount` to `DetectedError.occurrenceCount`.
+
+### Patch Changes
+
+- 562e34d2693f: Fix container memory limits
+- Updated dependencies
+  - @backstage/core-components@0.13.4
+  - @backstage/plugin-catalog-react@1.8.1
+  - @backstage/core-plugin-api@1.5.3
+  - @backstage/catalog-model@1.4.1
+  - @backstage/config@1.0.8
+  - @backstage/errors@1.2.1
+  - @backstage/theme@0.4.1
+  - @backstage/plugin-kubernetes-common@0.6.5
+
+## @backstage/plugin-linguist-backend@0.4.0
+
+### Minor Changes
+
+- d440f1dd0e72: Adds a processor to the linguist backend which can automatically add language tags to entities
+- 0896d85d5ab5: **BREAKING**: Removed the alpha export plugin options from exported `linguistPlugin()` (used by the new backend system) in favour of static config.
+
+### Patch Changes
+
+- 12a8c94eda8d: Add package repository and homepage metadata
+- ca5e591cb86a: Fixed bug in LinguistBackendClient.ts file where if the linguistJsOptions is specified and sent over to the linguist-js package it would get changed (another attribute would be added) causing future entities of the batch to fail with an error
+- Updated dependencies
+  - @backstage/backend-common@0.19.2
+  - @backstage/backend-plugin-api@0.6.0
+  - @backstage/plugin-linguist-common@0.1.1
+  - @backstage/plugin-catalog-node@1.4.1
+  - @backstage/plugin-auth-node@0.2.17
+  - @backstage/backend-tasks@0.5.5
+  - @backstage/catalog-client@1.4.3
+  - @backstage/catalog-model@1.4.1
+  - @backstage/config@1.0.8
+  - @backstage/errors@1.2.1
+  - @backstage/types@1.1.0
+
+## @backstage/plugin-proxy-backend@0.3.0
+
+### Minor Changes
+
+- 7daf65bfcfa1: Defining proxy endpoints directly under the root `proxy` configuration key is deprecated. Endpoints should now be declared under `proxy.endpoints` instead. The `skipInvalidProxies` and `reviveConsumedRequestBodies` can now also be configured through static configuration.
+
+### Patch Changes
+
+- 629cbd194a87: Use `coreServices.rootConfig` instead of `coreService.config`
+- 4b82382ed8c2: Fixed invalid configuration schema. The configuration schema may be more strict as a result.
+- Updated dependencies
+  - @backstage/backend-common@0.19.2
+  - @backstage/backend-plugin-api@0.6.0
+  - @backstage/config@1.0.8
+
+## @backstage/plugin-scaffolder-backend@1.16.0
+
+### Minor Changes
+
+- e514aac3eac0: Introduce `each` property on action steps, allowing them to be ran repeatedly.
+
+### Patch Changes
+
+- 629cbd194a87: Use `coreServices.rootConfig` instead of `coreService.config`
+
+- 349611126ae2: Removed the options from the alpha `scaffolderPlugin` export. To extend the scaffolder plugin you instead now use the available extension points, `scaffolderActionsExtensionPoint`, `scaffolderTaskBrokerExtensionPoint`, and `scaffolderTemplatingExtensionPoint`.
+
+- 33c76caef72a: Added examples for the `fs:delete` and `fs:rename` actions
+
+- e07a4914f621: Deprecated the following type exports, which have been moved to `@backstage/plugin-scaffolder-node` instead:
+
+  - `TemplateFilter`
+  - `TemplateGlobal`
+  - `TaskStatus`
+  - `TaskCompletionState`
+  - `SerializedTask`
+  - `TaskEventType`
+  - `SerializedTaskEvent`
+  - `TaskBrokerDispatchResult`
+  - `TaskBrokerDispatchOptions`
+  - `TaskContext`
+  - `TaskBroker`
+
+- 0b1d775be05b: Adds examples to a few scaffolder actions.
+
+- 88bc6e27a213: The `concurrentTasksLimit` option can now be configured via static configuration as well. Setting it to 0 will now also disable the task worker.
+
+- 0f873325068d: Add examples for `github:repo:create` and `github:repo:push` scaffolder actions.
+
+- 5c28ebc79fd6: Updated dependency `esbuild` to `^0.19.0`.
+
+- d3b31a791eb1: Deprecated `executeShellCommand`, `RunCommandOptions`, and `fetchContents` from `@backstage/plugin-scaffolder-backend`, since they are useful for Scaffolder modules (who should not be importing from the plugin package itself). You should now import these from `@backstage/plugin-scaffolder-backend-node` instead. `RunCommandOptions` was renamed in the Node package as `ExecuteShellCommandOptions`, for consistency.
+
+- Updated dependencies
+  - @backstage/backend-common@0.19.2
+  - @backstage/plugin-catalog-backend@1.12.0
+  - @backstage/backend-plugin-api@0.6.0
+  - @backstage/plugin-scaffolder-node@0.2.0
+  - @backstage/plugin-catalog-node@1.4.1
+  - @backstage/plugin-auth-node@0.2.17
+  - @backstage/integration@1.6.0
+  - @backstage/backend-tasks@0.5.5
+  - @backstage/plugin-scaffolder-common@1.4.0
+  - @backstage/plugin-permission-node@0.7.11
+  - @backstage/catalog-client@1.4.3
+  - @backstage/catalog-model@1.4.1
+  - @backstage/config@1.0.8
+  - @backstage/errors@1.2.1
+  - @backstage/types@1.1.0
+  - @backstage/plugin-catalog-common@1.0.15
+  - @backstage/plugin-permission-common@0.7.7
+
+## @backstage/plugin-scaffolder-common@1.4.0
+
+### Minor Changes
+
+- e514aac3eac0: Introduce `each` property on action steps, allowing them to be ran repeatedly.
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/catalog-model@1.4.1
+  - @backstage/types@1.1.0
+  - @backstage/plugin-permission-common@0.7.7
+
+## @backstage/plugin-scaffolder-node@0.2.0
+
+### Minor Changes
+
+- e514aac3eac0: Introduce `each` property on action steps, allowing them to be ran repeatedly.
+
+### Patch Changes
+
+- 12a8c94eda8d: Add package repository and homepage metadata
+- e07a4914f621: Added several new types that were moved from `@backstage/plugin-scaffolder-backend`.
+- 349611126ae2: Added two new alpha extension points, `scaffolderTaskBrokerExtensionPoint` and `scaffolderTemplatingExtensionPoint`.
+- 0b1d775be05b: Export `TemplateExample` from the `createTemplateAction` type.
+- d3b31a791eb1: Deprecated `executeShellCommand`, `RunCommandOptions`, and `fetchContents` from `@backstage/plugin-scaffolder-backend`, since they are useful for Scaffolder modules (who should not be importing from the plugin package itself). You should now import these from `@backstage/plugin-scaffolder-backend-node` instead. `RunCommandOptions` was renamed in the Node package as `ExecuteShellCommandOptions`, for consistency.
+- Updated dependencies
+  - @backstage/backend-common@0.19.2
+  - @backstage/backend-plugin-api@0.6.0
+  - @backstage/integration@1.6.0
+  - @backstage/plugin-scaffolder-common@1.4.0
+  - @backstage/catalog-model@1.4.1
+  - @backstage/errors@1.2.1
+  - @backstage/types@1.1.0
+
+## @backstage/plugin-search-backend@1.4.0
+
+### Minor Changes
+
+- ebeb77586975: Now performs request validation based on OpenAPI schema through `@backstage/backend-openapi-utils`. Error responses for invalid input, like `"a"` instead of a number, may have changed.
+
+### Patch Changes
+
+- 629cbd194a87: Use `coreServices.rootConfig` instead of `coreService.config`
+- 12a8c94eda8d: Add package repository and homepage metadata
+- 951ab6c9db58: Add missing `configSchema` to package.json
+- Updated dependencies
+  - @backstage/backend-common@0.19.2
+  - @backstage/backend-plugin-api@0.6.0
+  - @backstage/backend-openapi-utils@0.0.3
+  - @backstage/plugin-search-backend-node@1.2.4
+  - @backstage/plugin-auth-node@0.2.17
+  - @backstage/plugin-permission-node@0.7.11
+  - @backstage/config@1.0.8
+  - @backstage/errors@1.2.1
+  - @backstage/types@1.1.0
+  - @backstage/plugin-permission-common@0.7.7
+  - @backstage/plugin-search-common@1.2.5
+
+## @backstage/plugin-todo-backend@0.2.0
+
+### Minor Changes
+
+- ebeb77586975: Now performs request validation based on OpenAPI schema through `@backstage/backend-openapi-utils`. Error responses for invalid input, like `"a"` instead of a number, may have changed.
+
+### Patch Changes
+
+- 629cbd194a87: Use `coreServices.rootConfig` instead of `coreService.config`
+- ad3fb5401729: Fixed a bug where filter queries from the frontend would always fail validation.
+- Updated dependencies
+  - @backstage/backend-common@0.19.2
+  - @backstage/backend-plugin-api@0.6.0
+  - @backstage/backend-openapi-utils@0.0.3
+  - @backstage/plugin-catalog-node@1.4.1
+  - @backstage/integration@1.6.0
+  - @backstage/catalog-client@1.4.3
+  - @backstage/catalog-model@1.4.1
+  - @backstage/config@1.0.8
+  - @backstage/errors@1.2.1
+
+## @backstage/app-defaults@1.4.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-app-api@1.9.1
+  - @backstage/core-components@0.13.4
+  - @backstage/core-plugin-api@1.5.3
+  - @backstage/theme@0.4.1
+  - @backstage/plugin-permission-react@0.4.14
+
+## @backstage/backend-common@0.19.2
+
+### Patch Changes
+
+- 629cbd194a87: Use `coreServices.rootConfig` instead of `coreService.config`
+
+- 443afcf7f567: To improve performance, `GerritUrlReader.readTree()` now uses Gitiles to fetch an archive instead of cloning the repository.
+  If `gitilesBaseUrl` is not configured, `readTree` still uses Git to clone the repository.
+
+  Added `stripFirstDirectory` option to `ReadTreeResponseFactory.fromTarArchive()`, allowing to disable stripping first directory
+  for `tar` archives.
+
+- 4b82382ed8c2: Fixed invalid configuration schema. The configuration schema may be more strict as a result.
+
+- Updated dependencies
+  - @backstage/backend-app-api@0.5.0
+  - @backstage/config-loader@1.4.0
+  - @backstage/backend-plugin-api@0.6.0
+  - @backstage/integration@1.6.0
+  - @backstage/integration-aws-node@0.1.5
+  - @backstage/backend-dev-utils@0.1.1
+  - @backstage/cli-common@0.1.12
+  - @backstage/config@1.0.8
+  - @backstage/errors@1.2.1
+  - @backstage/types@1.1.0
+
+## @backstage/backend-openapi-utils@0.0.3
+
+### Patch Changes
+
+- ebeb77586975: Add a new `createRouter` method for generating an `express` router that validates against your spec. Also fixes a bug with the query parameters type resolution.
+- 12a8c94eda8d: Add package repository and homepage metadata
+- Updated dependencies
+  - @backstage/errors@1.2.1
+
+## @backstage/backend-tasks@0.5.5
+
+### Patch Changes
+
+- dfd1b6b2fc33: Make `readTaskScheduleDefinitionFromConfig` properly handle bad inputs
+- Updated dependencies
+  - @backstage/backend-common@0.19.2
+  - @backstage/config@1.0.8
+  - @backstage/errors@1.2.1
+  - @backstage/types@1.1.0
+
+## @backstage/cli@0.22.10
+
+### Patch Changes
+
+- 3f67cefb4780: Reload the frontend when app config changes
+- cebbf8a27f3c: Enable to print the config schema not merged with the `--no-merge` flag
+- 5c28ebc79fd6: Updated dependency `esbuild` to `^0.19.0`.
+- 971bdd6a4732: Bumped internal `nodemon` dependency.
+- Updated dependencies
+  - @backstage/config-loader@1.4.0
+  - @backstage/cli-node@0.1.3
+  - @backstage/integration@1.6.0
+  - @backstage/catalog-model@1.4.1
+  - @backstage/cli-common@0.1.12
+  - @backstage/config@1.0.8
+  - @backstage/errors@1.2.1
+  - @backstage/eslint-plugin@0.1.3
+  - @backstage/release-manifests@0.0.9
+  - @backstage/types@1.1.0
+
+## @backstage/cli-node@0.1.3
+
+### Patch Changes
+
+- 12a8c94eda8d: Add package repository and homepage metadata
+- Updated dependencies
+  - @backstage/cli-common@0.1.12
+  - @backstage/errors@1.2.1
+  - @backstage/types@1.1.0
+
+## @backstage/core-app-api@1.9.1
+
+### Patch Changes
+
+- 9ae4e7e63836: Fixed a bug that could cause `navigate` analytics events to be misattributed to the plugin mounted on the root route (e.g. the `home` plugin at `/`) when the route that was navigated to wasn't associated with a routable extension.
+- Updated dependencies
+  - @backstage/core-plugin-api@1.5.3
+  - @backstage/config@1.0.8
+  - @backstage/types@1.1.0
+  - @backstage/version-bridge@1.0.4
+
+## @backstage/core-components@0.13.4
+
+### Patch Changes
+
+- 3d86be999fdf: Prefer simple `theme.spacing` without string interpolation
+- Updated dependencies
+  - @backstage/core-plugin-api@1.5.3
+  - @backstage/config@1.0.8
+  - @backstage/errors@1.2.1
+  - @backstage/theme@0.4.1
+  - @backstage/version-bridge@1.0.4
+
+## @backstage/create-app@0.5.4
+
+### Patch Changes
+
+- b441642fbe0d: Bumped create-app version.
+- 572abc7edf55: Bumped create-app version.
+- 74f77f151a96: Bumped create-app version.
+- 5cc0ac5ef3d1: Bump to a newer version of the `concurrently` library
+- 46c9a798e41d: Updated the `app-config.yaml` template to use `proxy.endpoints`.
+- 971bdd6a4732: Bumped internal `nodemon` dependency.
+- Updated dependencies
+  - @backstage/cli-common@0.1.12
+
+## @backstage/dev-utils@1.0.18
+
+### Patch Changes
+
+- 254ad469f053: Removed deprecated calls to `app.getProvider()` and `app.getRouter()` in `DevAppBuilder`
+- Updated dependencies
+  - @backstage/core-app-api@1.9.1
+  - @backstage/integration-react@1.1.16
+  - @backstage/core-components@0.13.4
+  - @backstage/plugin-catalog-react@1.8.1
+  - @backstage/app-defaults@1.4.2
+  - @backstage/core-plugin-api@1.5.3
+  - @backstage/test-utils@1.4.2
+  - @backstage/catalog-model@1.4.1
+  - @backstage/theme@0.4.1
+
+## @backstage/integration-react@1.1.16
+
+### Patch Changes
+
+- 12a8c94eda8d: Add package repository and homepage metadata
+- Updated dependencies
+  - @backstage/integration@1.6.0
+  - @backstage/core-components@0.13.4
+  - @backstage/core-plugin-api@1.5.3
+  - @backstage/config@1.0.8
+  - @backstage/theme@0.4.1
+
+## @backstage/repo-tools@0.3.3
+
+### Patch Changes
+
+- 75702e85862a: Bumped `@microsoft/api-extractor` dependency to `^7.36.4`, and `@microsoft/api-documenter` to `^7.22.33`.
+- 1f3337ebc707: Introducing a new, experimental command `backstage-repo-tools generate-catalog-info`, which can be used to create standardized `catalog-info.yaml` files for each Backstage package in a Backstage monorepo. It can also be used to automatically fix existing `catalog-info.yaml` files with the correct metadata (including `metadata.name`, `metadata.title`, and `metadata.description` introspected from the package's `package.json`, as well as `spec.owner` introspected from `CODEOWNERS`), e.g. in a post-commit hook.
+- ebeb77586975: Update `schema openapi generate` command to now create a default router that can be imported and used directly.
+- Updated dependencies
+  - @backstage/cli-node@0.1.3
+  - @backstage/catalog-model@1.4.1
+  - @backstage/cli-common@0.1.12
+  - @backstage/errors@1.2.1
+
+## @techdocs/cli@1.4.5
+
+### Patch Changes
+
+- 971bdd6a4732: Bumped internal `nodemon` dependency.
+- Updated dependencies
+  - @backstage/backend-common@0.19.2
+  - @backstage/plugin-techdocs-node@1.7.4
+  - @backstage/catalog-model@1.4.1
+  - @backstage/cli-common@0.1.12
+  - @backstage/config@1.0.8
+
+## @backstage/test-utils@1.4.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-app-api@1.9.1
+  - @backstage/core-plugin-api@1.5.3
+  - @backstage/config@1.0.8
+  - @backstage/theme@0.4.1
+  - @backstage/types@1.1.0
+  - @backstage/plugin-permission-common@0.7.7
+  - @backstage/plugin-permission-react@0.4.14
+
+## @backstage/plugin-adr@0.6.4
+
+### Patch Changes
+
+- 12a8c94eda8d: Add package repository and homepage metadata
+- Updated dependencies
+  - @backstage/integration-react@1.1.16
+  - @backstage/core-components@0.13.4
+  - @backstage/plugin-catalog-react@1.8.1
+  - @backstage/core-plugin-api@1.5.3
+  - @backstage/plugin-search-react@1.6.4
+  - @backstage/catalog-model@1.4.1
+  - @backstage/theme@0.4.1
+  - @backstage/plugin-adr-common@0.2.12
+  - @backstage/plugin-search-common@1.2.5
+
+## @backstage/plugin-adr-backend@0.3.6
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.19.2
+  - @backstage/backend-plugin-api@0.6.0
+  - @backstage/integration@1.6.0
+  - @backstage/catalog-client@1.4.3
+  - @backstage/catalog-model@1.4.1
+  - @backstage/config@1.0.8
+  - @backstage/errors@1.2.1
+  - @backstage/plugin-adr-common@0.2.12
+  - @backstage/plugin-search-common@1.2.5
+
+## @backstage/plugin-adr-common@0.2.12
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/integration@1.6.0
+  - @backstage/catalog-model@1.4.1
+  - @backstage/plugin-search-common@1.2.5
+
+## @backstage/plugin-airbrake@0.3.21
+
+### Patch Changes
+
+- 12a8c94eda8d: Add package repository and homepage metadata
+- Updated dependencies
+  - @backstage/dev-utils@1.0.18
+  - @backstage/core-components@0.13.4
+  - @backstage/plugin-catalog-react@1.8.1
+  - @backstage/core-plugin-api@1.5.3
+  - @backstage/test-utils@1.4.2
+  - @backstage/catalog-model@1.4.1
+  - @backstage/theme@0.4.1
+
+## @backstage/plugin-airbrake-backend@0.2.21
+
+### Patch Changes
+
+- 629cbd194a87: Use `coreServices.rootConfig` instead of `coreService.config`
+- 12a8c94eda8d: Add package repository and homepage metadata
+- Updated dependencies
+  - @backstage/backend-common@0.19.2
+  - @backstage/backend-plugin-api@0.6.0
+  - @backstage/config@1.0.8
+
+## @backstage/plugin-allure@0.1.37
+
+### Patch Changes
+
+- 12a8c94eda8d: Add package repository and homepage metadata
+- Updated dependencies
+  - @backstage/core-components@0.13.4
+  - @backstage/plugin-catalog-react@1.8.1
+  - @backstage/core-plugin-api@1.5.3
+  - @backstage/catalog-model@1.4.1
+  - @backstage/theme@0.4.1
+
+## @backstage/plugin-analytics-module-ga@0.1.32
+
+### Patch Changes
+
+- 12a8c94eda8d: Add package repository and homepage metadata
+- Updated dependencies
+  - @backstage/core-components@0.13.4
+  - @backstage/core-plugin-api@1.5.3
+  - @backstage/config@1.0.8
+  - @backstage/theme@0.4.1
+
+## @backstage/plugin-analytics-module-ga4@0.1.3
+
+### Patch Changes
+
+- 12a8c94eda8d: Add package repository and homepage metadata
+- Updated dependencies
+  - @backstage/core-components@0.13.4
+  - @backstage/core-plugin-api@1.5.3
+  - @backstage/config@1.0.8
+  - @backstage/theme@0.4.1
+
+## @backstage/plugin-analytics-module-newrelic-browser@0.0.1
+
+### Patch Changes
+
+- ec7357258853: Introduced the New Relic Browser analytics module. Check out the plugins [README.md](https://github.com/backstage/backstage/tree/master/plugins/analytics-module-newrelic-browser) for more details!
+- Updated dependencies
+  - @backstage/core-components@0.13.4
+  - @backstage/core-plugin-api@1.5.3
+  - @backstage/config@1.0.8
+
+## @backstage/plugin-apache-airflow@0.2.14
+
+### Patch Changes
+
+- 12a8c94eda8d: Add package repository and homepage metadata
+- Updated dependencies
+  - @backstage/core-components@0.13.4
+  - @backstage/core-plugin-api@1.5.3
+
+## @backstage/plugin-api-docs@0.9.7
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.13.4
+  - @backstage/plugin-catalog@1.12.1
+  - @backstage/plugin-catalog-react@1.8.1
+  - @backstage/core-plugin-api@1.5.3
+  - @backstage/catalog-model@1.4.1
+  - @backstage/theme@0.4.1
+
+## @backstage/plugin-apollo-explorer@0.1.14
+
+### Patch Changes
+
+- 12a8c94eda8d: Add package repository and homepage metadata
+- Updated dependencies
+  - @backstage/core-components@0.13.4
+  - @backstage/core-plugin-api@1.5.3
+  - @backstage/theme@0.4.1
+
+## @backstage/plugin-app-backend@0.3.48
+
+### Patch Changes
+
+- 629cbd194a87: Use `coreServices.rootConfig` instead of `coreService.config`
+- d564ad142b17: Migrated the alpha `appBackend` export to use static configuration and extension points rather than accepting options.
+- Updated dependencies
+  - @backstage/backend-common@0.19.2
+  - @backstage/config-loader@1.4.0
+  - @backstage/backend-plugin-api@0.6.0
+  - @backstage/plugin-app-node@0.1.0
+  - @backstage/config@1.0.8
+  - @backstage/types@1.1.0
+
+## @backstage/plugin-auth-backend@0.18.6
+
+### Patch Changes
+
+- 16452cd007ae: Updated `frameHandler` to return `undefined` when using the redirect flow instead of returning `postMessageReponse` which was causing errors
+- 9dad4b0e61bd: Updated config schema to match what was being used in code
+- bb70a9c3886a: Add frontend visibility to provider objects in `auth` config.
+- Updated dependencies
+  - @backstage/backend-common@0.19.2
+  - @backstage/plugin-auth-node@0.2.17
+  - @backstage/catalog-client@1.4.3
+  - @backstage/catalog-model@1.4.1
+  - @backstage/config@1.0.8
+  - @backstage/errors@1.2.1
+  - @backstage/types@1.1.0
+
+## @backstage/plugin-auth-node@0.2.17
+
+### Patch Changes
+
+- 12a8c94eda8d: Add package repository and homepage metadata
+- Updated dependencies
+  - @backstage/backend-common@0.19.2
+  - @backstage/config@1.0.8
+  - @backstage/errors@1.2.1
+
+## @backstage/plugin-azure-devops@0.3.3
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.13.4
+  - @backstage/plugin-catalog-react@1.8.1
+  - @backstage/core-plugin-api@1.5.3
+  - @backstage/catalog-model@1.4.1
+  - @backstage/errors@1.2.1
+  - @backstage/theme@0.4.1
+  - @backstage/plugin-azure-devops-common@0.3.0
+
+## @backstage/plugin-azure-devops-backend@0.3.27
+
+### Patch Changes
+
+- 629cbd194a87: Use `coreServices.rootConfig` instead of `coreService.config`
+- 12a8c94eda8d: Add package repository and homepage metadata
+- Updated dependencies
+  - @backstage/backend-common@0.19.2
+  - @backstage/backend-plugin-api@0.6.0
+  - @backstage/config@1.0.8
+  - @backstage/plugin-azure-devops-common@0.3.0
+
+## @backstage/plugin-azure-sites@0.1.10
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.13.4
+  - @backstage/plugin-catalog-react@1.8.1
+  - @backstage/core-plugin-api@1.5.3
+  - @backstage/catalog-model@1.4.1
+  - @backstage/theme@0.4.1
+  - @backstage/plugin-azure-sites-common@0.1.0
+
+## @backstage/plugin-azure-sites-backend@0.1.10
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.19.2
+  - @backstage/config@1.0.8
+  - @backstage/plugin-azure-sites-common@0.1.0
+
+## @backstage/plugin-badges@0.2.45
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.13.4
+  - @backstage/plugin-catalog-react@1.8.1
+  - @backstage/core-plugin-api@1.5.3
+  - @backstage/catalog-model@1.4.1
+  - @backstage/errors@1.2.1
+  - @backstage/theme@0.4.1
+
+## @backstage/plugin-badges-backend@0.2.3
+
+### Patch Changes
+
+- 629cbd194a87: Use `coreServices.rootConfig` instead of `coreService.config`
+- Updated dependencies
+  - @backstage/backend-common@0.19.2
+  - @backstage/backend-plugin-api@0.6.0
+  - @backstage/plugin-auth-node@0.2.17
+  - @backstage/catalog-client@1.4.3
+  - @backstage/catalog-model@1.4.1
+  - @backstage/config@1.0.8
+  - @backstage/errors@1.2.1
+
+## @backstage/plugin-bazaar@0.2.12
+
+### Patch Changes
+
+- 12a8c94eda8d: Add package repository and homepage metadata
+- Updated dependencies
+  - @backstage/cli@0.22.10
+  - @backstage/core-components@0.13.4
+  - @backstage/plugin-catalog@1.12.1
+  - @backstage/plugin-catalog-react@1.8.1
+  - @backstage/core-plugin-api@1.5.3
+  - @backstage/catalog-client@1.4.3
+  - @backstage/catalog-model@1.4.1
+  - @backstage/errors@1.2.1
+  - @backstage/theme@0.4.1
+
+## @backstage/plugin-bazaar-backend@0.2.11
+
+### Patch Changes
+
+- 629cbd194a87: Use `coreServices.rootConfig` instead of `coreService.config`
+- 12a8c94eda8d: Add package repository and homepage metadata
+- Updated dependencies
+  - @backstage/backend-common@0.19.2
+  - @backstage/backend-plugin-api@0.6.0
+  - @backstage/plugin-auth-node@0.2.17
+  - @backstage/config@1.0.8
+  - @backstage/errors@1.2.1
+
+## @backstage/plugin-bitbucket-cloud-common@0.2.9
+
+### Patch Changes
+
+- 12a8c94eda8d: Add package repository and homepage metadata
+- Updated dependencies
+  - @backstage/integration@1.6.0
+
+## @backstage/plugin-bitrise@0.1.48
+
+### Patch Changes
+
+- 12a8c94eda8d: Add package repository and homepage metadata
+- Updated dependencies
+  - @backstage/core-components@0.13.4
+  - @backstage/plugin-catalog-react@1.8.1
+  - @backstage/core-plugin-api@1.5.3
+  - @backstage/catalog-model@1.4.1
+  - @backstage/theme@0.4.1
+
+## @backstage/plugin-catalog@1.12.1
+
+### Patch Changes
+
+- 3d86be999fdf: Prefer simple `theme.spacing` without string interpolation
+- 136cea792bd4: Fixed an issue causing `EntitySwitch` to unmount its children once entity refresh was invoked
+- Updated dependencies
+  - @backstage/integration-react@1.1.16
+  - @backstage/core-components@0.13.4
+  - @backstage/plugin-catalog-react@1.8.1
+  - @backstage/plugin-scaffolder-common@1.4.0
+  - @backstage/core-plugin-api@1.5.3
+  - @backstage/plugin-search-react@1.6.4
+  - @backstage/catalog-client@1.4.3
+  - @backstage/catalog-model@1.4.1
+  - @backstage/errors@1.2.1
+  - @backstage/theme@0.4.1
+  - @backstage/types@1.1.0
+  - @backstage/plugin-catalog-common@1.0.15
+  - @backstage/plugin-search-common@1.2.5
+
+## @backstage/plugin-catalog-backend-module-aws@0.2.3
+
+### Patch Changes
+
+- 629cbd194a87: Use `coreServices.rootConfig` instead of `coreService.config`
+- 4b82382ed8c2: Fixed invalid configuration schema. The configuration schema may be more strict as a result.
+- b4222908b0c3: Added option to configure AWS `accountId` in `AwsS3EntityProvider`
+- Updated dependencies
+  - @backstage/backend-common@0.19.2
+  - @backstage/backend-plugin-api@0.6.0
+  - @backstage/plugin-catalog-node@1.4.1
+  - @backstage/integration@1.6.0
+  - @backstage/backend-tasks@0.5.5
+  - @backstage/integration-aws-node@0.1.5
+  - @backstage/catalog-model@1.4.1
+  - @backstage/config@1.0.8
+  - @backstage/errors@1.2.1
+  - @backstage/types@1.1.0
+  - @backstage/plugin-catalog-common@1.0.15
+  - @backstage/plugin-kubernetes-common@0.6.5
+
+## @backstage/plugin-catalog-backend-module-azure@0.1.19
+
+### Patch Changes
+
+- 629cbd194a87: Use `coreServices.rootConfig` instead of `coreService.config`
+- 4b82382ed8c2: Fixed invalid configuration schema. The configuration schema may be more strict as a result.
+- Updated dependencies
+  - @backstage/backend-common@0.19.2
+  - @backstage/backend-plugin-api@0.6.0
+  - @backstage/plugin-catalog-node@1.4.1
+  - @backstage/integration@1.6.0
+  - @backstage/backend-tasks@0.5.5
+  - @backstage/catalog-model@1.4.1
+  - @backstage/config@1.0.8
+  - @backstage/errors@1.2.1
+  - @backstage/types@1.1.0
+  - @backstage/plugin-catalog-common@1.0.15
+
+## @backstage/plugin-catalog-backend-module-bitbucket@0.2.15
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.19.2
+  - @backstage/plugin-bitbucket-cloud-common@0.2.9
+  - @backstage/plugin-catalog-node@1.4.1
+  - @backstage/integration@1.6.0
+  - @backstage/catalog-model@1.4.1
+  - @backstage/config@1.0.8
+  - @backstage/errors@1.2.1
+  - @backstage/types@1.1.0
+
+## @backstage/plugin-catalog-backend-module-bitbucket-cloud@0.1.15
+
+### Patch Changes
+
+- 629cbd194a87: Use `coreServices.rootConfig` instead of `coreService.config`
+- 4b82382ed8c2: Fixed invalid configuration schema. The configuration schema may be more strict as a result.
+- Updated dependencies
+  - @backstage/backend-common@0.19.2
+  - @backstage/backend-plugin-api@0.6.0
+  - @backstage/plugin-bitbucket-cloud-common@0.2.9
+  - @backstage/plugin-catalog-node@1.4.1
+  - @backstage/plugin-events-node@0.2.9
+  - @backstage/integration@1.6.0
+  - @backstage/backend-tasks@0.5.5
+  - @backstage/catalog-client@1.4.3
+  - @backstage/catalog-model@1.4.1
+  - @backstage/config@1.0.8
+  - @backstage/plugin-catalog-common@1.0.15
+
+## @backstage/plugin-catalog-backend-module-bitbucket-server@0.1.13
+
+### Patch Changes
+
+- 629cbd194a87: Use `coreServices.rootConfig` instead of `coreService.config`
+- 4b82382ed8c2: Fixed invalid configuration schema. The configuration schema may be more strict as a result.
+- Updated dependencies
+  - @backstage/backend-common@0.19.2
+  - @backstage/backend-plugin-api@0.6.0
+  - @backstage/plugin-catalog-node@1.4.1
+  - @backstage/integration@1.6.0
+  - @backstage/backend-tasks@0.5.5
+  - @backstage/catalog-model@1.4.1
+  - @backstage/config@1.0.8
+  - @backstage/errors@1.2.1
+
+## @backstage/plugin-catalog-backend-module-gerrit@0.1.16
+
+### Patch Changes
+
+- 629cbd194a87: Use `coreServices.rootConfig` instead of `coreService.config`
+- 4b82382ed8c2: Fixed invalid configuration schema. The configuration schema may be more strict as a result.
+- Updated dependencies
+  - @backstage/backend-common@0.19.2
+  - @backstage/backend-plugin-api@0.6.0
+  - @backstage/plugin-catalog-node@1.4.1
+  - @backstage/integration@1.6.0
+  - @backstage/backend-tasks@0.5.5
+  - @backstage/catalog-model@1.4.1
+  - @backstage/config@1.0.8
+  - @backstage/errors@1.2.1
+
+## @backstage/plugin-catalog-backend-module-github@0.3.3
+
+### Patch Changes
+
+- 629cbd194a87: Use `coreServices.rootConfig` instead of `coreService.config`
+- 4b82382ed8c2: Fixed invalid configuration schema. The configuration schema may be more strict as a result.
+- 81c231c9c9ee: Fixed a bug where the visibility filter was case sensitive and casting was inconsistent.
+- Updated dependencies
+  - @backstage/backend-common@0.19.2
+  - @backstage/plugin-catalog-backend@1.12.0
+  - @backstage/backend-plugin-api@0.6.0
+  - @backstage/plugin-catalog-node@1.4.1
+  - @backstage/plugin-events-node@0.2.9
+  - @backstage/integration@1.6.0
+  - @backstage/backend-tasks@0.5.5
+  - @backstage/catalog-client@1.4.3
+  - @backstage/catalog-model@1.4.1
+  - @backstage/config@1.0.8
+  - @backstage/errors@1.2.1
+  - @backstage/types@1.1.0
+  - @backstage/plugin-catalog-common@1.0.15
+
+## @backstage/plugin-catalog-backend-module-gitlab@0.2.4
+
+### Patch Changes
+
+- 629cbd194a87: Use `coreServices.rootConfig` instead of `coreService.config`
+- e6c721439f37: Added option to skip forked repos in GitlabDiscoveryEntityProvider
+- 4b82382ed8c2: Fixed invalid configuration schema. The configuration schema may be more strict as a result.
+- 2fe1f5973ff7: Filter Gitlab archived projects through APIs
+- Updated dependencies
+  - @backstage/backend-common@0.19.2
+  - @backstage/backend-plugin-api@0.6.0
+  - @backstage/plugin-catalog-node@1.4.1
+  - @backstage/integration@1.6.0
+  - @backstage/backend-tasks@0.5.5
+  - @backstage/catalog-model@1.4.1
+  - @backstage/config@1.0.8
+  - @backstage/errors@1.2.1
+  - @backstage/types@1.1.0
+
+## @backstage/plugin-catalog-backend-module-incremental-ingestion@0.4.1
+
+### Patch Changes
+
+- 629cbd194a87: Use `coreServices.rootConfig` instead of `coreService.config`
+- e2b6396a1274: Export new alpha `incrementalIngestionProvidersExtensionPoint` for registering incremental providers, rather than the providers being passed as options to the backend module.
+- Updated dependencies
+  - @backstage/backend-common@0.19.2
+  - @backstage/plugin-catalog-backend@1.12.0
+  - @backstage/backend-plugin-api@0.6.0
+  - @backstage/plugin-catalog-node@1.4.1
+  - @backstage/plugin-events-node@0.2.9
+  - @backstage/backend-tasks@0.5.5
+  - @backstage/catalog-model@1.4.1
+  - @backstage/config@1.0.8
+  - @backstage/errors@1.2.1
+  - @backstage/plugin-permission-common@0.7.7
+
+## @backstage/plugin-catalog-backend-module-ldap@0.5.15
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-node@1.4.1
+  - @backstage/backend-tasks@0.5.5
+  - @backstage/catalog-model@1.4.1
+  - @backstage/config@1.0.8
+  - @backstage/errors@1.2.1
+  - @backstage/types@1.1.0
+  - @backstage/plugin-catalog-common@1.0.15
+
+## @backstage/plugin-catalog-backend-module-msgraph@0.5.7
+
+### Patch Changes
+
+- 629cbd194a87: Use `coreServices.rootConfig` instead of `coreService.config`
+- fb93323201bf: The alpha `catalogModuleMicrosoftGraphOrgEntityProvider` export no longer accepts options. Transformers are now instead configured via the `microsoftGraphOrgEntityProviderTransformExtensionPoint`.
+- 4b82382ed8c2: Fixed invalid configuration schema. The configuration schema may be more strict as a result.
+- Updated dependencies
+  - @backstage/backend-common@0.19.2
+  - @backstage/backend-plugin-api@0.6.0
+  - @backstage/plugin-catalog-node@1.4.1
+  - @backstage/backend-tasks@0.5.5
+  - @backstage/catalog-model@1.4.1
+  - @backstage/config@1.0.8
+  - @backstage/plugin-catalog-common@1.0.15
+
+## @backstage/plugin-catalog-backend-module-openapi@0.1.14
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.19.2
+  - @backstage/plugin-catalog-backend@1.12.0
+  - @backstage/plugin-catalog-node@1.4.1
+  - @backstage/integration@1.6.0
+  - @backstage/catalog-model@1.4.1
+  - @backstage/config@1.0.8
+  - @backstage/types@1.1.0
+  - @backstage/plugin-catalog-common@1.0.15
+
+## @backstage/plugin-catalog-backend-module-puppetdb@0.1.5
+
+### Patch Changes
+
+- 629cbd194a87: Use `coreServices.rootConfig` instead of `coreService.config`
+- 4b82382ed8c2: Fixed invalid configuration schema. The configuration schema may be more strict as a result.
+- Updated dependencies
+  - @backstage/backend-common@0.19.2
+  - @backstage/backend-plugin-api@0.6.0
+  - @backstage/plugin-catalog-node@1.4.1
+  - @backstage/backend-tasks@0.5.5
+  - @backstage/catalog-model@1.4.1
+  - @backstage/config@1.0.8
+  - @backstage/errors@1.2.1
+  - @backstage/types@1.1.0
+
+## @backstage/plugin-catalog-graph@0.2.33
+
+### Patch Changes
+
+- 64ee2c0c7ca5: Propagate entity spec to EntityNode so that spec info such as type can be used for graph node customization
+- 62dc7a2b1ad1: Added maximum depth parameter to the catalogGraphParams in CatalogGraphCard.
+- 12a8c94eda8d: Add package repository and homepage metadata
+- Updated dependencies
+  - @backstage/core-components@0.13.4
+  - @backstage/plugin-catalog-react@1.8.1
+  - @backstage/core-plugin-api@1.5.3
+  - @backstage/catalog-client@1.4.3
+  - @backstage/catalog-model@1.4.1
+  - @backstage/theme@0.4.1
+  - @backstage/types@1.1.0
+
+## @backstage/plugin-catalog-import@0.9.11
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/integration-react@1.1.16
+  - @backstage/integration@1.6.0
+  - @backstage/core-components@0.13.4
+  - @backstage/plugin-catalog-react@1.8.1
+  - @backstage/core-plugin-api@1.5.3
+  - @backstage/catalog-client@1.4.3
+  - @backstage/catalog-model@1.4.1
+  - @backstage/config@1.0.8
+  - @backstage/errors@1.2.1
+  - @backstage/plugin-catalog-common@1.0.15
+
+## @backstage/plugin-catalog-node@1.4.1
+
+### Patch Changes
+
+- 12a8c94eda8d: Add package repository and homepage metadata
+- Updated dependencies
+  - @backstage/backend-plugin-api@0.6.0
+  - @backstage/catalog-client@1.4.3
+  - @backstage/catalog-model@1.4.1
+  - @backstage/errors@1.2.1
+  - @backstage/types@1.1.0
+  - @backstage/plugin-catalog-common@1.0.15
+
+## @backstage/plugin-catalog-react@1.8.1
+
+### Patch Changes
+
+- aa3feedce10a: Allow specifying screen size when catalog filters are hidden in drawer
+- Updated dependencies
+  - @backstage/integration@1.6.0
+  - @backstage/core-components@0.13.4
+  - @backstage/core-plugin-api@1.5.3
+  - @backstage/catalog-client@1.4.3
+  - @backstage/catalog-model@1.4.1
+  - @backstage/errors@1.2.1
+  - @backstage/theme@0.4.1
+  - @backstage/types@1.1.0
+  - @backstage/version-bridge@1.0.4
+  - @backstage/plugin-catalog-common@1.0.15
+  - @backstage/plugin-permission-common@0.7.7
+  - @backstage/plugin-permission-react@0.4.14
+
+## @backstage/plugin-catalog-unprocessed-entities@0.1.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.13.4
+  - @backstage/core-plugin-api@1.5.3
+  - @backstage/catalog-model@1.4.1
+  - @backstage/errors@1.2.1
+  - @backstage/theme@0.4.1
+
+## @backstage/plugin-cicd-statistics@0.1.23
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.8.1
+  - @backstage/core-plugin-api@1.5.3
+  - @backstage/catalog-model@1.4.1
+
+## @backstage/plugin-cicd-statistics-module-gitlab@0.1.17
+
+### Patch Changes
+
+- 12a8c94eda8d: Add package repository and homepage metadata
+- Updated dependencies
+  - @backstage/core-plugin-api@1.5.3
+  - @backstage/catalog-model@1.4.1
+  - @backstage/plugin-cicd-statistics@0.1.23
+
+## @backstage/plugin-circleci@0.3.21
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.13.4
+  - @backstage/plugin-catalog-react@1.8.1
+  - @backstage/core-plugin-api@1.5.3
+  - @backstage/catalog-model@1.4.1
+  - @backstage/theme@0.4.1
+
+## @backstage/plugin-cloudbuild@0.3.21
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.13.4
+  - @backstage/plugin-catalog-react@1.8.1
+  - @backstage/core-plugin-api@1.5.3
+  - @backstage/catalog-model@1.4.1
+  - @backstage/theme@0.4.1
+
+## @backstage/plugin-code-climate@0.1.21
+
+### Patch Changes
+
+- 12a8c94eda8d: Add package repository and homepage metadata
+- Updated dependencies
+  - @backstage/core-components@0.13.4
+  - @backstage/plugin-catalog-react@1.8.1
+  - @backstage/core-plugin-api@1.5.3
+  - @backstage/catalog-model@1.4.1
+  - @backstage/theme@0.4.1
+
+## @backstage/plugin-code-coverage@0.2.14
+
+### Patch Changes
+
+- 12a8c94eda8d: Add package repository and homepage metadata
+- Updated dependencies
+  - @backstage/core-components@0.13.4
+  - @backstage/plugin-catalog-react@1.8.1
+  - @backstage/core-plugin-api@1.5.3
+  - @backstage/catalog-model@1.4.1
+  - @backstage/config@1.0.8
+  - @backstage/errors@1.2.1
+  - @backstage/theme@0.4.1
+
+## @backstage/plugin-code-coverage-backend@0.2.14
+
+### Patch Changes
+
+- 12a8c94eda8d: Add package repository and homepage metadata
+- Updated dependencies
+  - @backstage/backend-common@0.19.2
+  - @backstage/integration@1.6.0
+  - @backstage/catalog-client@1.4.3
+  - @backstage/catalog-model@1.4.1
+  - @backstage/config@1.0.8
+  - @backstage/errors@1.2.1
+
+## @backstage/plugin-codescene@0.1.16
+
+### Patch Changes
+
+- 12a8c94eda8d: Add package repository and homepage metadata
+- Updated dependencies
+  - @backstage/core-components@0.13.4
+  - @backstage/core-plugin-api@1.5.3
+  - @backstage/config@1.0.8
+  - @backstage/errors@1.2.1
+  - @backstage/theme@0.4.1
+
+## @backstage/plugin-config-schema@0.1.44
+
+### Patch Changes
+
+- 12a8c94eda8d: Add package repository and homepage metadata
+- Updated dependencies
+  - @backstage/core-components@0.13.4
+  - @backstage/core-plugin-api@1.5.3
+  - @backstage/config@1.0.8
+  - @backstage/errors@1.2.1
+  - @backstage/theme@0.4.1
+  - @backstage/types@1.1.0
+
+## @backstage/plugin-cost-insights@0.12.10
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.13.4
+  - @backstage/plugin-catalog-react@1.8.1
+  - @backstage/core-plugin-api@1.5.3
+  - @backstage/catalog-model@1.4.1
+  - @backstage/config@1.0.8
+  - @backstage/theme@0.4.1
+  - @backstage/plugin-cost-insights-common@0.1.1
+
+## @backstage/plugin-devtools@0.1.3
+
+### Patch Changes
+
+- 48b6a04ad045: Fix readme typo
+- Updated dependencies
+  - @backstage/plugin-devtools-common@0.1.3
+  - @backstage/core-components@0.13.4
+  - @backstage/core-plugin-api@1.5.3
+  - @backstage/errors@1.2.1
+  - @backstage/theme@0.4.1
+  - @backstage/types@1.1.0
+  - @backstage/plugin-permission-react@0.4.14
+
+## @backstage/plugin-devtools-backend@0.1.3
+
+### Patch Changes
+
+- 629cbd194a87: Use `coreServices.rootConfig` instead of `coreService.config`
+
+- 12a8c94eda8d: Add package repository and homepage metadata
+
+- 2b4f77a4e900: Add DevTools configuration to enable dependency listing to be filtered with custom prefixes. For instance, in your `app-config.yaml`:
+
+  ```yaml
+  devTools:
+    info:
+      packagePrefixes:
+        - @backstage/
+        - @roadiehq/backstage-
+        - @spotify/backstage-
+  ```
+
+- Updated dependencies
+  - @backstage/backend-common@0.19.2
+  - @backstage/config-loader@1.4.0
+  - @backstage/backend-plugin-api@0.6.0
+  - @backstage/plugin-devtools-common@0.1.3
+  - @backstage/plugin-auth-node@0.2.17
+  - @backstage/plugin-permission-node@0.7.11
+  - @backstage/cli-common@0.1.12
+  - @backstage/config@1.0.8
+  - @backstage/errors@1.2.1
+  - @backstage/types@1.1.0
+  - @backstage/plugin-permission-common@0.7.7
+
+## @backstage/plugin-devtools-common@0.1.3
+
+### Patch Changes
+
+- 12a8c94eda8d: Add package repository and homepage metadata
+- Updated dependencies
+  - @backstage/types@1.1.0
+  - @backstage/plugin-permission-common@0.7.7
+
+## @backstage/plugin-dynatrace@7.0.1
+
+### Patch Changes
+
+- 12a8c94eda8d: Add package repository and homepage metadata
+- Updated dependencies
+  - @backstage/core-components@0.13.4
+  - @backstage/plugin-catalog-react@1.8.1
+  - @backstage/core-plugin-api@1.5.3
+  - @backstage/catalog-model@1.4.1
+  - @backstage/theme@0.4.1
+
+## @backstage/plugin-entity-feedback@0.2.4
+
+### Patch Changes
+
+- 12a8c94eda8d: Add package repository and homepage metadata
+- Updated dependencies
+  - @backstage/plugin-entity-feedback-common@0.1.2
+  - @backstage/core-components@0.13.4
+  - @backstage/plugin-catalog-react@1.8.1
+  - @backstage/core-plugin-api@1.5.3
+  - @backstage/catalog-model@1.4.1
+  - @backstage/errors@1.2.1
+  - @backstage/theme@0.4.1
+
+## @backstage/plugin-entity-feedback-backend@0.1.6
+
+### Patch Changes
+
+- 12a8c94eda8d: Add package repository and homepage metadata
+- Updated dependencies
+  - @backstage/backend-common@0.19.2
+  - @backstage/backend-plugin-api@0.6.0
+  - @backstage/plugin-entity-feedback-common@0.1.2
+  - @backstage/plugin-auth-node@0.2.17
+  - @backstage/catalog-client@1.4.3
+  - @backstage/catalog-model@1.4.1
+  - @backstage/config@1.0.8
+
+## @backstage/plugin-entity-feedback-common@0.1.2
+
+### Patch Changes
+
+- 12a8c94eda8d: Add package repository and homepage metadata
+
+## @backstage/plugin-entity-validation@0.1.6
+
+### Patch Changes
+
+- 12a8c94eda8d: Add package repository and homepage metadata
+- Updated dependencies
+  - @backstage/core-components@0.13.4
+  - @backstage/plugin-catalog-react@1.8.1
+  - @backstage/core-plugin-api@1.5.3
+  - @backstage/catalog-client@1.4.3
+  - @backstage/catalog-model@1.4.1
+  - @backstage/errors@1.2.1
+  - @backstage/theme@0.4.1
+  - @backstage/plugin-catalog-common@1.0.15
+
+## @backstage/plugin-events-backend@0.2.9
+
+### Patch Changes
+
+- 629cbd194a87: Use `coreServices.rootConfig` instead of `coreService.config`
+- 12a8c94eda8d: Add package repository and homepage metadata
+- Updated dependencies
+  - @backstage/backend-common@0.19.2
+  - @backstage/backend-plugin-api@0.6.0
+  - @backstage/plugin-events-node@0.2.9
+  - @backstage/config@1.0.8
+
+## @backstage/plugin-events-backend-module-aws-sqs@0.2.3
+
+### Patch Changes
+
+- 629cbd194a87: Use `coreServices.rootConfig` instead of `coreService.config`
+- 12a8c94eda8d: Add package repository and homepage metadata
+- 4b82382ed8c2: Fixed invalid configuration schema. The configuration schema may be more strict as a result.
+- Updated dependencies
+  - @backstage/backend-common@0.19.2
+  - @backstage/backend-plugin-api@0.6.0
+  - @backstage/plugin-events-node@0.2.9
+  - @backstage/backend-tasks@0.5.5
+  - @backstage/config@1.0.8
+  - @backstage/types@1.1.0
+
+## @backstage/plugin-events-backend-module-azure@0.1.10
+
+### Patch Changes
+
+- 12a8c94eda8d: Add package repository and homepage metadata
+- Updated dependencies
+  - @backstage/backend-plugin-api@0.6.0
+  - @backstage/plugin-events-node@0.2.9
+
+## @backstage/plugin-events-backend-module-bitbucket-cloud@0.1.10
+
+### Patch Changes
+
+- 12a8c94eda8d: Add package repository and homepage metadata
+- Updated dependencies
+  - @backstage/backend-plugin-api@0.6.0
+  - @backstage/plugin-events-node@0.2.9
+
+## @backstage/plugin-events-backend-module-gerrit@0.1.10
+
+### Patch Changes
+
+- 12a8c94eda8d: Add package repository and homepage metadata
+- Updated dependencies
+  - @backstage/backend-plugin-api@0.6.0
+  - @backstage/plugin-events-node@0.2.9
+
+## @backstage/plugin-events-backend-module-github@0.1.10
+
+### Patch Changes
+
+- 629cbd194a87: Use `coreServices.rootConfig` instead of `coreService.config`
+- 12a8c94eda8d: Add package repository and homepage metadata
+- Updated dependencies
+  - @backstage/backend-plugin-api@0.6.0
+  - @backstage/plugin-events-node@0.2.9
+  - @backstage/config@1.0.8
+
+## @backstage/plugin-events-backend-module-gitlab@0.1.10
+
+### Patch Changes
+
+- 629cbd194a87: Use `coreServices.rootConfig` instead of `coreService.config`
+- 12a8c94eda8d: Add package repository and homepage metadata
+- Updated dependencies
+  - @backstage/backend-plugin-api@0.6.0
+  - @backstage/plugin-events-node@0.2.9
+  - @backstage/config@1.0.8
+
+## @backstage/plugin-events-backend-test-utils@0.1.10
+
+### Patch Changes
+
+- 12a8c94eda8d: Add package repository and homepage metadata
+- Updated dependencies
+  - @backstage/plugin-events-node@0.2.9
+
+## @backstage/plugin-events-node@0.2.9
+
+### Patch Changes
+
+- 12a8c94eda8d: Add package repository and homepage metadata
+- Updated dependencies
+  - @backstage/backend-plugin-api@0.6.0
+
+## @backstage/plugin-explore@0.4.7
+
+### Patch Changes
+
+- 41a26248c91c: Support `material-ui` overrides in plugin-explore components
+- 83467b0534ee: Don't put "?" in URL if no query parameters.
+- Updated dependencies
+  - @backstage/core-components@0.13.4
+  - @backstage/plugin-catalog-react@1.8.1
+  - @backstage/core-plugin-api@1.5.3
+  - @backstage/plugin-search-react@1.6.4
+  - @backstage/plugin-explore-react@0.0.30
+  - @backstage/catalog-model@1.4.1
+  - @backstage/errors@1.2.1
+  - @backstage/theme@0.4.1
+  - @backstage/plugin-explore-common@0.0.1
+  - @backstage/plugin-search-common@1.2.5
+
+## @backstage/plugin-explore-backend@0.0.10
+
+### Patch Changes
+
+- eda2a699f40d: Moved the config example from the "Tools as Code" section to the "Tools as Config" section of the README
+- 12a8c94eda8d: Add package repository and homepage metadata
+- Updated dependencies
+  - @backstage/plugin-search-backend-module-explore@0.1.4
+  - @backstage/backend-common@0.19.2
+  - @backstage/config@1.0.8
+  - @backstage/types@1.1.0
+  - @backstage/plugin-explore-common@0.0.1
+  - @backstage/plugin-search-common@1.2.5
+
+## @backstage/plugin-firehydrant@0.2.5
+
+### Patch Changes
+
+- 12a8c94eda8d: Add package repository and homepage metadata
+- Updated dependencies
+  - @backstage/core-components@0.13.4
+  - @backstage/plugin-catalog-react@1.8.1
+  - @backstage/core-plugin-api@1.5.3
+  - @backstage/catalog-model@1.4.1
+  - @backstage/theme@0.4.1
+
+## @backstage/plugin-fossa@0.2.53
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.13.4
+  - @backstage/plugin-catalog-react@1.8.1
+  - @backstage/core-plugin-api@1.5.3
+  - @backstage/catalog-model@1.4.1
+  - @backstage/errors@1.2.1
+  - @backstage/theme@0.4.1
+
+## @backstage/plugin-gcalendar@0.3.17
+
+### Patch Changes
+
+- 12a8c94eda8d: Add package repository and homepage metadata
+- Updated dependencies
+  - @backstage/core-components@0.13.4
+  - @backstage/core-plugin-api@1.5.3
+  - @backstage/errors@1.2.1
+  - @backstage/theme@0.4.1
+
+## @backstage/plugin-gcp-projects@0.3.40
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.13.4
+  - @backstage/core-plugin-api@1.5.3
+  - @backstage/theme@0.4.1
+
+## @backstage/plugin-git-release-manager@0.3.34
+
+### Patch Changes
+
+- 12a8c94eda8d: Add package repository and homepage metadata
+- Updated dependencies
+  - @backstage/integration@1.6.0
+  - @backstage/core-components@0.13.4
+  - @backstage/core-plugin-api@1.5.3
+  - @backstage/theme@0.4.1
+
+## @backstage/plugin-github-actions@0.6.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/integration-react@1.1.16
+  - @backstage/integration@1.6.0
+  - @backstage/core-components@0.13.4
+  - @backstage/plugin-catalog-react@1.8.1
+  - @backstage/core-plugin-api@1.5.3
+  - @backstage/catalog-model@1.4.1
+  - @backstage/theme@0.4.1
+
+## @backstage/plugin-github-deployments@0.1.52
+
+### Patch Changes
+
+- 12a8c94eda8d: Add package repository and homepage metadata
+- Updated dependencies
+  - @backstage/integration-react@1.1.16
+  - @backstage/integration@1.6.0
+  - @backstage/core-components@0.13.4
+  - @backstage/plugin-catalog-react@1.8.1
+  - @backstage/core-plugin-api@1.5.3
+  - @backstage/catalog-model@1.4.1
+  - @backstage/errors@1.2.1
+  - @backstage/theme@0.4.1
+
+## @backstage/plugin-github-issues@0.2.10
+
+### Patch Changes
+
+- 12a8c94eda8d: Add package repository and homepage metadata
+- Updated dependencies
+  - @backstage/integration@1.6.0
+  - @backstage/core-components@0.13.4
+  - @backstage/plugin-catalog-react@1.8.1
+  - @backstage/core-plugin-api@1.5.3
+  - @backstage/catalog-model@1.4.1
+  - @backstage/errors@1.2.1
+  - @backstage/theme@0.4.1
+
+## @backstage/plugin-github-pull-requests-board@0.1.15
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/integration@1.6.0
+  - @backstage/core-components@0.13.4
+  - @backstage/plugin-catalog-react@1.8.1
+  - @backstage/core-plugin-api@1.5.3
+  - @backstage/catalog-model@1.4.1
+  - @backstage/theme@0.4.1
+
+## @backstage/plugin-gitops-profiles@0.3.39
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.13.4
+  - @backstage/core-plugin-api@1.5.3
+  - @backstage/config@1.0.8
+  - @backstage/theme@0.4.1
+
+## @backstage/plugin-gocd@0.1.27
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.13.4
+  - @backstage/plugin-catalog-react@1.8.1
+  - @backstage/core-plugin-api@1.5.3
+  - @backstage/catalog-model@1.4.1
+  - @backstage/errors@1.2.1
+  - @backstage/theme@0.4.1
+
+## @backstage/plugin-graphiql@0.2.53
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.13.4
+  - @backstage/core-plugin-api@1.5.3
+  - @backstage/theme@0.4.1
+
+## @backstage/plugin-graphql-backend@0.1.38
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.19.2
+  - @backstage/config@1.0.8
+  - @backstage/plugin-catalog-graphql@0.3.22
+
+## @backstage/plugin-graphql-voyager@0.1.6
+
+### Patch Changes
+
+- bb1e1c2b26cc: Fix typo in install instructions.
+- 12a8c94eda8d: Add package repository and homepage metadata
+- Updated dependencies
+  - @backstage/core-components@0.13.4
+  - @backstage/core-plugin-api@1.5.3
+  - @backstage/theme@0.4.1
+
+## @backstage/plugin-home@0.5.5
+
+### Patch Changes
+
+- a559ff68de7e: Now, user can provide a language (optional) as input to receive a greeting in that specific language. Example: `<WelcomeTitle language={['English', 'Spanish']} />`
+- 6743d3917a52: Make sure the widget name is never empty in the `AddWidgetDialog`. If the title was set to "", the entry would contain an empty string. Use the name as a fallback
+- Updated dependencies
+  - @backstage/plugin-home-react@0.1.2
+  - @backstage/core-components@0.13.4
+  - @backstage/plugin-catalog-react@1.8.1
+  - @backstage/core-plugin-api@1.5.3
+  - @backstage/catalog-model@1.4.1
+  - @backstage/config@1.0.8
+  - @backstage/theme@0.4.1
+
+## @backstage/plugin-home-react@0.1.2
+
+### Patch Changes
+
+- bf67dce73174: Make `title` optional when defining the `createCardExtension`
+- Updated dependencies
+  - @backstage/core-components@0.13.4
+  - @backstage/core-plugin-api@1.5.3
+
+## @backstage/plugin-ilert@0.2.10
+
+### Patch Changes
+
+- 12a8c94eda8d: Add package repository and homepage metadata
+- Updated dependencies
+  - @backstage/core-components@0.13.4
+  - @backstage/plugin-catalog-react@1.8.1
+  - @backstage/core-plugin-api@1.5.3
+  - @backstage/catalog-model@1.4.1
+  - @backstage/errors@1.2.1
+  - @backstage/theme@0.4.1
+
+## @backstage/plugin-jenkins@0.8.3
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-jenkins-common@0.1.18
+  - @backstage/core-components@0.13.4
+  - @backstage/plugin-catalog-react@1.8.1
+  - @backstage/core-plugin-api@1.5.3
+  - @backstage/catalog-model@1.4.1
+  - @backstage/errors@1.2.1
+  - @backstage/theme@0.4.1
+
+## @backstage/plugin-jenkins-backend@0.2.3
+
+### Patch Changes
+
+- 12a8c94eda8d: Add package repository and homepage metadata
+- 4b82382ed8c2: Fixed invalid configuration schema. The configuration schema may be more strict as a result.
+- Updated dependencies
+  - @backstage/backend-common@0.19.2
+  - @backstage/plugin-jenkins-common@0.1.18
+  - @backstage/plugin-auth-node@0.2.17
+  - @backstage/plugin-permission-node@0.7.11
+  - @backstage/catalog-client@1.4.3
+  - @backstage/catalog-model@1.4.1
+  - @backstage/config@1.0.8
+  - @backstage/errors@1.2.1
+  - @backstage/plugin-permission-common@0.7.7
+
+## @backstage/plugin-jenkins-common@0.1.18
+
+### Patch Changes
+
+- 12a8c94eda8d: Add package repository and homepage metadata
+- Updated dependencies
+  - @backstage/plugin-catalog-common@1.0.15
+  - @backstage/plugin-permission-common@0.7.7
+
+## @backstage/plugin-kafka@0.3.21
+
+### Patch Changes
+
+- 12a8c94eda8d: Add package repository and homepage metadata
+- Updated dependencies
+  - @backstage/core-components@0.13.4
+  - @backstage/plugin-catalog-react@1.8.1
+  - @backstage/core-plugin-api@1.5.3
+  - @backstage/catalog-model@1.4.1
+  - @backstage/config@1.0.8
+  - @backstage/theme@0.4.1
+
+## @backstage/plugin-kafka-backend@0.2.41
+
+### Patch Changes
+
+- 629cbd194a87: Use `coreServices.rootConfig` instead of `coreService.config`
+- Updated dependencies
+  - @backstage/backend-common@0.19.2
+  - @backstage/backend-plugin-api@0.6.0
+  - @backstage/catalog-model@1.4.1
+  - @backstage/config@1.0.8
+  - @backstage/errors@1.2.1
+
+## @backstage/plugin-kubernetes-backend@0.11.3
+
+### Patch Changes
+
+- 629cbd194a87: Use `coreServices.rootConfig` instead of `coreService.config`
+- bbf4e9c894b5: Fixed a bug where the proxy was not rewriting WebSocket request paths properly.
+- Updated dependencies
+  - @backstage/backend-common@0.19.2
+  - @backstage/backend-plugin-api@0.6.0
+  - @backstage/plugin-catalog-node@1.4.1
+  - @backstage/plugin-auth-node@0.2.17
+  - @backstage/plugin-permission-node@0.7.11
+  - @backstage/integration-aws-node@0.1.5
+  - @backstage/catalog-client@1.4.3
+  - @backstage/catalog-model@1.4.1
+  - @backstage/config@1.0.8
+  - @backstage/errors@1.2.1
+  - @backstage/plugin-kubernetes-common@0.6.5
+  - @backstage/plugin-permission-common@0.7.7
+
+## @backstage/plugin-lighthouse@0.4.6
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.13.4
+  - @backstage/plugin-catalog-react@1.8.1
+  - @backstage/core-plugin-api@1.5.3
+  - @backstage/catalog-model@1.4.1
+  - @backstage/config@1.0.8
+  - @backstage/theme@0.4.1
+  - @backstage/plugin-lighthouse-common@0.1.2
+
+## @backstage/plugin-lighthouse-backend@0.2.4
+
+### Patch Changes
+
+- 629cbd194a87: Use `coreServices.rootConfig` instead of `coreService.config`
+- Updated dependencies
+  - @backstage/backend-common@0.19.2
+  - @backstage/backend-plugin-api@0.6.0
+  - @backstage/plugin-catalog-node@1.4.1
+  - @backstage/backend-tasks@0.5.5
+  - @backstage/catalog-client@1.4.3
+  - @backstage/catalog-model@1.4.1
+  - @backstage/config@1.0.8
+  - @backstage/types@1.1.0
+  - @backstage/plugin-lighthouse-common@0.1.2
+
+## @backstage/plugin-linguist@0.1.6
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-linguist-common@0.1.1
+  - @backstage/core-components@0.13.4
+  - @backstage/plugin-catalog-react@1.8.1
+  - @backstage/core-plugin-api@1.5.3
+  - @backstage/catalog-model@1.4.1
+  - @backstage/errors@1.2.1
+  - @backstage/theme@0.4.1
+
+## @backstage/plugin-linguist-common@0.1.1
+
+### Patch Changes
+
+- 12a8c94eda8d: Add package repository and homepage metadata
+- d440f1dd0e72: Exported new LanguageType type alias
+
+## @backstage/plugin-microsoft-calendar@0.1.6
+
+### Patch Changes
+
+- 12a8c94eda8d: Add package repository and homepage metadata
+- eea2922e749a: README update - example of apiRef definition and fixed component name
+- Updated dependencies
+  - @backstage/core-components@0.13.4
+  - @backstage/core-plugin-api@1.5.3
+  - @backstage/errors@1.2.1
+  - @backstage/theme@0.4.1
+
+## @backstage/plugin-newrelic@0.3.39
+
+### Patch Changes
+
+- 2167b7eab09b: The newrelic plugin now supports pagination when retrieving results from newrelic. It will no longer truncate results. To see all applications, the link header will need to be allowed through the proxy (see the newrelic plugin readme).
+- Updated dependencies
+  - @backstage/core-components@0.13.4
+  - @backstage/core-plugin-api@1.5.3
+  - @backstage/theme@0.4.1
+
+## @backstage/plugin-newrelic-dashboard@0.2.14
+
+### Patch Changes
+
+- 12a8c94eda8d: Add package repository and homepage metadata
+- Updated dependencies
+  - @backstage/core-components@0.13.4
+  - @backstage/plugin-catalog-react@1.8.1
+  - @backstage/core-plugin-api@1.5.3
+  - @backstage/catalog-model@1.4.1
+  - @backstage/errors@1.2.1
+
+## @backstage/plugin-nomad@0.1.2
+
+### Patch Changes
+
+- 12a8c94eda8d: Add package repository and homepage metadata
+- Updated dependencies
+  - @backstage/core-components@0.13.4
+  - @backstage/plugin-catalog-react@1.8.1
+  - @backstage/core-plugin-api@1.5.3
+  - @backstage/catalog-model@1.4.1
+  - @backstage/config@1.0.8
+  - @backstage/theme@0.4.1
+
+## @backstage/plugin-nomad-backend@0.1.2
+
+### Patch Changes
+
+- 12a8c94eda8d: Add package repository and homepage metadata
+- Updated dependencies
+  - @backstage/backend-common@0.19.2
+  - @backstage/config@1.0.8
+  - @backstage/errors@1.2.1
+
+## @backstage/plugin-octopus-deploy@0.2.3
+
+### Patch Changes
+
+- 12a8c94eda8d: Add package repository and homepage metadata
+- Updated dependencies
+  - @backstage/core-components@0.13.4
+  - @backstage/plugin-catalog-react@1.8.1
+  - @backstage/core-plugin-api@1.5.3
+  - @backstage/catalog-model@1.4.1
+  - @backstage/theme@0.4.1
+
+## @backstage/plugin-org@0.6.11
+
+### Patch Changes
+
+- 50331203e2a2: Fixed bug in MembersListCard component where the url for the members was static which was breaking the component when catalog route was changed
+- 12a8c94eda8d: Add package repository and homepage metadata
+- Updated dependencies
+  - @backstage/core-components@0.13.4
+  - @backstage/plugin-catalog-react@1.8.1
+  - @backstage/core-plugin-api@1.5.3
+  - @backstage/catalog-model@1.4.1
+  - @backstage/theme@0.4.1
+
+## @backstage/plugin-org-react@0.1.10
+
+### Patch Changes
+
+- 12a8c94eda8d: Add package repository and homepage metadata
+- Updated dependencies
+  - @backstage/core-components@0.13.4
+  - @backstage/plugin-catalog-react@1.8.1
+  - @backstage/core-plugin-api@1.5.3
+  - @backstage/catalog-client@1.4.3
+  - @backstage/catalog-model@1.4.1
+  - @backstage/theme@0.4.1
+
+## @backstage/plugin-pagerduty@0.6.2
+
+### Patch Changes
+
+- 5003fc966741: Add new `disableChangeEvents` prop to `EntityPagerDutyCard` to hide the Change Events tab and disable fetching of change events for the PagerDuty service.
+- Updated dependencies
+  - @backstage/plugin-home-react@0.1.2
+  - @backstage/core-components@0.13.4
+  - @backstage/plugin-catalog-react@1.8.1
+  - @backstage/core-plugin-api@1.5.3
+  - @backstage/catalog-model@1.4.1
+  - @backstage/errors@1.2.1
+  - @backstage/theme@0.4.1
+
+## @backstage/plugin-periskop@0.1.19
+
+### Patch Changes
+
+- 12a8c94eda8d: Add package repository and homepage metadata
+- Updated dependencies
+  - @backstage/core-components@0.13.4
+  - @backstage/plugin-catalog-react@1.8.1
+  - @backstage/core-plugin-api@1.5.3
+  - @backstage/catalog-model@1.4.1
+  - @backstage/errors@1.2.1
+  - @backstage/theme@0.4.1
+
+## @backstage/plugin-periskop-backend@0.1.19
+
+### Patch Changes
+
+- 629cbd194a87: Use `coreServices.rootConfig` instead of `coreService.config`
+- 12a8c94eda8d: Add package repository and homepage metadata
+- Updated dependencies
+  - @backstage/backend-common@0.19.2
+  - @backstage/backend-plugin-api@0.6.0
+  - @backstage/config@1.0.8
+
+## @backstage/plugin-permission-backend@0.5.23
+
+### Patch Changes
+
+- 629cbd194a87: Use `coreServices.rootConfig` instead of `coreService.config`
+- 12a8c94eda8d: Add package repository and homepage metadata
+- 0d6ddc62d8da: Refactor backend plugin creation parameter from callback to object.
+- Updated dependencies
+  - @backstage/backend-common@0.19.2
+  - @backstage/backend-plugin-api@0.6.0
+  - @backstage/plugin-auth-node@0.2.17
+  - @backstage/plugin-permission-node@0.7.11
+  - @backstage/config@1.0.8
+  - @backstage/errors@1.2.1
+  - @backstage/plugin-permission-common@0.7.7
+
+## @backstage/plugin-permission-node@0.7.11
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.19.2
+  - @backstage/backend-plugin-api@0.6.0
+  - @backstage/plugin-auth-node@0.2.17
+  - @backstage/config@1.0.8
+  - @backstage/errors@1.2.1
+  - @backstage/plugin-permission-common@0.7.7
+
+## @backstage/plugin-playlist@0.1.13
+
+### Patch Changes
+
+- d1e0588324d1: Displaying an alert popup each time the Playlist is created or deleted
+- 12a8c94eda8d: Add package repository and homepage metadata
+- 8a997547f02a: Adding alert popup whenever user delete the entities from playlist entity table
+- Updated dependencies
+  - @backstage/plugin-playlist-common@0.1.9
+  - @backstage/core-components@0.13.4
+  - @backstage/plugin-catalog-react@1.8.1
+  - @backstage/core-plugin-api@1.5.3
+  - @backstage/plugin-search-react@1.6.4
+  - @backstage/catalog-model@1.4.1
+  - @backstage/errors@1.2.1
+  - @backstage/theme@0.4.1
+  - @backstage/plugin-catalog-common@1.0.15
+  - @backstage/plugin-permission-common@0.7.7
+  - @backstage/plugin-permission-react@0.4.14
+
+## @backstage/plugin-playlist-backend@0.3.4
+
+### Patch Changes
+
+- 12a8c94eda8d: Add package repository and homepage metadata
+- Updated dependencies
+  - @backstage/backend-common@0.19.2
+  - @backstage/plugin-playlist-common@0.1.9
+  - @backstage/plugin-auth-node@0.2.17
+  - @backstage/plugin-permission-node@0.7.11
+  - @backstage/catalog-client@1.4.3
+  - @backstage/catalog-model@1.4.1
+  - @backstage/config@1.0.8
+  - @backstage/errors@1.2.1
+  - @backstage/plugin-permission-common@0.7.7
+
+## @backstage/plugin-playlist-common@0.1.9
+
+### Patch Changes
+
+- 12a8c94eda8d: Add package repository and homepage metadata
+- Updated dependencies
+  - @backstage/plugin-permission-common@0.7.7
+
+## @backstage/plugin-puppetdb@0.1.4
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.13.4
+  - @backstage/plugin-catalog-react@1.8.1
+  - @backstage/core-plugin-api@1.5.3
+  - @backstage/catalog-model@1.4.1
+  - @backstage/errors@1.2.1
+  - @backstage/theme@0.4.1
+
+## @backstage/plugin-rollbar@0.4.21
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.13.4
+  - @backstage/plugin-catalog-react@1.8.1
+  - @backstage/core-plugin-api@1.5.3
+  - @backstage/catalog-model@1.4.1
+  - @backstage/theme@0.4.1
+
+## @backstage/plugin-rollbar-backend@0.1.45
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.19.2
+  - @backstage/config@1.0.8
+
+## @backstage/plugin-scaffolder@1.14.2
+
+### Patch Changes
+
+- 8a0490fb669e: Fix the get entities query in the `MyGroupsPicker` to query the `kind=Group` entities.
+- Updated dependencies
+  - @backstage/integration-react@1.1.16
+  - @backstage/integration@1.6.0
+  - @backstage/core-components@0.13.4
+  - @backstage/plugin-catalog-react@1.8.1
+  - @backstage/plugin-scaffolder-common@1.4.0
+  - @backstage/plugin-scaffolder-react@1.5.2
+  - @backstage/core-plugin-api@1.5.3
+  - @backstage/catalog-client@1.4.3
+  - @backstage/catalog-model@1.4.1
+  - @backstage/config@1.0.8
+  - @backstage/errors@1.2.1
+  - @backstage/theme@0.4.1
+  - @backstage/types@1.1.0
+  - @backstage/plugin-catalog-common@1.0.15
+  - @backstage/plugin-permission-react@0.4.14
+
+## @backstage/plugin-scaffolder-backend-module-confluence-to-markdown@0.2.1
+
+### Patch Changes
+
+- 0a9b3b14e904: Added example for the `confluence:transform:markdown` that will show in the installed actions list
+- 12a8c94eda8d: Add package repository and homepage metadata
+- 0d347efc8f18: Use `fetchContents` directly instead of a `fetchPlainAction`
+- c186c631b429: Import helpers from the node package instead of the backend package
+- Updated dependencies
+  - @backstage/backend-common@0.19.2
+  - @backstage/plugin-scaffolder-node@0.2.0
+  - @backstage/integration@1.6.0
+  - @backstage/config@1.0.8
+  - @backstage/errors@1.2.1
+  - @backstage/types@1.1.0
+
+## @backstage/plugin-scaffolder-backend-module-cookiecutter@0.2.24
+
+### Patch Changes
+
+- 12a8c94eda8d: Add package repository and homepage metadata
+- c186c631b429: Import helpers from the node package instead of the backend package
+- Updated dependencies
+  - @backstage/backend-common@0.19.2
+  - @backstage/plugin-scaffolder-node@0.2.0
+  - @backstage/integration@1.6.0
+  - @backstage/config@1.0.8
+  - @backstage/errors@1.2.1
+  - @backstage/types@1.1.0
+
+## @backstage/plugin-scaffolder-backend-module-gitlab@0.2.3
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-scaffolder-node@0.2.0
+  - @backstage/integration@1.6.0
+  - @backstage/config@1.0.8
+  - @backstage/errors@1.2.1
+
+## @backstage/plugin-scaffolder-backend-module-rails@0.4.17
+
+### Patch Changes
+
+- 12a8c94eda8d: Add package repository and homepage metadata
+- c186c631b429: Import helpers from the node package instead of the backend package
+- Updated dependencies
+  - @backstage/backend-common@0.19.2
+  - @backstage/plugin-scaffolder-node@0.2.0
+  - @backstage/integration@1.6.0
+  - @backstage/config@1.0.8
+  - @backstage/errors@1.2.1
+  - @backstage/types@1.1.0
+
+## @backstage/plugin-scaffolder-backend-module-sentry@0.1.8
+
+### Patch Changes
+
+- 12a8c94eda8d: Add package repository and homepage metadata
+- Updated dependencies
+  - @backstage/plugin-scaffolder-node@0.2.0
+  - @backstage/config@1.0.8
+  - @backstage/errors@1.2.1
+
+## @backstage/plugin-scaffolder-backend-module-yeoman@0.2.21
+
+### Patch Changes
+
+- 12a8c94eda8d: Add package repository and homepage metadata
+- Updated dependencies
+  - @backstage/plugin-scaffolder-node@0.2.0
+  - @backstage/config@1.0.8
+  - @backstage/types@1.1.0
+
+## @backstage/plugin-scaffolder-react@1.5.2
+
+### Patch Changes
+
+- ba9ee98a37bd: Fixed bug in Workflow component by passing a prop `templateName` down to Stepper component.
+- Updated dependencies
+  - @backstage/core-components@0.13.4
+  - @backstage/plugin-catalog-react@1.8.1
+  - @backstage/plugin-scaffolder-common@1.4.0
+  - @backstage/core-plugin-api@1.5.3
+  - @backstage/catalog-client@1.4.3
+  - @backstage/catalog-model@1.4.1
+  - @backstage/errors@1.2.1
+  - @backstage/theme@0.4.1
+  - @backstage/types@1.1.0
+  - @backstage/version-bridge@1.0.4
+
+## @backstage/plugin-search@1.3.4
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.13.4
+  - @backstage/plugin-catalog-react@1.8.1
+  - @backstage/core-plugin-api@1.5.3
+  - @backstage/plugin-search-react@1.6.4
+  - @backstage/catalog-model@1.4.1
+  - @backstage/config@1.0.8
+  - @backstage/errors@1.2.1
+  - @backstage/theme@0.4.1
+  - @backstage/types@1.1.0
+  - @backstage/version-bridge@1.0.4
+  - @backstage/plugin-search-common@1.2.5
+
+## @backstage/plugin-search-backend-module-catalog@0.1.4
+
+### Patch Changes
+
+- 629cbd194a87: Use `coreServices.rootConfig` instead of `coreService.config`
+- 29f77f923c71: Ensure that all services are dependency injected into the module instead of taken from options
+- 12a8c94eda8d: Add package repository and homepage metadata
+- ec1032129e47: Breaking change in the alpha export `searchModuleCatalogCollator`: Moved collator settings from module options into app-config. You are now expected to set up the catalog collator under the `search.collators.catalog` configuration key. There is also a new `catalogCollatorExtensionPoint` extension point for the module, wherein you can set custom transformers.
+- d4f19a16bd52: Add User Entity email to the search index so that users can be found by their email.
+- Updated dependencies
+  - @backstage/backend-common@0.19.2
+  - @backstage/backend-plugin-api@0.6.0
+  - @backstage/plugin-search-backend-node@1.2.4
+  - @backstage/plugin-catalog-node@1.4.1
+  - @backstage/backend-tasks@0.5.5
+  - @backstage/catalog-client@1.4.3
+  - @backstage/catalog-model@1.4.1
+  - @backstage/config@1.0.8
+  - @backstage/errors@1.2.1
+  - @backstage/plugin-catalog-common@1.0.15
+  - @backstage/plugin-permission-common@0.7.7
+  - @backstage/plugin-search-common@1.2.5
+
+## @backstage/plugin-search-backend-module-elasticsearch@1.3.3
+
+### Patch Changes
+
+- 629cbd194a87: Use `coreServices.rootConfig` instead of `coreService.config`
+
+- 12a8c94eda8d: Add package repository and homepage metadata
+
+- 631eb3816b48: Index templates can now be configured through configuration under the `search.elasticsearch.indexTemplates`. In addition, the `ElasticSearchSearchEngine.fromConfig` now also accepts a `LoggerService` as the `logger` option as well as a new `translator` option.
+
+  The alpha `searchModuleElasticsearchEngine` export no longer accepts options and a new alpha `elasticsearchTranslatorExtensionPoint` export has been added which lets you customize the query translator.
+
+- Updated dependencies
+  - @backstage/backend-common@0.19.2
+  - @backstage/backend-plugin-api@0.6.0
+  - @backstage/plugin-search-backend-node@1.2.4
+  - @backstage/integration-aws-node@0.1.5
+  - @backstage/config@1.0.8
+  - @backstage/plugin-search-common@1.2.5
+
+## @backstage/plugin-search-backend-module-explore@0.1.4
+
+### Patch Changes
+
+- 629cbd194a87: Use `coreServices.rootConfig` instead of `coreService.config`
+- 29f77f923c71: Ensure that all services are dependency injected into the module instead of taken from options
+- 12a8c94eda8d: Add package repository and homepage metadata
+- 6694e79ab396: Breaking change for the alpha export moved `schedule` from module options into app-config for the new backend system. You can now pass in a `TaskScheduleDefinitionConfig` through the `search.collators.explore.schedule` configuration key.
+- Updated dependencies
+  - @backstage/backend-common@0.19.2
+  - @backstage/backend-plugin-api@0.6.0
+  - @backstage/plugin-search-backend-node@1.2.4
+  - @backstage/backend-tasks@0.5.5
+  - @backstage/config@1.0.8
+  - @backstage/plugin-explore-common@0.0.1
+  - @backstage/plugin-search-common@1.2.5
+
+## @backstage/plugin-search-backend-module-pg@0.5.9
+
+### Patch Changes
+
+- 629cbd194a87: Use `coreServices.rootConfig` instead of `coreService.config`
+- 12a8c94eda8d: Add package repository and homepage metadata
+- Updated dependencies
+  - @backstage/backend-common@0.19.2
+  - @backstage/backend-plugin-api@0.6.0
+  - @backstage/plugin-search-backend-node@1.2.4
+  - @backstage/config@1.0.8
+  - @backstage/plugin-search-common@1.2.5
+
+## @backstage/plugin-search-backend-module-techdocs@0.1.4
+
+### Patch Changes
+
+- 629cbd194a87: Use `coreServices.rootConfig` instead of `coreService.config`
+- 29f77f923c71: Ensure that all services are dependency injected into the module instead of taken from options
+- 12a8c94eda8d: Add package repository and homepage metadata
+- 6694e79ab396: **BREAKING:** Moved `schedule` & `collators` settings from module options into app-config for the new backend system. You can now pass in a `TaskScheduleDefinitionConfig` through the `search.collators.techdocs.schedule` configuration key & configure the `TechDocsCollatorFactory` with the key `search.collators.techdocs`.
+- Updated dependencies
+  - @backstage/backend-common@0.19.2
+  - @backstage/backend-plugin-api@0.6.0
+  - @backstage/plugin-search-backend-node@1.2.4
+  - @backstage/plugin-catalog-node@1.4.1
+  - @backstage/backend-tasks@0.5.5
+  - @backstage/plugin-techdocs-node@1.7.4
+  - @backstage/catalog-client@1.4.3
+  - @backstage/catalog-model@1.4.1
+  - @backstage/config@1.0.8
+  - @backstage/plugin-catalog-common@1.0.15
+  - @backstage/plugin-permission-common@0.7.7
+  - @backstage/plugin-search-common@1.2.5
+
+## @backstage/plugin-search-backend-node@1.2.4
+
+### Patch Changes
+
+- 12a8c94eda8d: Add package repository and homepage metadata
+- e3e9bc10298b: Fix Lunr search engine highlight by ignoring invalid metadata positions.
+- Updated dependencies
+  - @backstage/backend-common@0.19.2
+  - @backstage/backend-plugin-api@0.6.0
+  - @backstage/backend-tasks@0.5.5
+  - @backstage/config@1.0.8
+  - @backstage/errors@1.2.1
+  - @backstage/plugin-permission-common@0.7.7
+  - @backstage/plugin-search-common@1.2.5
+
+## @backstage/plugin-search-react@1.6.4
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.13.4
+  - @backstage/core-plugin-api@1.5.3
+  - @backstage/theme@0.4.1
+  - @backstage/types@1.1.0
+  - @backstage/version-bridge@1.0.4
+  - @backstage/plugin-search-common@1.2.5
+
+## @backstage/plugin-sentry@0.5.6
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.13.4
+  - @backstage/plugin-catalog-react@1.8.1
+  - @backstage/core-plugin-api@1.5.3
+  - @backstage/catalog-model@1.4.1
+  - @backstage/theme@0.4.1
+
+## @backstage/plugin-shortcuts@0.3.13
+
+### Patch Changes
+
+- 12a8c94eda8d: Add package repository and homepage metadata
+- ee52a48b63d5: Limit the use of the duplicate shortcut name when adding a shortcut
+- Updated dependencies
+  - @backstage/core-components@0.13.4
+  - @backstage/core-plugin-api@1.5.3
+  - @backstage/theme@0.4.1
+  - @backstage/types@1.1.0
+
+## @backstage/plugin-sonarqube@0.7.2
+
+### Patch Changes
+
+- b2ccddefbdc6: Remove sonarQube card disable class
+- Updated dependencies
+  - @backstage/core-components@0.13.4
+  - @backstage/plugin-catalog-react@1.8.1
+  - @backstage/core-plugin-api@1.5.3
+  - @backstage/catalog-model@1.4.1
+  - @backstage/theme@0.4.1
+  - @backstage/plugin-sonarqube-react@0.1.7
+
+## @backstage/plugin-sonarqube-backend@0.2.2
+
+### Patch Changes
+
+- 12a8c94eda8d: Add package repository and homepage metadata
+- a24d9df8757c: Added optional `externalBaseUrl` config for setting a different frontend URL
+- Updated dependencies
+  - @backstage/backend-common@0.19.2
+  - @backstage/config@1.0.8
+  - @backstage/errors@1.2.1
+
+## @backstage/plugin-splunk-on-call@0.4.10
+
+### Patch Changes
+
+- 3d86be999fdf: Prefer simple `theme.spacing` without string interpolation
+- Updated dependencies
+  - @backstage/core-components@0.13.4
+  - @backstage/plugin-catalog-react@1.8.1
+  - @backstage/core-plugin-api@1.5.3
+  - @backstage/catalog-model@1.4.1
+  - @backstage/theme@0.4.1
+
+## @backstage/plugin-stack-overflow@0.1.19
+
+### Patch Changes
+
+- 12a8c94eda8d: Add package repository and homepage metadata
+- Updated dependencies
+  - @backstage/plugin-home-react@0.1.2
+  - @backstage/core-components@0.13.4
+  - @backstage/core-plugin-api@1.5.3
+  - @backstage/plugin-search-react@1.6.4
+  - @backstage/config@1.0.8
+  - @backstage/theme@0.4.1
+  - @backstage/plugin-search-common@1.2.5
+
+## @backstage/plugin-stack-overflow-backend@0.2.4
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.19.2
+  - @backstage/config@1.0.8
+  - @backstage/plugin-search-common@1.2.5
+
+## @backstage/plugin-stackstorm@0.1.5
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.13.4
+  - @backstage/core-plugin-api@1.5.3
+  - @backstage/errors@1.2.1
+  - @backstage/theme@0.4.1
+
+## @backstage/plugin-tech-insights@0.3.13
+
+### Patch Changes
+
+- 12a8c94eda8d: Add package repository and homepage metadata
+- Updated dependencies
+  - @backstage/core-components@0.13.4
+  - @backstage/plugin-catalog-react@1.8.1
+  - @backstage/core-plugin-api@1.5.3
+  - @backstage/catalog-model@1.4.1
+  - @backstage/errors@1.2.1
+  - @backstage/theme@0.4.1
+  - @backstage/types@1.1.0
+  - @backstage/plugin-tech-insights-common@0.2.11
+
+## @backstage/plugin-tech-insights-backend@0.5.14
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.19.2
+  - @backstage/backend-tasks@0.5.5
+  - @backstage/plugin-tech-insights-node@0.4.6
+  - @backstage/catalog-client@1.4.3
+  - @backstage/catalog-model@1.4.1
+  - @backstage/config@1.0.8
+  - @backstage/errors@1.2.1
+  - @backstage/types@1.1.0
+  - @backstage/plugin-tech-insights-common@0.2.11
+
+## @backstage/plugin-tech-insights-backend-module-jsonfc@0.1.32
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.19.2
+  - @backstage/plugin-tech-insights-node@0.4.6
+  - @backstage/config@1.0.8
+  - @backstage/errors@1.2.1
+  - @backstage/plugin-tech-insights-common@0.2.11
+
+## @backstage/plugin-tech-insights-node@0.4.6
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.19.2
+  - @backstage/backend-tasks@0.5.5
+  - @backstage/config@1.0.8
+  - @backstage/types@1.1.0
+  - @backstage/plugin-tech-insights-common@0.2.11
+
+## @backstage/plugin-tech-radar@0.6.7
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.13.4
+  - @backstage/core-plugin-api@1.5.3
+  - @backstage/theme@0.4.1
+
+## @backstage/plugin-techdocs@1.6.6
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/integration-react@1.1.16
+  - @backstage/integration@1.6.0
+  - @backstage/core-components@0.13.4
+  - @backstage/plugin-catalog-react@1.8.1
+  - @backstage/core-plugin-api@1.5.3
+  - @backstage/plugin-search-react@1.6.4
+  - @backstage/catalog-model@1.4.1
+  - @backstage/config@1.0.8
+  - @backstage/errors@1.2.1
+  - @backstage/theme@0.4.1
+  - @backstage/plugin-search-common@1.2.5
+  - @backstage/plugin-techdocs-react@1.1.9
+
+## @backstage/plugin-techdocs-addons-test-utils@1.0.17
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-app-api@1.9.1
+  - @backstage/integration-react@1.1.16
+  - @backstage/core-components@0.13.4
+  - @backstage/plugin-catalog@1.12.1
+  - @backstage/core-plugin-api@1.5.3
+  - @backstage/test-utils@1.4.2
+  - @backstage/plugin-search-react@1.6.4
+  - @backstage/plugin-techdocs@1.6.6
+  - @backstage/theme@0.4.1
+  - @backstage/plugin-techdocs-react@1.1.9
+
+## @backstage/plugin-techdocs-backend@1.6.5
+
+### Patch Changes
+
+- 629cbd194a87: Use `coreServices.rootConfig` instead of `coreService.config`
+- Updated dependencies
+  - @backstage/plugin-search-backend-module-techdocs@0.1.4
+  - @backstage/backend-common@0.19.2
+  - @backstage/backend-plugin-api@0.6.0
+  - @backstage/integration@1.6.0
+  - @backstage/plugin-techdocs-node@1.7.4
+  - @backstage/catalog-client@1.4.3
+  - @backstage/catalog-model@1.4.1
+  - @backstage/config@1.0.8
+  - @backstage/errors@1.2.1
+  - @backstage/plugin-catalog-common@1.0.15
+  - @backstage/plugin-permission-common@0.7.7
+  - @backstage/plugin-search-common@1.2.5
+
+## @backstage/plugin-techdocs-module-addons-contrib@1.0.16
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/integration-react@1.1.16
+  - @backstage/integration@1.6.0
+  - @backstage/core-components@0.13.4
+  - @backstage/core-plugin-api@1.5.3
+  - @backstage/theme@0.4.1
+  - @backstage/plugin-techdocs-react@1.1.9
+
+## @backstage/plugin-techdocs-node@1.7.4
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.19.2
+  - @backstage/integration@1.6.0
+  - @backstage/integration-aws-node@0.1.5
+  - @backstage/catalog-model@1.4.1
+  - @backstage/config@1.0.8
+  - @backstage/errors@1.2.1
+  - @backstage/plugin-search-common@1.2.5
+
+## @backstage/plugin-techdocs-react@1.1.9
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.13.4
+  - @backstage/core-plugin-api@1.5.3
+  - @backstage/catalog-model@1.4.1
+  - @backstage/config@1.0.8
+  - @backstage/version-bridge@1.0.4
+
+## @backstage/plugin-todo@0.2.23
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.13.4
+  - @backstage/plugin-catalog-react@1.8.1
+  - @backstage/core-plugin-api@1.5.3
+  - @backstage/catalog-model@1.4.1
+  - @backstage/errors@1.2.1
+  - @backstage/theme@0.4.1
+
+## @backstage/plugin-user-settings@0.7.6
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-app-api@1.9.1
+  - @backstage/core-components@0.13.4
+  - @backstage/plugin-catalog-react@1.8.1
+  - @backstage/core-plugin-api@1.5.3
+  - @backstage/errors@1.2.1
+  - @backstage/theme@0.4.1
+  - @backstage/types@1.1.0
+
+## @backstage/plugin-user-settings-backend@0.1.12
+
+### Patch Changes
+
+- 12a8c94eda8d: Add package repository and homepage metadata
+- Updated dependencies
+  - @backstage/backend-common@0.19.2
+  - @backstage/backend-plugin-api@0.6.0
+  - @backstage/plugin-auth-node@0.2.17
+  - @backstage/catalog-model@1.4.1
+  - @backstage/errors@1.2.1
+  - @backstage/types@1.1.0
+
+## @backstage/plugin-vault@0.1.15
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.13.4
+  - @backstage/plugin-catalog-react@1.8.1
+  - @backstage/core-plugin-api@1.5.3
+  - @backstage/catalog-model@1.4.1
+  - @backstage/errors@1.2.1
+  - @backstage/theme@0.4.1
+
+## @backstage/plugin-vault-backend@0.3.4
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.19.2
+  - @backstage/backend-tasks@0.5.5
+  - @backstage/config@1.0.8
+  - @backstage/errors@1.2.1
+
+## @backstage/plugin-xcmetrics@0.2.41
+
+### Patch Changes
+
+- 12a8c94eda8d: Add package repository and homepage metadata
+- 3d86be999fdf: Prefer simple `theme.spacing` without string interpolation
+- Updated dependencies
+  - @backstage/core-components@0.13.4
+  - @backstage/core-plugin-api@1.5.3
+  - @backstage/errors@1.2.1
+  - @backstage/theme@0.4.1
+
+## example-app@0.2.86
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-app-api@1.9.1
+  - @backstage/plugin-catalog-graph@0.2.33
+  - @backstage/plugin-playlist@0.1.13
+  - @backstage/plugin-pagerduty@0.6.2
+  - @backstage/plugin-scaffolder@1.14.2
+  - @backstage/plugin-explore@0.4.7
+  - @backstage/plugin-org@0.6.11
+  - @backstage/integration-react@1.1.16
+  - @backstage/plugin-microsoft-calendar@0.1.6
+  - @backstage/plugin-newrelic-dashboard@0.2.14
+  - @backstage/plugin-entity-feedback@0.2.4
+  - @backstage/plugin-linguist-common@0.1.1
+  - @backstage/plugin-apache-airflow@0.2.14
+  - @backstage/plugin-octopus-deploy@0.2.3
+  - @backstage/plugin-stack-overflow@0.1.19
+  - @backstage/plugin-code-coverage@0.2.14
+  - @backstage/plugin-tech-insights@0.3.13
+  - @backstage/plugin-dynatrace@7.0.1
+  - @backstage/plugin-gcalendar@0.3.17
+  - @backstage/plugin-shortcuts@0.3.13
+  - @backstage/plugin-airbrake@0.3.21
+  - @backstage/plugin-kafka@0.3.21
+  - @backstage/plugin-nomad@0.1.2
+  - @backstage/plugin-adr@0.6.4
+  - @backstage/plugin-newrelic@0.3.39
+  - @backstage/cli@0.22.10
+  - @backstage/plugin-kubernetes@0.10.0
+  - @backstage/core-components@0.13.4
+  - @backstage/plugin-home@0.5.5
+  - @backstage/plugin-catalog-react@1.8.1
+  - @backstage/plugin-scaffolder-react@1.5.2
+  - @backstage/plugin-devtools@0.1.3
+  - @backstage/app-defaults@1.4.2
+  - @backstage/core-plugin-api@1.5.3
+  - @backstage/plugin-api-docs@0.9.7
+  - @backstage/plugin-azure-devops@0.3.3
+  - @backstage/plugin-azure-sites@0.1.10
+  - @backstage/plugin-badges@0.2.45
+  - @backstage/plugin-catalog-import@0.9.11
+  - @backstage/plugin-catalog-unprocessed-entities@0.1.2
+  - @backstage/plugin-circleci@0.3.21
+  - @backstage/plugin-cloudbuild@0.3.21
+  - @backstage/plugin-cost-insights@0.12.10
+  - @backstage/plugin-gcp-projects@0.3.40
+  - @backstage/plugin-github-actions@0.6.2
+  - @backstage/plugin-gocd@0.1.27
+  - @backstage/plugin-graphiql@0.2.53
+  - @backstage/plugin-jenkins@0.8.3
+  - @backstage/plugin-lighthouse@0.4.6
+  - @backstage/plugin-linguist@0.1.6
+  - @backstage/plugin-puppetdb@0.1.4
+  - @backstage/plugin-rollbar@0.4.21
+  - @backstage/plugin-search@1.3.4
+  - @backstage/plugin-search-react@1.6.4
+  - @backstage/plugin-sentry@0.5.6
+  - @backstage/plugin-stackstorm@0.1.5
+  - @backstage/plugin-tech-radar@0.6.7
+  - @backstage/plugin-techdocs@1.6.6
+  - @backstage/plugin-techdocs-module-addons-contrib@1.0.16
+  - @backstage/plugin-todo@0.2.23
+  - @backstage/plugin-user-settings@0.7.6
+  - @backstage/catalog-model@1.4.1
+  - @backstage/config@1.0.8
+  - @backstage/theme@0.4.1
+  - @backstage/plugin-catalog-common@1.0.15
+  - @backstage/plugin-permission-react@0.4.14
+  - @backstage/plugin-search-common@1.2.5
+  - @backstage/plugin-techdocs-react@1.1.9
+  - @internal/plugin-catalog-customized@0.0.13
+
+## example-backend@0.2.86
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-search-backend-module-elasticsearch@1.3.3
+  - @backstage/plugin-search-backend-module-pg@0.5.9
+  - @backstage/plugin-azure-devops-backend@0.3.27
+  - @backstage/plugin-kubernetes-backend@0.11.3
+  - @backstage/plugin-lighthouse-backend@0.2.4
+  - @backstage/plugin-permission-backend@0.5.23
+  - @backstage/plugin-scaffolder-backend@1.16.0
+  - @backstage/plugin-devtools-backend@0.1.3
+  - @backstage/plugin-techdocs-backend@1.6.5
+  - @backstage/backend-common@0.19.2
+  - @backstage/plugin-catalog-backend@1.12.0
+  - @backstage/plugin-badges-backend@0.2.3
+  - @backstage/plugin-events-backend@0.2.9
+  - @backstage/plugin-search-backend@1.4.0
+  - @backstage/plugin-kafka-backend@0.2.41
+  - @backstage/plugin-proxy-backend@0.3.0
+  - @backstage/plugin-todo-backend@0.2.0
+  - @backstage/plugin-app-backend@0.3.48
+  - @backstage/plugin-scaffolder-backend-module-confluence-to-markdown@0.2.1
+  - @backstage/plugin-auth-backend@0.18.6
+  - @backstage/plugin-explore-backend@0.0.10
+  - @backstage/plugin-catalog-backend-module-unprocessed@0.2.0
+  - @backstage/plugin-scaffolder-backend-module-rails@0.4.17
+  - @backstage/plugin-entity-feedback-backend@0.1.6
+  - @backstage/plugin-code-coverage-backend@0.2.14
+  - @backstage/plugin-search-backend-node@1.2.4
+  - @backstage/plugin-linguist-backend@0.4.0
+  - @backstage/plugin-playlist-backend@0.3.4
+  - @backstage/plugin-jenkins-backend@0.2.3
+  - @backstage/plugin-nomad-backend@0.1.2
+  - @backstage/plugin-catalog-node@1.4.1
+  - @backstage/plugin-events-node@0.2.9
+  - @backstage/plugin-auth-node@0.2.17
+  - @backstage/integration@1.6.0
+  - @backstage/backend-tasks@0.5.5
+  - example-app@0.2.86
+  - @backstage/plugin-adr-backend@0.3.6
+  - @backstage/plugin-azure-sites-backend@0.1.10
+  - @backstage/plugin-graphql-backend@0.1.38
+  - @backstage/plugin-permission-node@0.7.11
+  - @backstage/plugin-rollbar-backend@0.1.45
+  - @backstage/plugin-tech-insights-backend@0.5.14
+  - @backstage/plugin-tech-insights-backend-module-jsonfc@0.1.32
+  - @backstage/plugin-tech-insights-node@0.4.6
+  - @backstage/catalog-client@1.4.3
+  - @backstage/catalog-model@1.4.1
+  - @backstage/config@1.0.8
+  - @backstage/plugin-permission-common@0.7.7
+  - @backstage/plugin-search-common@1.2.5
+
+## example-backend-next@0.0.14
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-search-backend-module-techdocs@0.1.4
+  - @backstage/plugin-search-backend-module-catalog@0.1.4
+  - @backstage/plugin-search-backend-module-explore@0.1.4
+  - @backstage/plugin-azure-devops-backend@0.3.27
+  - @backstage/plugin-kubernetes-backend@0.11.3
+  - @backstage/plugin-lighthouse-backend@0.2.4
+  - @backstage/plugin-permission-backend@0.5.23
+  - @backstage/plugin-scaffolder-backend@1.16.0
+  - @backstage/backend-defaults@0.2.0
+  - @backstage/plugin-devtools-backend@0.1.3
+  - @backstage/plugin-techdocs-backend@1.6.5
+  - @backstage/plugin-catalog-backend@1.12.0
+  - @backstage/plugin-badges-backend@0.2.3
+  - @backstage/plugin-search-backend@1.4.0
+  - @backstage/plugin-proxy-backend@0.3.0
+  - @backstage/plugin-todo-backend@0.2.0
+  - @backstage/plugin-app-backend@0.3.48
+  - @backstage/backend-plugin-api@0.6.0
+  - @backstage/plugin-catalog-backend-module-unprocessed@0.2.0
+  - @backstage/plugin-entity-feedback-backend@0.1.6
+  - @backstage/plugin-search-backend-node@1.2.4
+  - @backstage/plugin-linguist-backend@0.4.0
+  - @backstage/plugin-auth-node@0.2.17
+  - @backstage/backend-tasks@0.5.5
+  - @backstage/plugin-adr-backend@0.3.6
+  - @backstage/plugin-permission-node@0.7.11
+  - @backstage/plugin-permission-common@0.7.7
+
+## e2e-test@0.2.6
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/create-app@0.5.4
+  - @backstage/cli-common@0.1.12
+  - @backstage/errors@1.2.1
+
+## techdocs-cli-embedded-app@0.2.85
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-app-api@1.9.1
+  - @backstage/integration-react@1.1.16
+  - @backstage/cli@0.22.10
+  - @backstage/core-components@0.13.4
+  - @backstage/plugin-catalog@1.12.1
+  - @backstage/app-defaults@1.4.2
+  - @backstage/core-plugin-api@1.5.3
+  - @backstage/test-utils@1.4.2
+  - @backstage/plugin-techdocs@1.6.6
+  - @backstage/catalog-model@1.4.1
+  - @backstage/config@1.0.8
+  - @backstage/theme@0.4.1
+  - @backstage/plugin-techdocs-react@1.1.9
+
+## @internal/plugin-catalog-customized@0.0.13
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog@1.12.1
+  - @backstage/plugin-catalog-react@1.8.1
+
+## @internal/plugin-todo-list@1.0.16
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.13.4
+  - @backstage/core-plugin-api@1.5.3
+  - @backstage/theme@0.4.1
+
+## @internal/plugin-todo-list-backend@1.0.16
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.19.2
+  - @backstage/backend-plugin-api@0.6.0
+  - @backstage/plugin-auth-node@0.2.17
+  - @backstage/config@1.0.8
+  - @backstage/errors@1.2.1
diff --git a/docs/releases/v1.17.0-next.2-changelog.md b/docs/releases/v1.17.0-next.2-changelog.md
new file mode 100644
index 0000000000..d1da6fa2be
--- /dev/null
+++ b/docs/releases/v1.17.0-next.2-changelog.md
@@ -0,0 +1,1430 @@
+# Release v1.17.0-next.2
+
+## @backstage/plugin-app-node@0.1.0-next.0
+
+### Minor Changes
+
+- 9fbe95ef6503: Added the `app` plugin node library, initially providing an extension point that can be used to configure a static fallback handler.
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@0.6.0-next.2
+
+## @backstage/plugin-catalog-backend@1.12.0-next.2
+
+### Minor Changes
+
+- b8cccd8ee858: Support configuring applicable kinds for `AnnotateScmSlugEntityProcessor`
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-search-backend-module-catalog@0.1.4-next.2
+  - @backstage/backend-plugin-api@0.6.0-next.2
+  - @backstage/backend-tasks@0.5.5-next.2
+  - @backstage/backend-common@0.19.2-next.2
+  - @backstage/plugin-catalog-node@1.4.1-next.2
+  - @backstage/plugin-events-node@0.2.9-next.2
+  - @backstage/plugin-permission-node@0.7.11-next.2
+  - @backstage/plugin-auth-node@0.2.17-next.2
+
+## @backstage/plugin-linguist-backend@0.4.0-next.2
+
+### Minor Changes
+
+- d440f1dd0e72: Adds a processor to the linguist backend which can automatically add language tags to entities
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-linguist-common@0.1.1-next.1
+  - @backstage/backend-plugin-api@0.6.0-next.2
+  - @backstage/backend-tasks@0.5.5-next.2
+  - @backstage/backend-common@0.19.2-next.2
+  - @backstage/plugin-catalog-node@1.4.1-next.2
+  - @backstage/plugin-auth-node@0.2.17-next.2
+
+## @backstage/plugin-proxy-backend@0.3.0-next.2
+
+### Minor Changes
+
+- 7daf65bfcfa1: Defining proxy endpoints directly under the root `proxy` configuration key is deprecated. Endpoints should now be declared under `proxy.endpoints` instead. The `skipInvalidProxies` and `reviveConsumedRequestBodies` can now also be configured through static configuration.
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@0.6.0-next.2
+  - @backstage/backend-common@0.19.2-next.2
+
+## @backstage/backend-app-api@0.5.0-next.2
+
+### Patch Changes
+
+- e65c4896f755: Do not throw in backend.stop, if start failed
+- cc9256a33bcc: Added new experimental `featureDiscoveryServiceFactory`, available as an `/alpha` export.
+- Updated dependencies
+  - @backstage/backend-plugin-api@0.6.0-next.2
+  - @backstage/backend-tasks@0.5.5-next.2
+  - @backstage/backend-common@0.19.2-next.2
+  - @backstage/plugin-permission-node@0.7.11-next.2
+  - @backstage/plugin-auth-node@0.2.17-next.2
+  - @backstage/config-loader@1.4.0-next.1
+
+## @backstage/backend-common@0.19.2-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-app-api@0.5.0-next.2
+  - @backstage/backend-plugin-api@0.6.0-next.2
+  - @backstage/config-loader@1.4.0-next.1
+
+## @backstage/backend-defaults@0.2.0-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-app-api@0.5.0-next.2
+  - @backstage/backend-plugin-api@0.6.0-next.2
+  - @backstage/backend-common@0.19.2-next.2
+
+## @backstage/backend-plugin-api@0.6.0-next.2
+
+### Patch Changes
+
+- cc9256a33bcc: Added new experimental `featureDiscoveryServiceRef`, available as an `/alpha` export.
+- Updated dependencies
+  - @backstage/backend-tasks@0.5.5-next.2
+  - @backstage/plugin-auth-node@0.2.17-next.2
+
+## @backstage/backend-tasks@0.5.5-next.2
+
+### Patch Changes
+
+- dfd1b6b2fc33: Make `readTaskScheduleDefinitionFromConfig` properly handle bad inputs
+- Updated dependencies
+  - @backstage/backend-common@0.19.2-next.2
+
+## @backstage/backend-test-utils@0.2.0-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-app-api@0.5.0-next.2
+  - @backstage/backend-plugin-api@0.6.0-next.2
+  - @backstage/backend-common@0.19.2-next.2
+  - @backstage/plugin-auth-node@0.2.17-next.2
+
+## @backstage/create-app@0.5.4-next.2
+
+### Patch Changes
+
+- Bumped create-app version.
+
+## @backstage/dev-utils@1.0.18-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.8.1-next.1
+  - @backstage/integration-react@1.1.16-next.1
+
+## @techdocs/cli@1.4.5-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.19.2-next.2
+  - @backstage/plugin-techdocs-node@1.7.4-next.2
+
+## @backstage/plugin-adr@0.6.4-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.8.1-next.1
+  - @backstage/integration-react@1.1.16-next.1
+
+## @backstage/plugin-adr-backend@0.3.6-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@0.6.0-next.2
+  - @backstage/backend-common@0.19.2-next.2
+
+## @backstage/plugin-airbrake@0.3.21-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.8.1-next.1
+  - @backstage/dev-utils@1.0.18-next.2
+
+## @backstage/plugin-airbrake-backend@0.2.21-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@0.6.0-next.2
+  - @backstage/backend-common@0.19.2-next.2
+
+## @backstage/plugin-allure@0.1.37-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.8.1-next.1
+
+## @backstage/plugin-api-docs@0.9.7-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.8.1-next.1
+  - @backstage/plugin-catalog@1.12.1-next.2
+
+## @backstage/plugin-app-backend@0.3.48-next.2
+
+### Patch Changes
+
+- d564ad142b17: Migrated the alpha `appBackend` export to use static configuration and extension points rather than accepting options.
+- Updated dependencies
+  - @backstage/plugin-app-node@0.1.0-next.0
+  - @backstage/backend-plugin-api@0.6.0-next.2
+  - @backstage/backend-common@0.19.2-next.2
+  - @backstage/config-loader@1.4.0-next.1
+
+## @backstage/plugin-auth-backend@0.18.6-next.2
+
+### Patch Changes
+
+- 16452cd007ae: Updated `frameHandler` to return `undefined` when using the redirect flow instead of returning `postMessageReponse` which was causing errors
+- bb70a9c3886a: Add frontend visibility to provider objects in `auth` config.
+- Updated dependencies
+  - @backstage/backend-common@0.19.2-next.2
+  - @backstage/plugin-auth-node@0.2.17-next.2
+
+## @backstage/plugin-auth-node@0.2.17-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.19.2-next.2
+
+## @backstage/plugin-azure-devops@0.3.3-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.8.1-next.1
+
+## @backstage/plugin-azure-devops-backend@0.3.27-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@0.6.0-next.2
+  - @backstage/backend-common@0.19.2-next.2
+
+## @backstage/plugin-azure-sites@0.1.10-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.8.1-next.1
+
+## @backstage/plugin-azure-sites-backend@0.1.10-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.19.2-next.2
+
+## @backstage/plugin-badges@0.2.45-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.8.1-next.1
+
+## @backstage/plugin-badges-backend@0.2.3-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@0.6.0-next.2
+  - @backstage/backend-common@0.19.2-next.2
+  - @backstage/plugin-auth-node@0.2.17-next.2
+
+## @backstage/plugin-bazaar@0.2.12-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.8.1-next.1
+  - @backstage/plugin-catalog@1.12.1-next.2
+  - @backstage/cli@0.22.10-next.1
+
+## @backstage/plugin-bazaar-backend@0.2.11-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@0.6.0-next.2
+  - @backstage/backend-common@0.19.2-next.2
+  - @backstage/plugin-auth-node@0.2.17-next.2
+
+## @backstage/plugin-bitrise@0.1.48-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.8.1-next.1
+
+## @backstage/plugin-catalog@1.12.1-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.8.1-next.1
+  - @backstage/integration-react@1.1.16-next.1
+
+## @backstage/plugin-catalog-backend-module-aws@0.2.3-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@0.6.0-next.2
+  - @backstage/backend-tasks@0.5.5-next.2
+  - @backstage/backend-common@0.19.2-next.2
+  - @backstage/plugin-catalog-node@1.4.1-next.2
+
+## @backstage/plugin-catalog-backend-module-azure@0.1.19-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@0.6.0-next.2
+  - @backstage/backend-tasks@0.5.5-next.2
+  - @backstage/backend-common@0.19.2-next.2
+  - @backstage/plugin-catalog-node@1.4.1-next.2
+
+## @backstage/plugin-catalog-backend-module-bitbucket@0.2.15-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.19.2-next.2
+  - @backstage/plugin-catalog-node@1.4.1-next.2
+
+## @backstage/plugin-catalog-backend-module-bitbucket-cloud@0.1.15-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@0.6.0-next.2
+  - @backstage/backend-tasks@0.5.5-next.2
+  - @backstage/backend-common@0.19.2-next.2
+  - @backstage/plugin-catalog-node@1.4.1-next.2
+  - @backstage/plugin-events-node@0.2.9-next.2
+
+## @backstage/plugin-catalog-backend-module-bitbucket-server@0.1.13-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@0.6.0-next.2
+  - @backstage/backend-tasks@0.5.5-next.2
+  - @backstage/backend-common@0.19.2-next.2
+  - @backstage/plugin-catalog-node@1.4.1-next.2
+
+## @backstage/plugin-catalog-backend-module-gcp@0.1.0-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@0.6.0-next.2
+  - @backstage/backend-tasks@0.5.5-next.2
+  - @backstage/backend-common@0.19.2-next.2
+  - @backstage/plugin-catalog-node@1.4.1-next.2
+
+## @backstage/plugin-catalog-backend-module-gerrit@0.1.16-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@0.6.0-next.2
+  - @backstage/backend-tasks@0.5.5-next.2
+  - @backstage/backend-common@0.19.2-next.2
+  - @backstage/plugin-catalog-node@1.4.1-next.2
+
+## @backstage/plugin-catalog-backend-module-github@0.3.3-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-backend@1.12.0-next.2
+  - @backstage/backend-plugin-api@0.6.0-next.2
+  - @backstage/backend-tasks@0.5.5-next.2
+  - @backstage/backend-common@0.19.2-next.2
+  - @backstage/plugin-catalog-node@1.4.1-next.2
+  - @backstage/plugin-events-node@0.2.9-next.2
+
+## @backstage/plugin-catalog-backend-module-gitlab@0.2.4-next.2
+
+### Patch Changes
+
+- 2fe1f5973ff7: Filter Gitlab archived projects through APIs
+- Updated dependencies
+  - @backstage/backend-plugin-api@0.6.0-next.2
+  - @backstage/backend-tasks@0.5.5-next.2
+  - @backstage/backend-common@0.19.2-next.2
+  - @backstage/plugin-catalog-node@1.4.1-next.2
+
+## @backstage/plugin-catalog-backend-module-incremental-ingestion@0.4.1-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-backend@1.12.0-next.2
+  - @backstage/backend-plugin-api@0.6.0-next.2
+  - @backstage/backend-tasks@0.5.5-next.2
+  - @backstage/backend-common@0.19.2-next.2
+  - @backstage/plugin-catalog-node@1.4.1-next.2
+  - @backstage/plugin-events-node@0.2.9-next.2
+
+## @backstage/plugin-catalog-backend-module-ldap@0.5.15-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-tasks@0.5.5-next.2
+  - @backstage/plugin-catalog-node@1.4.1-next.2
+
+## @backstage/plugin-catalog-backend-module-msgraph@0.5.7-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@0.6.0-next.2
+  - @backstage/backend-tasks@0.5.5-next.2
+  - @backstage/backend-common@0.19.2-next.2
+  - @backstage/plugin-catalog-node@1.4.1-next.2
+
+## @backstage/plugin-catalog-backend-module-openapi@0.1.14-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-backend@1.12.0-next.2
+  - @backstage/backend-common@0.19.2-next.2
+  - @backstage/plugin-catalog-node@1.4.1-next.2
+
+## @backstage/plugin-catalog-backend-module-puppetdb@0.1.5-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@0.6.0-next.2
+  - @backstage/backend-tasks@0.5.5-next.2
+  - @backstage/backend-common@0.19.2-next.2
+  - @backstage/plugin-catalog-node@1.4.1-next.2
+
+## @backstage/plugin-catalog-backend-module-unprocessed@0.2.0-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@0.6.0-next.2
+  - @backstage/plugin-auth-node@0.2.17-next.2
+
+## @backstage/plugin-catalog-graph@0.2.33-next.2
+
+### Patch Changes
+
+- 62dc7a2b1ad1: Added maximum depth parameter to the catalogGraphParams in CatalogGraphCard.
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.8.1-next.1
+
+## @backstage/plugin-catalog-import@0.9.11-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.8.1-next.1
+  - @backstage/integration-react@1.1.16-next.1
+
+## @backstage/plugin-catalog-node@1.4.1-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@0.6.0-next.2
+
+## @backstage/plugin-catalog-react@1.8.1-next.1
+
+### Patch Changes
+
+- aa3feedce10a: Allow specifying screen size when catalog filters are hidden in drawer
+
+## @backstage/plugin-cicd-statistics@0.1.23-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.8.1-next.1
+
+## @backstage/plugin-cicd-statistics-module-gitlab@0.1.17-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-cicd-statistics@0.1.23-next.1
+
+## @backstage/plugin-circleci@0.3.21-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.8.1-next.1
+
+## @backstage/plugin-cloudbuild@0.3.21-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.8.1-next.1
+
+## @backstage/plugin-code-climate@0.1.21-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.8.1-next.1
+
+## @backstage/plugin-code-coverage@0.2.14-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.8.1-next.1
+
+## @backstage/plugin-code-coverage-backend@0.2.14-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.19.2-next.2
+
+## @backstage/plugin-cost-insights@0.12.10-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.8.1-next.1
+
+## @backstage/plugin-devtools-backend@0.1.3-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@0.6.0-next.2
+  - @backstage/backend-common@0.19.2-next.2
+  - @backstage/plugin-permission-node@0.7.11-next.2
+  - @backstage/plugin-auth-node@0.2.17-next.2
+  - @backstage/config-loader@1.4.0-next.1
+
+## @backstage/plugin-dynatrace@7.0.1-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.8.1-next.1
+
+## @backstage/plugin-entity-feedback@0.2.4-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.8.1-next.1
+
+## @backstage/plugin-entity-feedback-backend@0.1.6-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@0.6.0-next.2
+  - @backstage/backend-common@0.19.2-next.2
+  - @backstage/plugin-auth-node@0.2.17-next.2
+
+## @backstage/plugin-entity-validation@0.1.6-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.8.1-next.1
+
+## @backstage/plugin-events-backend@0.2.9-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@0.6.0-next.2
+  - @backstage/backend-common@0.19.2-next.2
+  - @backstage/plugin-events-node@0.2.9-next.2
+
+## @backstage/plugin-events-backend-module-aws-sqs@0.2.3-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@0.6.0-next.2
+  - @backstage/backend-tasks@0.5.5-next.2
+  - @backstage/backend-common@0.19.2-next.2
+  - @backstage/plugin-events-node@0.2.9-next.2
+
+## @backstage/plugin-events-backend-module-azure@0.1.10-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@0.6.0-next.2
+  - @backstage/plugin-events-node@0.2.9-next.2
+
+## @backstage/plugin-events-backend-module-bitbucket-cloud@0.1.10-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@0.6.0-next.2
+  - @backstage/plugin-events-node@0.2.9-next.2
+
+## @backstage/plugin-events-backend-module-gerrit@0.1.10-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@0.6.0-next.2
+  - @backstage/plugin-events-node@0.2.9-next.2
+
+## @backstage/plugin-events-backend-module-github@0.1.10-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@0.6.0-next.2
+  - @backstage/plugin-events-node@0.2.9-next.2
+
+## @backstage/plugin-events-backend-module-gitlab@0.1.10-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@0.6.0-next.2
+  - @backstage/plugin-events-node@0.2.9-next.2
+
+## @backstage/plugin-events-backend-test-utils@0.1.10-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-events-node@0.2.9-next.2
+
+## @backstage/plugin-events-node@0.2.9-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@0.6.0-next.2
+
+## @backstage/plugin-explore@0.4.7-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.8.1-next.1
+  - @backstage/plugin-explore-react@0.0.30
+
+## @backstage/plugin-explore-backend@0.0.10-next.2
+
+### Patch Changes
+
+- eda2a699f40d: Moved the config example from the "Tools as Code" section to the "Tools as Config" section of the README
+- Updated dependencies
+  - @backstage/plugin-search-backend-module-explore@0.1.4-next.2
+  - @backstage/backend-common@0.19.2-next.2
+
+## @backstage/plugin-firehydrant@0.2.5-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.8.1-next.1
+
+## @backstage/plugin-fossa@0.2.53-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.8.1-next.1
+
+## @backstage/plugin-github-actions@0.6.2-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.8.1-next.1
+  - @backstage/integration-react@1.1.16-next.1
+
+## @backstage/plugin-github-deployments@0.1.52-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.8.1-next.1
+  - @backstage/integration-react@1.1.16-next.1
+
+## @backstage/plugin-github-issues@0.2.10-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.8.1-next.1
+
+## @backstage/plugin-github-pull-requests-board@0.1.15-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.8.1-next.1
+
+## @backstage/plugin-gocd@0.1.27-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.8.1-next.1
+
+## @backstage/plugin-graphql-backend@0.1.38-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.19.2-next.2
+
+## @backstage/plugin-graphql-voyager@0.1.6-next.2
+
+### Patch Changes
+
+- bb1e1c2b26cc: Fix typo in install instructions.
+
+## @backstage/plugin-home@0.5.5-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.8.1-next.1
+  - @backstage/plugin-home-react@0.1.2-next.0
+
+## @backstage/plugin-ilert@0.2.10-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.8.1-next.1
+
+## @backstage/plugin-jenkins@0.8.3-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.8.1-next.1
+
+## @backstage/plugin-jenkins-backend@0.2.3-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.19.2-next.2
+  - @backstage/plugin-permission-node@0.7.11-next.2
+  - @backstage/plugin-auth-node@0.2.17-next.2
+
+## @backstage/plugin-kafka@0.3.21-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.8.1-next.1
+
+## @backstage/plugin-kafka-backend@0.2.41-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@0.6.0-next.2
+  - @backstage/backend-common@0.19.2-next.2
+
+## @backstage/plugin-kubernetes@0.9.4-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.8.1-next.1
+
+## @backstage/plugin-kubernetes-backend@0.11.3-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@0.6.0-next.2
+  - @backstage/backend-common@0.19.2-next.2
+  - @backstage/plugin-catalog-node@1.4.1-next.2
+  - @backstage/plugin-permission-node@0.7.11-next.2
+  - @backstage/plugin-auth-node@0.2.17-next.2
+
+## @backstage/plugin-lighthouse@0.4.6-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.8.1-next.1
+
+## @backstage/plugin-lighthouse-backend@0.2.4-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@0.6.0-next.2
+  - @backstage/backend-tasks@0.5.5-next.2
+  - @backstage/backend-common@0.19.2-next.2
+  - @backstage/plugin-catalog-node@1.4.1-next.2
+
+## @backstage/plugin-linguist@0.1.6-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-linguist-common@0.1.1-next.1
+  - @backstage/plugin-catalog-react@1.8.1-next.1
+
+## @backstage/plugin-linguist-common@0.1.1-next.1
+
+### Patch Changes
+
+- d440f1dd0e72: Exported new LanguageType type alias
+
+## @backstage/plugin-newrelic-dashboard@0.2.14-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.8.1-next.1
+
+## @backstage/plugin-nomad@0.1.2-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.8.1-next.1
+
+## @backstage/plugin-nomad-backend@0.1.2-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.19.2-next.2
+
+## @backstage/plugin-octopus-deploy@0.2.3-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.8.1-next.1
+
+## @backstage/plugin-org@0.6.11-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.8.1-next.1
+
+## @backstage/plugin-org-react@0.1.10-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.8.1-next.1
+
+## @backstage/plugin-pagerduty@0.6.2-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.8.1-next.1
+  - @backstage/plugin-home-react@0.1.2-next.0
+
+## @backstage/plugin-periskop@0.1.19-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.8.1-next.1
+
+## @backstage/plugin-periskop-backend@0.1.19-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@0.6.0-next.2
+  - @backstage/backend-common@0.19.2-next.2
+
+## @backstage/plugin-permission-backend@0.5.23-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@0.6.0-next.2
+  - @backstage/backend-common@0.19.2-next.2
+  - @backstage/plugin-permission-node@0.7.11-next.2
+  - @backstage/plugin-auth-node@0.2.17-next.2
+
+## @backstage/plugin-permission-node@0.7.11-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@0.6.0-next.2
+  - @backstage/backend-common@0.19.2-next.2
+  - @backstage/plugin-auth-node@0.2.17-next.2
+
+## @backstage/plugin-playlist@0.1.13-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.8.1-next.1
+
+## @backstage/plugin-playlist-backend@0.3.4-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.19.2-next.2
+  - @backstage/plugin-permission-node@0.7.11-next.2
+  - @backstage/plugin-auth-node@0.2.17-next.2
+
+## @backstage/plugin-puppetdb@0.1.4-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.8.1-next.1
+
+## @backstage/plugin-rollbar@0.4.21-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.8.1-next.1
+
+## @backstage/plugin-rollbar-backend@0.1.45-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.19.2-next.2
+
+## @backstage/plugin-scaffolder@1.14.2-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.8.1-next.1
+  - @backstage/plugin-scaffolder-react@1.5.2-next.1
+  - @backstage/integration-react@1.1.16-next.1
+
+## @backstage/plugin-scaffolder-backend@1.15.2-next.2
+
+### Patch Changes
+
+- 33c76caef72a: Added examples for the fs:delete and fs:rename actions
+- 0b1d775be05b: Adds examples to a few scaffolder actions.
+- Updated dependencies
+  - @backstage/plugin-catalog-backend@1.12.0-next.2
+  - @backstage/backend-plugin-api@0.6.0-next.2
+  - @backstage/backend-tasks@0.5.5-next.2
+  - @backstage/plugin-scaffolder-node@0.1.6-next.2
+  - @backstage/backend-common@0.19.2-next.2
+  - @backstage/plugin-catalog-node@1.4.1-next.2
+  - @backstage/plugin-permission-node@0.7.11-next.2
+  - @backstage/plugin-auth-node@0.2.17-next.2
+
+## @backstage/plugin-scaffolder-backend-module-confluence-to-markdown@0.2.1-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-scaffolder-node@0.1.6-next.2
+  - @backstage/backend-common@0.19.2-next.2
+
+## @backstage/plugin-scaffolder-backend-module-cookiecutter@0.2.24-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-scaffolder-node@0.1.6-next.2
+  - @backstage/backend-common@0.19.2-next.2
+
+## @backstage/plugin-scaffolder-backend-module-gitlab@0.2.3-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-scaffolder-node@0.1.6-next.2
+
+## @backstage/plugin-scaffolder-backend-module-rails@0.4.17-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-scaffolder-node@0.1.6-next.2
+  - @backstage/backend-common@0.19.2-next.2
+
+## @backstage/plugin-scaffolder-backend-module-sentry@0.1.8-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-scaffolder-node@0.1.6-next.2
+
+## @backstage/plugin-scaffolder-backend-module-yeoman@0.2.21-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-scaffolder-node@0.1.6-next.2
+
+## @backstage/plugin-scaffolder-node@0.1.6-next.2
+
+### Patch Changes
+
+- 0b1d775be05b: Export `TemplateExample` from the `createTemplateAction` type.
+- Updated dependencies
+  - @backstage/backend-plugin-api@0.6.0-next.2
+  - @backstage/backend-common@0.19.2-next.2
+
+## @backstage/plugin-scaffolder-react@1.5.2-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.8.1-next.1
+
+## @backstage/plugin-search@1.3.4-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.8.1-next.1
+
+## @backstage/plugin-search-backend@1.4.0-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@0.6.0-next.2
+  - @backstage/backend-common@0.19.2-next.2
+  - @backstage/plugin-permission-node@0.7.11-next.2
+  - @backstage/plugin-search-backend-node@1.2.4-next.2
+  - @backstage/plugin-auth-node@0.2.17-next.2
+
+## @backstage/plugin-search-backend-module-catalog@0.1.4-next.2
+
+### Patch Changes
+
+- 29f77f923c71: Ensure that all services are dependency injected into the module instead of taken from options
+- Updated dependencies
+  - @backstage/backend-plugin-api@0.6.0-next.2
+  - @backstage/backend-tasks@0.5.5-next.2
+  - @backstage/backend-common@0.19.2-next.2
+  - @backstage/plugin-catalog-node@1.4.1-next.2
+  - @backstage/plugin-search-backend-node@1.2.4-next.2
+
+## @backstage/plugin-search-backend-module-elasticsearch@1.3.3-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@0.6.0-next.2
+  - @backstage/backend-common@0.19.2-next.2
+  - @backstage/plugin-search-backend-node@1.2.4-next.2
+
+## @backstage/plugin-search-backend-module-explore@0.1.4-next.2
+
+### Patch Changes
+
+- 29f77f923c71: Ensure that all services are dependency injected into the module instead of taken from options
+- Updated dependencies
+  - @backstage/backend-plugin-api@0.6.0-next.2
+  - @backstage/backend-tasks@0.5.5-next.2
+  - @backstage/backend-common@0.19.2-next.2
+  - @backstage/plugin-search-backend-node@1.2.4-next.2
+
+## @backstage/plugin-search-backend-module-pg@0.5.9-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@0.6.0-next.2
+  - @backstage/backend-common@0.19.2-next.2
+  - @backstage/plugin-search-backend-node@1.2.4-next.2
+
+## @backstage/plugin-search-backend-module-techdocs@0.1.4-next.2
+
+### Patch Changes
+
+- 29f77f923c71: Ensure that all services are dependency injected into the module instead of taken from options
+- Updated dependencies
+  - @backstage/backend-plugin-api@0.6.0-next.2
+  - @backstage/backend-tasks@0.5.5-next.2
+  - @backstage/backend-common@0.19.2-next.2
+  - @backstage/plugin-catalog-node@1.4.1-next.2
+  - @backstage/plugin-search-backend-node@1.2.4-next.2
+  - @backstage/plugin-techdocs-node@1.7.4-next.2
+
+## @backstage/plugin-search-backend-node@1.2.4-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@0.6.0-next.2
+  - @backstage/backend-tasks@0.5.5-next.2
+  - @backstage/backend-common@0.19.2-next.2
+
+## @backstage/plugin-sentry@0.5.6-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.8.1-next.1
+
+## @backstage/plugin-sonarqube@0.7.2-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.8.1-next.1
+
+## @backstage/plugin-sonarqube-backend@0.2.2-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.19.2-next.2
+
+## @backstage/plugin-splunk-on-call@0.4.10-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.8.1-next.1
+
+## @backstage/plugin-stack-overflow-backend@0.2.4-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.19.2-next.2
+
+## @backstage/plugin-tech-insights@0.3.13-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.8.1-next.1
+
+## @backstage/plugin-tech-insights-backend@0.5.14-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-tasks@0.5.5-next.2
+  - @backstage/backend-common@0.19.2-next.2
+  - @backstage/plugin-tech-insights-node@0.4.6-next.2
+
+## @backstage/plugin-tech-insights-backend-module-jsonfc@0.1.32-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.19.2-next.2
+  - @backstage/plugin-tech-insights-node@0.4.6-next.2
+
+## @backstage/plugin-tech-insights-node@0.4.6-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-tasks@0.5.5-next.2
+  - @backstage/backend-common@0.19.2-next.2
+
+## @backstage/plugin-techdocs@1.6.6-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.8.1-next.1
+  - @backstage/integration-react@1.1.16-next.1
+
+## @backstage/plugin-techdocs-addons-test-utils@1.0.17-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog@1.12.1-next.2
+  - @backstage/plugin-techdocs@1.6.6-next.2
+  - @backstage/integration-react@1.1.16-next.1
+
+## @backstage/plugin-techdocs-backend@1.6.5-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-search-backend-module-techdocs@0.1.4-next.2
+  - @backstage/backend-plugin-api@0.6.0-next.2
+  - @backstage/backend-common@0.19.2-next.2
+  - @backstage/plugin-techdocs-node@1.7.4-next.2
+
+## @backstage/plugin-techdocs-node@1.7.4-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.19.2-next.2
+
+## @backstage/plugin-todo@0.2.23-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.8.1-next.1
+
+## @backstage/plugin-todo-backend@0.2.0-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@0.6.0-next.2
+  - @backstage/backend-common@0.19.2-next.2
+  - @backstage/plugin-catalog-node@1.4.1-next.2
+
+## @backstage/plugin-user-settings@0.7.6-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.8.1-next.1
+
+## @backstage/plugin-user-settings-backend@0.1.12-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@0.6.0-next.2
+  - @backstage/backend-common@0.19.2-next.2
+  - @backstage/plugin-auth-node@0.2.17-next.2
+
+## @backstage/plugin-vault@0.1.15-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.8.1-next.1
+
+## @backstage/plugin-vault-backend@0.3.4-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-tasks@0.5.5-next.2
+  - @backstage/backend-common@0.19.2-next.2
+
+## example-app@0.2.86-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-graph@0.2.33-next.2
+  - @backstage/plugin-linguist-common@0.1.1-next.1
+  - @backstage/plugin-catalog-react@1.8.1-next.1
+  - @backstage/plugin-linguist@0.1.6-next.2
+  - @backstage/plugin-adr@0.6.4-next.2
+  - @backstage/plugin-airbrake@0.3.21-next.2
+  - @backstage/plugin-api-docs@0.9.7-next.2
+  - @backstage/plugin-azure-devops@0.3.3-next.1
+  - @backstage/plugin-azure-sites@0.1.10-next.1
+  - @backstage/plugin-badges@0.2.45-next.1
+  - @internal/plugin-catalog-customized@0.0.13-next.2
+  - @backstage/plugin-catalog-import@0.9.11-next.2
+  - @backstage/plugin-circleci@0.3.21-next.1
+  - @backstage/plugin-cloudbuild@0.3.21-next.1
+  - @backstage/plugin-code-coverage@0.2.14-next.2
+  - @backstage/plugin-cost-insights@0.12.10-next.1
+  - @backstage/plugin-dynatrace@7.0.1-next.2
+  - @backstage/plugin-entity-feedback@0.2.4-next.2
+  - @backstage/plugin-explore@0.4.7-next.1
+  - @backstage/plugin-github-actions@0.6.2-next.2
+  - @backstage/plugin-gocd@0.1.27-next.1
+  - @backstage/plugin-home@0.5.5-next.1
+  - @backstage/plugin-jenkins@0.8.3-next.2
+  - @backstage/plugin-kafka@0.3.21-next.2
+  - @backstage/plugin-kubernetes@0.9.4-next.1
+  - @backstage/plugin-lighthouse@0.4.6-next.1
+  - @backstage/plugin-newrelic-dashboard@0.2.14-next.2
+  - @backstage/plugin-nomad@0.1.2-next.2
+  - @backstage/plugin-octopus-deploy@0.2.3-next.2
+  - @backstage/plugin-org@0.6.11-next.2
+  - @backstage/plugin-pagerduty@0.6.2-next.1
+  - @backstage/plugin-playlist@0.1.13-next.2
+  - @backstage/plugin-puppetdb@0.1.4-next.1
+  - @backstage/plugin-rollbar@0.4.21-next.1
+  - @backstage/plugin-scaffolder@1.14.2-next.2
+  - @backstage/plugin-scaffolder-react@1.5.2-next.1
+  - @backstage/plugin-search@1.3.4-next.1
+  - @backstage/plugin-sentry@0.5.6-next.1
+  - @backstage/plugin-tech-insights@0.3.13-next.2
+  - @backstage/plugin-techdocs@1.6.6-next.2
+  - @backstage/plugin-todo@0.2.23-next.1
+  - @backstage/plugin-user-settings@0.7.6-next.1
+  - @backstage/cli@0.22.10-next.1
+  - @backstage/integration-react@1.1.16-next.1
+  - @backstage/plugin-apache-airflow@0.2.14-next.1
+  - @backstage/plugin-catalog-unprocessed-entities@0.1.2-next.0
+  - @backstage/plugin-devtools@0.1.3-next.1
+  - @backstage/plugin-gcalendar@0.3.17-next.1
+  - @backstage/plugin-gcp-projects@0.3.40-next.0
+  - @backstage/plugin-graphiql@0.2.53-next.0
+  - @backstage/plugin-microsoft-calendar@0.1.6-next.1
+  - @backstage/plugin-newrelic@0.3.39-next.0
+  - @backstage/plugin-shortcuts@0.3.13-next.1
+  - @backstage/plugin-stack-overflow@0.1.19-next.1
+  - @backstage/plugin-stackstorm@0.1.5-next.0
+  - @backstage/plugin-tech-radar@0.6.7-next.0
+  - @backstage/plugin-techdocs-module-addons-contrib@1.0.16-next.1
+
+## example-backend@0.2.86-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-auth-backend@0.18.6-next.2
+  - @backstage/plugin-scaffolder-backend@1.15.2-next.2
+  - @backstage/plugin-explore-backend@0.0.10-next.2
+  - @backstage/plugin-catalog-backend@1.12.0-next.2
+  - @backstage/plugin-proxy-backend@0.3.0-next.2
+  - @backstage/backend-tasks@0.5.5-next.2
+  - @backstage/plugin-app-backend@0.3.48-next.2
+  - @backstage/plugin-linguist-backend@0.4.0-next.2
+  - @backstage/plugin-techdocs-backend@1.6.5-next.2
+  - @backstage/backend-common@0.19.2-next.2
+  - example-app@0.2.86-next.2
+  - @backstage/plugin-adr-backend@0.3.6-next.2
+  - @backstage/plugin-azure-devops-backend@0.3.27-next.2
+  - @backstage/plugin-badges-backend@0.2.3-next.2
+  - @backstage/plugin-catalog-backend-module-unprocessed@0.2.0-next.2
+  - @backstage/plugin-catalog-node@1.4.1-next.2
+  - @backstage/plugin-devtools-backend@0.1.3-next.2
+  - @backstage/plugin-entity-feedback-backend@0.1.6-next.2
+  - @backstage/plugin-events-backend@0.2.9-next.2
+  - @backstage/plugin-events-node@0.2.9-next.2
+  - @backstage/plugin-kafka-backend@0.2.41-next.2
+  - @backstage/plugin-kubernetes-backend@0.11.3-next.2
+  - @backstage/plugin-lighthouse-backend@0.2.4-next.2
+  - @backstage/plugin-permission-backend@0.5.23-next.2
+  - @backstage/plugin-permission-node@0.7.11-next.2
+  - @backstage/plugin-search-backend@1.4.0-next.2
+  - @backstage/plugin-search-backend-module-elasticsearch@1.3.3-next.2
+  - @backstage/plugin-search-backend-module-pg@0.5.9-next.2
+  - @backstage/plugin-search-backend-node@1.2.4-next.2
+  - @backstage/plugin-todo-backend@0.2.0-next.2
+  - @backstage/plugin-tech-insights-backend@0.5.14-next.2
+  - @backstage/plugin-tech-insights-node@0.4.6-next.2
+  - @backstage/plugin-scaffolder-backend-module-confluence-to-markdown@0.2.1-next.2
+  - @backstage/plugin-scaffolder-backend-module-rails@0.4.17-next.2
+  - @backstage/plugin-auth-node@0.2.17-next.2
+  - @backstage/plugin-azure-sites-backend@0.1.10-next.2
+  - @backstage/plugin-code-coverage-backend@0.2.14-next.2
+  - @backstage/plugin-graphql-backend@0.1.38-next.2
+  - @backstage/plugin-jenkins-backend@0.2.3-next.2
+  - @backstage/plugin-nomad-backend@0.1.2-next.2
+  - @backstage/plugin-playlist-backend@0.3.4-next.2
+  - @backstage/plugin-rollbar-backend@0.1.45-next.2
+  - @backstage/plugin-tech-insights-backend-module-jsonfc@0.1.32-next.2
+
+## example-backend-next@0.0.14-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-search-backend-module-techdocs@0.1.4-next.2
+  - @backstage/plugin-search-backend-module-catalog@0.1.4-next.2
+  - @backstage/plugin-search-backend-module-explore@0.1.4-next.2
+  - @backstage/plugin-scaffolder-backend@1.15.2-next.2
+  - @backstage/plugin-catalog-backend@1.12.0-next.2
+  - @backstage/backend-plugin-api@0.6.0-next.2
+  - @backstage/plugin-proxy-backend@0.3.0-next.2
+  - @backstage/backend-tasks@0.5.5-next.2
+  - @backstage/plugin-app-backend@0.3.48-next.2
+  - @backstage/plugin-linguist-backend@0.4.0-next.2
+  - @backstage/plugin-techdocs-backend@1.6.5-next.2
+  - @backstage/backend-defaults@0.2.0-next.2
+  - @backstage/plugin-adr-backend@0.3.6-next.2
+  - @backstage/plugin-azure-devops-backend@0.3.27-next.2
+  - @backstage/plugin-badges-backend@0.2.3-next.2
+  - @backstage/plugin-catalog-backend-module-unprocessed@0.2.0-next.2
+  - @backstage/plugin-devtools-backend@0.1.3-next.2
+  - @backstage/plugin-entity-feedback-backend@0.1.6-next.2
+  - @backstage/plugin-kubernetes-backend@0.11.3-next.2
+  - @backstage/plugin-lighthouse-backend@0.2.4-next.2
+  - @backstage/plugin-permission-backend@0.5.23-next.2
+  - @backstage/plugin-permission-node@0.7.11-next.2
+  - @backstage/plugin-search-backend@1.4.0-next.2
+  - @backstage/plugin-search-backend-node@1.2.4-next.2
+  - @backstage/plugin-todo-backend@0.2.0-next.2
+  - @backstage/plugin-auth-node@0.2.17-next.2
+
+## e2e-test@0.2.6-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/create-app@0.5.4-next.2
+
+## techdocs-cli-embedded-app@0.2.85-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog@1.12.1-next.2
+  - @backstage/plugin-techdocs@1.6.6-next.2
+  - @backstage/cli@0.22.10-next.1
+  - @backstage/integration-react@1.1.16-next.1
+
+## @internal/plugin-catalog-customized@0.0.13-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.8.1-next.1
+  - @backstage/plugin-catalog@1.12.1-next.2
+
+## @internal/plugin-todo-list-backend@1.0.16-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@0.6.0-next.2
+  - @backstage/backend-common@0.19.2-next.2
+  - @backstage/plugin-auth-node@0.2.17-next.2
diff --git a/docs/releases/v1.17.0.md b/docs/releases/v1.17.0.md
new file mode 100644
index 0000000000..36414e6608
--- /dev/null
+++ b/docs/releases/v1.17.0.md
@@ -0,0 +1,72 @@
+---
+id: v1.17.0
+title: v1.17.0
+description: Backstage Release v1.17.0
+---
+
+These are the release notes for the v1.17.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
+
+### Changes to the New Backend System
+
+For this release we had another look at the new backend system, in particular how well it fits together with the concept of plugin installation without code modification, and we identified a number of breaking changes that we wanted to make.
+
+We have removed the ability to define options for plugins and modules, and force them to be optional for services. Options have been moved either to static configuration or extension points, and modules now also have the ability to register extension points.
+
+Service factories are now considered `BackendFeature`s and are installed via `backend.add(...)` rather than via the `services` option, which has been removed.
+
+The configuration service has also been renamed to `rootConfig` in order to match other root-scoped services and make space for a potential plugin-scoped configuration service in the future.
+
+The shared environments concept has been removed. We are still interested in having some way to define reusable presets in the new system, but shared environments were too limited.
+
+We expect these to be the last broad breaking changes to the new backend system, and are likely to start encouraging use of it in the next release.
+
+### Catalog Telemetry with Processing Tracing
+
+The Catalog has been instrumented with some simple OpenTelemetry Spans so you can now dig into the processing loop and see it in action using tracing.
+
+Contributed by [@mikebryant](https://github.com/mikebryant) in [#17534](https://github.com/backstage/backstage/pull/17534)
+
+### New `each` property for Scaffolder Actions
+
+You can now define an `each` iterable in the `steps` for a template, which will run a given action for each entry in the iterable.
+
+Contributed by [@alexef](https://github.com/alexef) in [#18157](https://github.com/backstage/backstage/pull/18157)
+
+### Updated proxy configuration
+
+The shape of the proxy plugin configuration has been changed in order to make space for additional keys. Rather than defining the proxy endpoints directly under `proxy`, they should now be defined at `proxy.endpoints` instead.
+
+### OpenAPI Support for Backend Plugins
+
+You can now use OpenAPI specs to generate typed routers for your backend plugins with request validation using `createOpenApiRouter()`. There’s been some movement to support this for some of the plugins in the monorepo like `todo`, `search` and `catalog`.
+
+Contributed by [@sennyeya](https://github.com/sennyeya) in [#17875](https://github.com/backstage/backstage/pull/17875)
+
+### New plugin: `@backstage/plugin-catalog-backend-module-gcp`
+
+Allows ingestion of GKE Clusters as Resources into the Catalog. Contributed by [@mclarke47](https://github.com/mclarke47) in [#18759](https://github.com/backstage/backstage/pull/18759)
+
+## 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/backstage-687207715902193673) for discussions and support
+- [Changelog](https://github.com/backstage/backstage/tree/master/docs/releases/v1.17.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://info.backstage.spotify.com/newsletter_subscribe) if you want to be informed about what is happening in the world of Backstage.
diff --git a/docs/releases/v1.18.0-next.0-changelog.md b/docs/releases/v1.18.0-next.0-changelog.md
new file mode 100644
index 0000000000..16c71179e5
--- /dev/null
+++ b/docs/releases/v1.18.0-next.0-changelog.md
@@ -0,0 +1,2753 @@
+# Release v1.18.0-next.0
+
+## @backstage/config-loader@1.5.0-next.0
+
+### Minor Changes
+
+- 9606ba0939e6: Deep visibility now also applies to values that are not covered by the configuration schema.
+
+  For example, given the following configuration schema:
+
+  ```ts
+  // plugins/a/config.schema.ts
+  export interface Config {
+    /** @deepVisibility frontend */
+    a?: unknown;
+  }
+
+  // plugins/a/config.schema.ts
+  export interface Config {
+    a?: {
+      b?: string;
+    };
+  }
+  ```
+
+  All values under `a` are now visible to the frontend, while previously only `a` and `a/b` would've been visible.
+
+### Patch Changes
+
+- f9657b891b00: Do not unnecessarily notify subscribers when no-op updates to config happen
+- Updated dependencies
+  - @backstage/cli-common@0.1.12
+  - @backstage/config@1.0.8
+  - @backstage/errors@1.2.1
+  - @backstage/types@1.1.0
+
+## @backstage/core-app-api@1.10.0-next.0
+
+### Minor Changes
+
+- 18619f793c94: Fixed two bugs in how the `OAuth2Session` type represents the underlying data. The `expiresAt` and `backstageIdentity` are now both optional, since that's what they are in practice. This is not considered a breaking change since it was effectively a bug in the modelling of the state that this type represents, and the type was not used in any other external contract.
+- 18619f793c94: The `OAuth` class which is used by all OAuth providers will now consider both the session expiration of both the Backstage identity as well as the upstream identity provider, and refresh the session with either of them is about to expire.
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-plugin-api@1.6.0-next.0
+  - @backstage/config@1.0.8
+  - @backstage/types@1.1.0
+  - @backstage/version-bridge@1.0.4
+
+## @backstage/core-plugin-api@1.6.0-next.0
+
+### Minor Changes
+
+- 18619f793c94: Added the optional `expiresAt` field that may now be part of a `BackstageIdentityResponse`.
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config@1.0.8
+  - @backstage/types@1.1.0
+  - @backstage/version-bridge@1.0.4
+
+## @backstage/integration@1.7.0-next.0
+
+### Minor Changes
+
+- 5f1a92b9f19f: Added `AzureDevOpsCredentialsProvider` to support multiple Azure DevOps organizations and **deprecated** `AzureIntegrationConfig.credential` and `AzureIntegrationConfig.token` in favour of `AzureIntegrationConfig.credentials`. You can now use specific credentials for different Azure DevOps (Server) organizations by specifying the `organizations` field on a credential:
+
+  ```yaml
+  integrations:
+    azure:
+      - host: dev.azure.com
+        credentials:
+          - organizations:
+              - my-org
+              - my-other-org
+            clientId: ${AZURE_CLIENT_ID}
+            clientSecret: ${AZURE_CLIENT_SECRET}
+            tenantId: ${AZURE_TENANT_ID}
+          - organizations:
+              - yet-another-org
+            personalAccessToken: ${PERSONAL_ACCESS_TOKEN}
+  ```
+
+  See the [Azure integration documentation](https://backstage.io/docs/integrations/azure/locations) for more information.
+
+### Patch Changes
+
+- cb2e19d82d95: Gitiles: Fixed auth prefix issue
+- Updated dependencies
+  - @backstage/config@1.0.8
+  - @backstage/errors@1.2.1
+
+## @backstage/plugin-auth-backend-module-gcp-iap-provider@0.1.0-next.0
+
+### Minor Changes
+
+- 8513cd7d00e3: New module for `@backstage/plugin-auth-backend` that adds a GCP IAP auth provider.
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-auth-node@0.3.0-next.0
+  - @backstage/backend-plugin-api@0.6.2-next.0
+  - @backstage/errors@1.2.1
+  - @backstage/types@1.1.0
+
+## @backstage/plugin-auth-backend-module-github-provider@0.1.0-next.0
+
+### Minor Changes
+
+- 23af27f5ce79: New module for `@backstage/plugin-auth-backend` that adds a GitHub auth provider.
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-auth-node@0.3.0-next.0
+  - @backstage/backend-common@0.19.4-next.0
+  - @backstage/backend-plugin-api@0.6.2-next.0
+
+## @backstage/plugin-auth-backend-module-google-provider@0.1.0-next.0
+
+### Minor Changes
+
+- 8513cd7d00e3: New module for `@backstage/plugin-auth-backend` that adds a Google auth provider.
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-auth-node@0.3.0-next.0
+  - @backstage/backend-plugin-api@0.6.2-next.0
+
+## @backstage/plugin-auth-node@0.3.0-next.0
+
+### Minor Changes
+
+- 8513cd7d00e3: Introduced a new system for building auth providers for `@backstage/plugin-auth-backend`, which both increases the amount of code re-use across providers, and also works better with the new backend system.
+
+  Many existing types have been moved from `@backstage/plugin-auth-backend` in order to avoid a direct dependency on the plugin from modules.
+
+  Auth provider integrations are now primarily implemented through a pattern of creating "authenticators", which are in turn specific to each kind of integrations. Initially there are two types: `createOAuthAuthenticator` and `createProxyAuthenticator`. These come paired with functions that let you create the corresponding route handlers, `createOAuthRouteHandlers` and `createProxyAuthRouteHandlers`, as well as provider factories, `createOAuthProviderFactory` and `createProxyAuthProviderFactory`. This new authenticator pattern allows the sign-in logic to be separated from the auth integration logic, allowing it to be completely re-used across all providers of the same kind.
+
+  The new provider factories also implement a new declarative way to configure sign-in resolvers, rather than configuration through code. Sign-in resolvers can now be configured through the `resolvers` configuration key, where the first resolver that provides an identity will be used, for example:
+
+  ```yaml
+  auth:
+    providers:
+      google:
+        development:
+          clientId: ...
+          clientSecret: ...
+          signIn:
+            resolvers:
+              - resolver: emailMatchingUserEntityAnnotation
+              - resolver: emailLocalPartMatchingUserEntityName
+  ```
+
+  These configurable resolvers are created with a new `createSignInResolverFactory` function, which creates a sign-in resolver factory, optionally with an options schema that will be used both when configuring the sign-in resolver through configuration and code.
+
+  The internal helpers from `@backstage/plugin-auth-backend` that were used to implement auth providers using passport strategies have now also been made available as public API, through `PassportHelpers` and `PassportOAuthAuthenticatorHelper`.
+
+### Patch Changes
+
+- 18619f793c94: The `BackstageIdentityResponse` interface now has an optional `expiresInSeconds` field that can be used to signal session expiration. The `prepareBackstageIdentityResponse` utility will now also read the expiration from the provided token, and include it in the response.
+- Updated dependencies
+  - @backstage/backend-common@0.19.4-next.0
+  - @backstage/backend-plugin-api@0.6.2-next.0
+  - @backstage/catalog-client@1.4.3
+  - @backstage/catalog-model@1.4.1
+  - @backstage/config@1.0.8
+  - @backstage/errors@1.2.1
+  - @backstage/types@1.1.0
+
+## @backstage/plugin-opencost@0.2.0-next.0
+
+### Minor Changes
+
+- 1380a689ab56: New OpenCost plugin provides an port of the latest OpenCost UI to Backstage with updated dependencies. The plugin's README covers installation and configuration
+
+### Patch Changes
+
+- 482bb5c0bbf8: Moved `@types/react` to be a regular dependency
+- Updated dependencies
+  - @backstage/core-plugin-api@1.6.0-next.0
+  - @backstage/core-components@0.13.5-next.0
+  - @backstage/theme@0.4.1
+
+## @backstage/app-defaults@1.4.3-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-app-api@1.10.0-next.0
+  - @backstage/core-plugin-api@1.6.0-next.0
+  - @backstage/core-components@0.13.5-next.0
+  - @backstage/theme@0.4.1
+  - @backstage/plugin-permission-react@0.4.15-next.0
+
+## @backstage/backend-app-api@0.5.2-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-auth-node@0.3.0-next.0
+  - @backstage/backend-common@0.19.4-next.0
+  - @backstage/config-loader@1.5.0-next.0
+  - @backstage/backend-tasks@0.5.7-next.0
+  - @backstage/backend-plugin-api@0.6.2-next.0
+  - @backstage/cli-common@0.1.12
+  - @backstage/cli-node@0.1.3
+  - @backstage/config@1.0.8
+  - @backstage/errors@1.2.1
+  - @backstage/types@1.1.0
+  - @backstage/plugin-permission-node@0.7.13-next.0
+
+## @backstage/backend-common@0.19.4-next.0
+
+### Patch Changes
+
+- 5f1a92b9f19f: Use `DefaultAzureDevOpsCredentialsProvider` to retrieve credentials for Azure DevOps.
+- cfc3ca6ce060: Changes needed to support MySQL
+- Updated dependencies
+  - @backstage/integration@1.7.0-next.0
+  - @backstage/config-loader@1.5.0-next.0
+  - @backstage/backend-app-api@0.5.2-next.0
+  - @backstage/backend-dev-utils@0.1.1
+  - @backstage/backend-plugin-api@0.6.2-next.0
+  - @backstage/cli-common@0.1.12
+  - @backstage/config@1.0.8
+  - @backstage/errors@1.2.1
+  - @backstage/integration-aws-node@0.1.5
+  - @backstage/types@1.1.0
+
+## @backstage/backend-defaults@0.2.2-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.19.4-next.0
+  - @backstage/backend-app-api@0.5.2-next.0
+  - @backstage/backend-plugin-api@0.6.2-next.0
+
+## @backstage/backend-plugin-api@0.6.2-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-auth-node@0.3.0-next.0
+  - @backstage/backend-tasks@0.5.7-next.0
+  - @backstage/config@1.0.8
+  - @backstage/types@1.1.0
+  - @backstage/plugin-permission-common@0.7.7
+
+## @backstage/backend-tasks@0.5.7-next.0
+
+### Patch Changes
+
+- cfc3ca6ce060: Changes needed to support MySQL
+- Updated dependencies
+  - @backstage/backend-common@0.19.4-next.0
+  - @backstage/config@1.0.8
+  - @backstage/errors@1.2.1
+  - @backstage/types@1.1.0
+
+## @backstage/backend-test-utils@0.2.2-next.0
+
+### Patch Changes
+
+- 9fb3b5373c45: Extended `mockService` to also include mocked variants, for example `mockServices.lifecycle.mock()`. The returned mocked implementation will have a `factory` property which is a service factory for itself. You can also pass a partial implementation of the service to the mock function to use a mock implementation of specific methods.
+- Updated dependencies
+  - @backstage/plugin-auth-node@0.3.0-next.0
+  - @backstage/backend-common@0.19.4-next.0
+  - @backstage/backend-app-api@0.5.2-next.0
+  - @backstage/backend-plugin-api@0.6.2-next.0
+  - @backstage/config@1.0.8
+  - @backstage/types@1.1.0
+
+## @backstage/cli@0.22.12-next.0
+
+### Patch Changes
+
+- 278d9326eb40: Added the ability to create a plain backend module with the `new` command.
+- 71d4368ae5cc: Added support for the `dev/index` entry point for backend plugins and modules.
+- Updated dependencies
+  - @backstage/integration@1.7.0-next.0
+  - @backstage/config-loader@1.5.0-next.0
+  - @backstage/catalog-model@1.4.1
+  - @backstage/cli-common@0.1.12
+  - @backstage/cli-node@0.1.3
+  - @backstage/config@1.0.8
+  - @backstage/errors@1.2.1
+  - @backstage/eslint-plugin@0.1.3
+  - @backstage/release-manifests@0.0.9
+  - @backstage/types@1.1.0
+
+## @backstage/core-components@0.13.5-next.0
+
+### Patch Changes
+
+- 47782f4bfa5b: Add loading indicator to Table
+- Updated dependencies
+  - @backstage/core-plugin-api@1.6.0-next.0
+  - @backstage/config@1.0.8
+  - @backstage/errors@1.2.1
+  - @backstage/theme@0.4.1
+  - @backstage/version-bridge@1.0.4
+
+## @backstage/create-app@0.5.5-next.0
+
+### Patch Changes
+
+- Bumped create-app version.
+- Updated dependencies
+  - @backstage/cli-common@0.1.12
+
+## @backstage/dev-utils@1.0.20-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/integration-react@1.1.18-next.0
+  - @backstage/core-app-api@1.10.0-next.0
+  - @backstage/core-plugin-api@1.6.0-next.0
+  - @backstage/core-components@0.13.5-next.0
+  - @backstage/app-defaults@1.4.3-next.0
+  - @backstage/catalog-model@1.4.1
+  - @backstage/test-utils@1.4.3-next.0
+  - @backstage/theme@0.4.1
+  - @backstage/plugin-catalog-react@1.8.3-next.0
+
+## @backstage/integration-react@1.1.18-next.0
+
+### Patch Changes
+
+- 482bb5c0bbf8: Moved `@types/react` to be a regular dependency
+- Updated dependencies
+  - @backstage/integration@1.7.0-next.0
+  - @backstage/core-plugin-api@1.6.0-next.0
+  - @backstage/core-components@0.13.5-next.0
+  - @backstage/config@1.0.8
+  - @backstage/theme@0.4.1
+
+## @backstage/repo-tools@0.3.4-next.0
+
+### Patch Changes
+
+- 0109d3f11159: The `generate-catalog-info` command now uses the first listed `CODEOWNER` as Component owner when initially
+  creating the `catalog-info.yaml` file. It continues to allow any one listed `CODEOWNER` when updating
+  entity metadata.
+- ec13d3e86028: Fixed a bug with the `generate-catalog-info` command that could cause the `--dry-run` flag to indicate changes to files when no changes would actually be made if the command were run without the flag.
+- db60a16e0a54: Added a `--ci` flag to the `generate-catalog-info` command. This flag behaves similarly to the same flag on `api-reports`: if `catalog-info.yaml` files would have been added or modified, then the process exits with status code `1`, and instructions are printed.
+- Updated dependencies
+  - @backstage/catalog-model@1.4.1
+  - @backstage/cli-common@0.1.12
+  - @backstage/cli-node@0.1.3
+  - @backstage/errors@1.2.1
+
+## @techdocs/cli@1.4.7-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.19.4-next.0
+  - @backstage/catalog-model@1.4.1
+  - @backstage/cli-common@0.1.12
+  - @backstage/config@1.0.8
+  - @backstage/plugin-techdocs-node@1.7.6-next.0
+
+## @backstage/test-utils@1.4.3-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-app-api@1.10.0-next.0
+  - @backstage/core-plugin-api@1.6.0-next.0
+  - @backstage/config@1.0.8
+  - @backstage/theme@0.4.1
+  - @backstage/types@1.1.0
+  - @backstage/plugin-permission-common@0.7.7
+  - @backstage/plugin-permission-react@0.4.15-next.0
+
+## @backstage/plugin-adr@0.6.6-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/integration-react@1.1.18-next.0
+  - @backstage/core-plugin-api@1.6.0-next.0
+  - @backstage/core-components@0.13.5-next.0
+  - @backstage/catalog-model@1.4.1
+  - @backstage/theme@0.4.1
+  - @backstage/plugin-adr-common@0.2.14-next.0
+  - @backstage/plugin-catalog-react@1.8.3-next.0
+  - @backstage/plugin-search-common@1.2.5
+  - @backstage/plugin-search-react@1.6.5-next.0
+
+## @backstage/plugin-adr-backend@0.3.8-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.19.4-next.0
+  - @backstage/integration@1.7.0-next.0
+  - @backstage/backend-plugin-api@0.6.2-next.0
+  - @backstage/catalog-client@1.4.3
+  - @backstage/catalog-model@1.4.1
+  - @backstage/config@1.0.8
+  - @backstage/errors@1.2.1
+  - @backstage/plugin-adr-common@0.2.14-next.0
+  - @backstage/plugin-search-common@1.2.5
+
+## @backstage/plugin-adr-common@0.2.14-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/integration@1.7.0-next.0
+  - @backstage/catalog-model@1.4.1
+  - @backstage/plugin-search-common@1.2.5
+
+## @backstage/plugin-airbrake@0.3.23-next.0
+
+### Patch Changes
+
+- 482bb5c0bbf8: Moved `@types/react` to be a regular dependency
+- Updated dependencies
+  - @backstage/core-plugin-api@1.6.0-next.0
+  - @backstage/core-components@0.13.5-next.0
+  - @backstage/dev-utils@1.0.20-next.0
+  - @backstage/catalog-model@1.4.1
+  - @backstage/test-utils@1.4.3-next.0
+  - @backstage/theme@0.4.1
+  - @backstage/plugin-catalog-react@1.8.3-next.0
+
+## @backstage/plugin-airbrake-backend@0.2.23-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.19.4-next.0
+  - @backstage/backend-plugin-api@0.6.2-next.0
+  - @backstage/config@1.0.8
+
+## @backstage/plugin-allure@0.1.39-next.0
+
+### Patch Changes
+
+- 482bb5c0bbf8: Moved `@types/react` to be a regular dependency
+- Updated dependencies
+  - @backstage/core-plugin-api@1.6.0-next.0
+  - @backstage/core-components@0.13.5-next.0
+  - @backstage/catalog-model@1.4.1
+  - @backstage/theme@0.4.1
+  - @backstage/plugin-catalog-react@1.8.3-next.0
+
+## @backstage/plugin-analytics-module-ga@0.1.33-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-plugin-api@1.6.0-next.0
+  - @backstage/core-components@0.13.5-next.0
+  - @backstage/config@1.0.8
+  - @backstage/theme@0.4.1
+
+## @backstage/plugin-analytics-module-ga4@0.1.4-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-plugin-api@1.6.0-next.0
+  - @backstage/core-components@0.13.5-next.0
+  - @backstage/config@1.0.8
+  - @backstage/theme@0.4.1
+
+## @backstage/plugin-analytics-module-newrelic-browser@0.0.2-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-plugin-api@1.6.0-next.0
+  - @backstage/core-components@0.13.5-next.0
+  - @backstage/config@1.0.8
+
+## @backstage/plugin-apache-airflow@0.2.15-next.0
+
+### Patch Changes
+
+- 482bb5c0bbf8: Moved `@types/react` to be a regular dependency
+- Updated dependencies
+  - @backstage/core-plugin-api@1.6.0-next.0
+  - @backstage/core-components@0.13.5-next.0
+
+## @backstage/plugin-api-docs@0.9.10-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog@1.12.4-next.0
+  - @backstage/core-plugin-api@1.6.0-next.0
+  - @backstage/core-components@0.13.5-next.0
+  - @backstage/catalog-model@1.4.1
+  - @backstage/theme@0.4.1
+  - @backstage/plugin-catalog-react@1.8.3-next.0
+
+## @backstage/plugin-api-docs-module-protoc-gen-doc@0.1.3-next.0
+
+### Patch Changes
+
+- 482bb5c0bbf8: Moved `@types/react` to be a regular dependency
+
+## @backstage/plugin-apollo-explorer@0.1.15-next.0
+
+### Patch Changes
+
+- 482bb5c0bbf8: Moved `@types/react` to be a regular dependency
+- Updated dependencies
+  - @backstage/core-plugin-api@1.6.0-next.0
+  - @backstage/core-components@0.13.5-next.0
+  - @backstage/theme@0.4.1
+
+## @backstage/plugin-app-backend@0.3.50-next.0
+
+### Patch Changes
+
+- cfc3ca6ce060: Changes needed to support MySQL
+- Updated dependencies
+  - @backstage/backend-common@0.19.4-next.0
+  - @backstage/config-loader@1.5.0-next.0
+  - @backstage/backend-plugin-api@0.6.2-next.0
+  - @backstage/config@1.0.8
+  - @backstage/types@1.1.0
+  - @backstage/plugin-app-node@0.1.2-next.0
+
+## @backstage/plugin-app-node@0.1.2-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@0.6.2-next.0
+
+## @backstage/plugin-auth-backend@0.18.8-next.0
+
+### Patch Changes
+
+- 7944d43f4790: Added `authPlugin` export for the new backend system. The plugin does not include any built-in auth providers, they must instead be added by installing additional modules, for example `authModuleGoogleProvider` from `@backstage/plugin-auth-backend-module-google-provider`.
+- 8513cd7d00e3: Deprecated several exports that are now available from `@backstage/plugin-auth-node` instead.
+- 7944d43f4790: Added the ability to disable the built-in auth providers by passing `disableDefaultProviderFactories` to `createRouter`.
+- 7944d43f4790: The algorithm used when generating Backstage tokens can be configured via `auth.identityTokenAlgorithm`.
+- Updated dependencies
+  - @backstage/plugin-auth-backend-module-gcp-iap-provider@0.1.0-next.0
+  - @backstage/plugin-auth-node@0.3.0-next.0
+  - @backstage/backend-common@0.19.4-next.0
+  - @backstage/plugin-auth-backend-module-google-provider@0.1.0-next.0
+  - @backstage/plugin-auth-backend-module-github-provider@0.1.0-next.0
+  - @backstage/backend-plugin-api@0.6.2-next.0
+  - @backstage/catalog-client@1.4.3
+  - @backstage/catalog-model@1.4.1
+  - @backstage/config@1.0.8
+  - @backstage/errors@1.2.1
+  - @backstage/types@1.1.0
+  - @backstage/plugin-catalog-node@1.4.3-next.0
+
+## @backstage/plugin-azure-devops@0.3.5-next.0
+
+### Patch Changes
+
+- 482bb5c0bbf8: Moved `@types/react` to be a regular dependency
+- Updated dependencies
+  - @backstage/core-plugin-api@1.6.0-next.0
+  - @backstage/core-components@0.13.5-next.0
+  - @backstage/catalog-model@1.4.1
+  - @backstage/errors@1.2.1
+  - @backstage/theme@0.4.1
+  - @backstage/plugin-azure-devops-common@0.3.0
+  - @backstage/plugin-catalog-react@1.8.3-next.0
+
+## @backstage/plugin-azure-devops-backend@0.3.29-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.19.4-next.0
+  - @backstage/backend-plugin-api@0.6.2-next.0
+  - @backstage/config@1.0.8
+  - @backstage/plugin-azure-devops-common@0.3.0
+
+## @backstage/plugin-azure-sites@0.1.12-next.0
+
+### Patch Changes
+
+- 482bb5c0bbf8: Moved `@types/react` to be a regular dependency
+- Updated dependencies
+  - @backstage/core-plugin-api@1.6.0-next.0
+  - @backstage/core-components@0.13.5-next.0
+  - @backstage/catalog-model@1.4.1
+  - @backstage/theme@0.4.1
+  - @backstage/plugin-azure-sites-common@0.1.0
+  - @backstage/plugin-catalog-react@1.8.3-next.0
+
+## @backstage/plugin-azure-sites-backend@0.1.12-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.19.4-next.0
+  - @backstage/config@1.0.8
+  - @backstage/plugin-azure-sites-common@0.1.0
+
+## @backstage/plugin-badges@0.2.47-next.0
+
+### Patch Changes
+
+- 482bb5c0bbf8: Moved `@types/react` to be a regular dependency
+- Updated dependencies
+  - @backstage/core-plugin-api@1.6.0-next.0
+  - @backstage/core-components@0.13.5-next.0
+  - @backstage/catalog-model@1.4.1
+  - @backstage/errors@1.2.1
+  - @backstage/theme@0.4.1
+  - @backstage/plugin-catalog-react@1.8.3-next.0
+
+## @backstage/plugin-badges-backend@0.2.5-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-auth-node@0.3.0-next.0
+  - @backstage/backend-common@0.19.4-next.0
+  - @backstage/backend-plugin-api@0.6.2-next.0
+  - @backstage/catalog-client@1.4.3
+  - @backstage/catalog-model@1.4.1
+  - @backstage/config@1.0.8
+  - @backstage/errors@1.2.1
+
+## @backstage/plugin-bazaar@0.2.15-next.0
+
+### Patch Changes
+
+- 482bb5c0bbf8: Moved `@types/react` to be a regular dependency
+- Updated dependencies
+  - @backstage/plugin-catalog@1.12.4-next.0
+  - @backstage/cli@0.22.12-next.0
+  - @backstage/core-plugin-api@1.6.0-next.0
+  - @backstage/core-components@0.13.5-next.0
+  - @backstage/catalog-client@1.4.3
+  - @backstage/catalog-model@1.4.1
+  - @backstage/errors@1.2.1
+  - @backstage/theme@0.4.1
+  - @backstage/plugin-catalog-react@1.8.3-next.0
+
+## @backstage/plugin-bazaar-backend@0.2.13-next.0
+
+### Patch Changes
+
+- cfc3ca6ce060: Changes needed to support MySQL
+- Updated dependencies
+  - @backstage/plugin-auth-node@0.3.0-next.0
+  - @backstage/backend-common@0.19.4-next.0
+  - @backstage/backend-plugin-api@0.6.2-next.0
+  - @backstage/config@1.0.8
+  - @backstage/errors@1.2.1
+
+## @backstage/plugin-bitbucket-cloud-common@0.2.11-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/integration@1.7.0-next.0
+
+## @backstage/plugin-bitrise@0.1.50-next.0
+
+### Patch Changes
+
+- 482bb5c0bbf8: Moved `@types/react` to be a regular dependency
+- Updated dependencies
+  - @backstage/core-plugin-api@1.6.0-next.0
+  - @backstage/core-components@0.13.5-next.0
+  - @backstage/catalog-model@1.4.1
+  - @backstage/theme@0.4.1
+  - @backstage/plugin-catalog-react@1.8.3-next.0
+
+## @backstage/plugin-catalog@1.12.4-next.0
+
+### Patch Changes
+
+- 832eef72485b: Added title to props for `Has<kind>Cards`.
+- 163a41035e42: Fixed an issue where `EntitySwitch` was preventing the display of entity errors.
+- Updated dependencies
+  - @backstage/integration-react@1.1.18-next.0
+  - @backstage/core-plugin-api@1.6.0-next.0
+  - @backstage/core-components@0.13.5-next.0
+  - @backstage/catalog-client@1.4.3
+  - @backstage/catalog-model@1.4.1
+  - @backstage/errors@1.2.1
+  - @backstage/theme@0.4.1
+  - @backstage/types@1.1.0
+  - @backstage/plugin-catalog-common@1.0.15
+  - @backstage/plugin-catalog-react@1.8.3-next.0
+  - @backstage/plugin-scaffolder-common@1.4.0
+  - @backstage/plugin-search-common@1.2.5
+  - @backstage/plugin-search-react@1.6.5-next.0
+
+## @backstage/plugin-catalog-backend@1.12.2-next.0
+
+### Patch Changes
+
+- 149361e81622: Fix to the `limit` parameter on entity queries.
+- 0198aa596fd9: Fixed a link to the frontend Backstage plugin that had pointed to itself.
+- 41d1b2d628ea: Fix OpenAPI schema for the facets endpoint
+- cfc3ca6ce060: Changes needed to support MySQL
+- Updated dependencies
+  - @backstage/plugin-auth-node@0.3.0-next.0
+  - @backstage/backend-common@0.19.4-next.0
+  - @backstage/integration@1.7.0-next.0
+  - @backstage/backend-tasks@0.5.7-next.0
+  - @backstage/backend-openapi-utils@0.0.3
+  - @backstage/backend-plugin-api@0.6.2-next.0
+  - @backstage/catalog-client@1.4.3
+  - @backstage/catalog-model@1.4.1
+  - @backstage/config@1.0.8
+  - @backstage/errors@1.2.1
+  - @backstage/types@1.1.0
+  - @backstage/plugin-catalog-common@1.0.15
+  - @backstage/plugin-catalog-node@1.4.3-next.0
+  - @backstage/plugin-events-node@0.2.11-next.0
+  - @backstage/plugin-permission-common@0.7.7
+  - @backstage/plugin-permission-node@0.7.13-next.0
+  - @backstage/plugin-scaffolder-common@1.4.0
+  - @backstage/plugin-search-backend-module-catalog@0.1.6-next.0
+  - @backstage/plugin-search-common@1.2.5
+
+## @backstage/plugin-catalog-backend-module-aws@0.2.5-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.19.4-next.0
+  - @backstage/integration@1.7.0-next.0
+  - @backstage/backend-tasks@0.5.7-next.0
+  - @backstage/backend-plugin-api@0.6.2-next.0
+  - @backstage/catalog-model@1.4.1
+  - @backstage/config@1.0.8
+  - @backstage/errors@1.2.1
+  - @backstage/integration-aws-node@0.1.5
+  - @backstage/types@1.1.0
+  - @backstage/plugin-catalog-common@1.0.15
+  - @backstage/plugin-catalog-node@1.4.3-next.0
+  - @backstage/plugin-kubernetes-common@0.6.5
+
+## @backstage/plugin-catalog-backend-module-azure@0.1.21-next.0
+
+### Patch Changes
+
+- 94f96508491d: Improve consistency of results from the `AzureDevOpsEntityProvider`.
+- 5f1a92b9f19f: Use `DefaultAzureDevOpsCredentialsProvider` to retrieve credentials for Azure DevOps.
+- 044b4f2fb1e3: Remove duplications from Azure search before committing the new locations to the catalog.
+- Updated dependencies
+  - @backstage/backend-common@0.19.4-next.0
+  - @backstage/integration@1.7.0-next.0
+  - @backstage/backend-tasks@0.5.7-next.0
+  - @backstage/backend-plugin-api@0.6.2-next.0
+  - @backstage/catalog-model@1.4.1
+  - @backstage/config@1.0.8
+  - @backstage/errors@1.2.1
+  - @backstage/types@1.1.0
+  - @backstage/plugin-catalog-common@1.0.15
+  - @backstage/plugin-catalog-node@1.4.3-next.0
+
+## @backstage/plugin-catalog-backend-module-bitbucket@0.2.17-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.19.4-next.0
+  - @backstage/integration@1.7.0-next.0
+  - @backstage/catalog-model@1.4.1
+  - @backstage/config@1.0.8
+  - @backstage/errors@1.2.1
+  - @backstage/types@1.1.0
+  - @backstage/plugin-bitbucket-cloud-common@0.2.11-next.0
+  - @backstage/plugin-catalog-node@1.4.3-next.0
+
+## @backstage/plugin-catalog-backend-module-bitbucket-cloud@0.1.17-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.19.4-next.0
+  - @backstage/integration@1.7.0-next.0
+  - @backstage/backend-tasks@0.5.7-next.0
+  - @backstage/backend-plugin-api@0.6.2-next.0
+  - @backstage/catalog-client@1.4.3
+  - @backstage/catalog-model@1.4.1
+  - @backstage/config@1.0.8
+  - @backstage/plugin-bitbucket-cloud-common@0.2.11-next.0
+  - @backstage/plugin-catalog-common@1.0.15
+  - @backstage/plugin-catalog-node@1.4.3-next.0
+  - @backstage/plugin-events-node@0.2.11-next.0
+
+## @backstage/plugin-catalog-backend-module-bitbucket-server@0.1.15-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.19.4-next.0
+  - @backstage/integration@1.7.0-next.0
+  - @backstage/backend-tasks@0.5.7-next.0
+  - @backstage/backend-plugin-api@0.6.2-next.0
+  - @backstage/catalog-model@1.4.1
+  - @backstage/config@1.0.8
+  - @backstage/errors@1.2.1
+  - @backstage/plugin-catalog-node@1.4.3-next.0
+
+## @backstage/plugin-catalog-backend-module-gcp@0.1.2-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.19.4-next.0
+  - @backstage/backend-tasks@0.5.7-next.0
+  - @backstage/backend-plugin-api@0.6.2-next.0
+  - @backstage/config@1.0.8
+  - @backstage/plugin-catalog-node@1.4.3-next.0
+  - @backstage/plugin-kubernetes-common@0.6.5
+
+## @backstage/plugin-catalog-backend-module-gerrit@0.1.18-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.19.4-next.0
+  - @backstage/integration@1.7.0-next.0
+  - @backstage/backend-tasks@0.5.7-next.0
+  - @backstage/backend-plugin-api@0.6.2-next.0
+  - @backstage/catalog-model@1.4.1
+  - @backstage/config@1.0.8
+  - @backstage/errors@1.2.1
+  - @backstage/plugin-catalog-node@1.4.3-next.0
+
+## @backstage/plugin-catalog-backend-module-github@0.3.5-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-backend@1.12.2-next.0
+  - @backstage/backend-common@0.19.4-next.0
+  - @backstage/integration@1.7.0-next.0
+  - @backstage/backend-tasks@0.5.7-next.0
+  - @backstage/backend-plugin-api@0.6.2-next.0
+  - @backstage/catalog-client@1.4.3
+  - @backstage/catalog-model@1.4.1
+  - @backstage/config@1.0.8
+  - @backstage/errors@1.2.1
+  - @backstage/types@1.1.0
+  - @backstage/plugin-catalog-common@1.0.15
+  - @backstage/plugin-catalog-node@1.4.3-next.0
+  - @backstage/plugin-events-node@0.2.11-next.0
+
+## @backstage/plugin-catalog-backend-module-gitlab@0.2.6-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.19.4-next.0
+  - @backstage/integration@1.7.0-next.0
+  - @backstage/backend-tasks@0.5.7-next.0
+  - @backstage/backend-plugin-api@0.6.2-next.0
+  - @backstage/catalog-model@1.4.1
+  - @backstage/config@1.0.8
+  - @backstage/errors@1.2.1
+  - @backstage/types@1.1.0
+  - @backstage/plugin-catalog-node@1.4.3-next.0
+
+## @backstage/plugin-catalog-backend-module-incremental-ingestion@0.4.3-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-backend@1.12.2-next.0
+  - @backstage/backend-common@0.19.4-next.0
+  - @backstage/backend-tasks@0.5.7-next.0
+  - @backstage/backend-plugin-api@0.6.2-next.0
+  - @backstage/catalog-model@1.4.1
+  - @backstage/config@1.0.8
+  - @backstage/errors@1.2.1
+  - @backstage/plugin-catalog-node@1.4.3-next.0
+  - @backstage/plugin-events-node@0.2.11-next.0
+  - @backstage/plugin-permission-common@0.7.7
+
+## @backstage/plugin-catalog-backend-module-ldap@0.5.17-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-tasks@0.5.7-next.0
+  - @backstage/catalog-model@1.4.1
+  - @backstage/config@1.0.8
+  - @backstage/errors@1.2.1
+  - @backstage/types@1.1.0
+  - @backstage/plugin-catalog-common@1.0.15
+  - @backstage/plugin-catalog-node@1.4.3-next.0
+
+## @backstage/plugin-catalog-backend-module-msgraph@0.5.9-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.19.4-next.0
+  - @backstage/backend-tasks@0.5.7-next.0
+  - @backstage/backend-plugin-api@0.6.2-next.0
+  - @backstage/catalog-model@1.4.1
+  - @backstage/config@1.0.8
+  - @backstage/plugin-catalog-common@1.0.15
+  - @backstage/plugin-catalog-node@1.4.3-next.0
+
+## @backstage/plugin-catalog-backend-module-openapi@0.1.16-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-backend@1.12.2-next.0
+  - @backstage/backend-common@0.19.4-next.0
+  - @backstage/integration@1.7.0-next.0
+  - @backstage/catalog-model@1.4.1
+  - @backstage/config@1.0.8
+  - @backstage/types@1.1.0
+  - @backstage/plugin-catalog-common@1.0.15
+  - @backstage/plugin-catalog-node@1.4.3-next.0
+
+## @backstage/plugin-catalog-backend-module-puppetdb@0.1.7-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.19.4-next.0
+  - @backstage/backend-tasks@0.5.7-next.0
+  - @backstage/backend-plugin-api@0.6.2-next.0
+  - @backstage/catalog-model@1.4.1
+  - @backstage/config@1.0.8
+  - @backstage/errors@1.2.1
+  - @backstage/types@1.1.0
+  - @backstage/plugin-catalog-node@1.4.3-next.0
+
+## @backstage/plugin-catalog-backend-module-unprocessed@0.2.2-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-auth-node@0.3.0-next.0
+  - @backstage/backend-plugin-api@0.6.2-next.0
+  - @backstage/catalog-model@1.4.1
+
+## @backstage/plugin-catalog-graph@0.2.35-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-plugin-api@1.6.0-next.0
+  - @backstage/core-components@0.13.5-next.0
+  - @backstage/catalog-client@1.4.3
+  - @backstage/catalog-model@1.4.1
+  - @backstage/theme@0.4.1
+  - @backstage/types@1.1.0
+  - @backstage/plugin-catalog-react@1.8.3-next.0
+
+## @backstage/plugin-catalog-import@0.9.13-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/integration-react@1.1.18-next.0
+  - @backstage/integration@1.7.0-next.0
+  - @backstage/core-plugin-api@1.6.0-next.0
+  - @backstage/core-components@0.13.5-next.0
+  - @backstage/catalog-client@1.4.3
+  - @backstage/catalog-model@1.4.1
+  - @backstage/config@1.0.8
+  - @backstage/errors@1.2.1
+  - @backstage/plugin-catalog-common@1.0.15
+  - @backstage/plugin-catalog-react@1.8.3-next.0
+
+## @backstage/plugin-catalog-node@1.4.3-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@0.6.2-next.0
+  - @backstage/catalog-client@1.4.3
+  - @backstage/catalog-model@1.4.1
+  - @backstage/errors@1.2.1
+  - @backstage/types@1.1.0
+  - @backstage/plugin-catalog-common@1.0.15
+
+## @backstage/plugin-catalog-react@1.8.3-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/integration@1.7.0-next.0
+  - @backstage/core-plugin-api@1.6.0-next.0
+  - @backstage/core-components@0.13.5-next.0
+  - @backstage/catalog-client@1.4.3
+  - @backstage/catalog-model@1.4.1
+  - @backstage/errors@1.2.1
+  - @backstage/theme@0.4.1
+  - @backstage/types@1.1.0
+  - @backstage/version-bridge@1.0.4
+  - @backstage/plugin-catalog-common@1.0.15
+  - @backstage/plugin-permission-common@0.7.7
+  - @backstage/plugin-permission-react@0.4.15-next.0
+
+## @backstage/plugin-catalog-unprocessed-entities@0.1.3-next.0
+
+### Patch Changes
+
+- 482bb5c0bbf8: Moved `@types/react` to be a regular dependency
+- Updated dependencies
+  - @backstage/core-plugin-api@1.6.0-next.0
+  - @backstage/core-components@0.13.5-next.0
+  - @backstage/catalog-model@1.4.1
+  - @backstage/errors@1.2.1
+  - @backstage/theme@0.4.1
+
+## @backstage/plugin-cicd-statistics@0.1.25-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-plugin-api@1.6.0-next.0
+  - @backstage/catalog-model@1.4.1
+  - @backstage/plugin-catalog-react@1.8.3-next.0
+
+## @backstage/plugin-cicd-statistics-module-gitlab@0.1.19-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-plugin-api@1.6.0-next.0
+  - @backstage/catalog-model@1.4.1
+  - @backstage/plugin-cicd-statistics@0.1.25-next.0
+
+## @backstage/plugin-circleci@0.3.23-next.0
+
+### Patch Changes
+
+- 482bb5c0bbf8: Moved `@types/react` to be a regular dependency
+- Updated dependencies
+  - @backstage/core-plugin-api@1.6.0-next.0
+  - @backstage/core-components@0.13.5-next.0
+  - @backstage/catalog-model@1.4.1
+  - @backstage/theme@0.4.1
+  - @backstage/plugin-catalog-react@1.8.3-next.0
+
+## @backstage/plugin-cloudbuild@0.3.23-next.0
+
+### Patch Changes
+
+- 482bb5c0bbf8: Moved `@types/react` to be a regular dependency
+- Updated dependencies
+  - @backstage/core-plugin-api@1.6.0-next.0
+  - @backstage/core-components@0.13.5-next.0
+  - @backstage/catalog-model@1.4.1
+  - @backstage/theme@0.4.1
+  - @backstage/plugin-catalog-react@1.8.3-next.0
+
+## @backstage/plugin-code-climate@0.1.23-next.0
+
+### Patch Changes
+
+- 482bb5c0bbf8: Moved `@types/react` to be a regular dependency
+- Updated dependencies
+  - @backstage/core-plugin-api@1.6.0-next.0
+  - @backstage/core-components@0.13.5-next.0
+  - @backstage/catalog-model@1.4.1
+  - @backstage/theme@0.4.1
+  - @backstage/plugin-catalog-react@1.8.3-next.0
+
+## @backstage/plugin-code-coverage@0.2.16-next.0
+
+### Patch Changes
+
+- 1d8f4f0a7486: Use fetchApi to ensure authorization is used when fetching code-coverage data
+- Updated dependencies
+  - @backstage/core-plugin-api@1.6.0-next.0
+  - @backstage/core-components@0.13.5-next.0
+  - @backstage/catalog-model@1.4.1
+  - @backstage/config@1.0.8
+  - @backstage/errors@1.2.1
+  - @backstage/theme@0.4.1
+  - @backstage/plugin-catalog-react@1.8.3-next.0
+
+## @backstage/plugin-code-coverage-backend@0.2.16-next.0
+
+### Patch Changes
+
+- 3f1367b956c6: Added support for LCOV coverage reports
+- cfc3ca6ce060: Changes needed to support MySQL
+- Updated dependencies
+  - @backstage/backend-common@0.19.4-next.0
+  - @backstage/integration@1.7.0-next.0
+  - @backstage/catalog-client@1.4.3
+  - @backstage/catalog-model@1.4.1
+  - @backstage/config@1.0.8
+  - @backstage/errors@1.2.1
+
+## @backstage/plugin-codescene@0.1.17-next.0
+
+### Patch Changes
+
+- 482bb5c0bbf8: Moved `@types/react` to be a regular dependency
+- Updated dependencies
+  - @backstage/core-plugin-api@1.6.0-next.0
+  - @backstage/core-components@0.13.5-next.0
+  - @backstage/config@1.0.8
+  - @backstage/errors@1.2.1
+  - @backstage/theme@0.4.1
+
+## @backstage/plugin-config-schema@0.1.45-next.0
+
+### Patch Changes
+
+- 482bb5c0bbf8: Moved `@types/react` to be a regular dependency
+- Updated dependencies
+  - @backstage/core-plugin-api@1.6.0-next.0
+  - @backstage/core-components@0.13.5-next.0
+  - @backstage/config@1.0.8
+  - @backstage/errors@1.2.1
+  - @backstage/theme@0.4.1
+  - @backstage/types@1.1.0
+
+## @backstage/plugin-cost-insights@0.12.12-next.0
+
+### Patch Changes
+
+- a54cd411639e: Updated dependency `@types/pluralize` to `^0.0.30`.
+- Updated dependencies
+  - @backstage/core-plugin-api@1.6.0-next.0
+  - @backstage/core-components@0.13.5-next.0
+  - @backstage/catalog-model@1.4.1
+  - @backstage/config@1.0.8
+  - @backstage/theme@0.4.1
+  - @backstage/plugin-catalog-react@1.8.3-next.0
+  - @backstage/plugin-cost-insights-common@0.1.1
+
+## @backstage/plugin-devtools@0.1.4-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-plugin-api@1.6.0-next.0
+  - @backstage/core-components@0.13.5-next.0
+  - @backstage/errors@1.2.1
+  - @backstage/theme@0.4.1
+  - @backstage/types@1.1.0
+  - @backstage/plugin-devtools-common@0.1.3
+  - @backstage/plugin-permission-react@0.4.15-next.0
+
+## @backstage/plugin-devtools-backend@0.1.5-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-auth-node@0.3.0-next.0
+  - @backstage/backend-common@0.19.4-next.0
+  - @backstage/config-loader@1.5.0-next.0
+  - @backstage/backend-plugin-api@0.6.2-next.0
+  - @backstage/cli-common@0.1.12
+  - @backstage/config@1.0.8
+  - @backstage/errors@1.2.1
+  - @backstage/types@1.1.0
+  - @backstage/plugin-devtools-common@0.1.3
+  - @backstage/plugin-permission-common@0.7.7
+  - @backstage/plugin-permission-node@0.7.13-next.0
+
+## @backstage/plugin-dynatrace@7.0.3-next.0
+
+### Patch Changes
+
+- 482bb5c0bbf8: Moved `@types/react` to be a regular dependency
+- Updated dependencies
+  - @backstage/core-plugin-api@1.6.0-next.0
+  - @backstage/core-components@0.13.5-next.0
+  - @backstage/catalog-model@1.4.1
+  - @backstage/theme@0.4.1
+  - @backstage/plugin-catalog-react@1.8.3-next.0
+
+## @backstage/plugin-entity-feedback@0.2.6-next.0
+
+### Patch Changes
+
+- 5e2e06db747a: Improve README to note that Backstage identity is required to be configured
+- Updated dependencies
+  - @backstage/core-plugin-api@1.6.0-next.0
+  - @backstage/core-components@0.13.5-next.0
+  - @backstage/catalog-model@1.4.1
+  - @backstage/errors@1.2.1
+  - @backstage/theme@0.4.1
+  - @backstage/plugin-catalog-react@1.8.3-next.0
+  - @backstage/plugin-entity-feedback-common@0.1.2
+
+## @backstage/plugin-entity-feedback-backend@0.1.8-next.0
+
+### Patch Changes
+
+- 740155e8e976: Improve backend logging if method calls fail
+- Updated dependencies
+  - @backstage/plugin-auth-node@0.3.0-next.0
+  - @backstage/backend-common@0.19.4-next.0
+  - @backstage/backend-plugin-api@0.6.2-next.0
+  - @backstage/catalog-client@1.4.3
+  - @backstage/catalog-model@1.4.1
+  - @backstage/config@1.0.8
+  - @backstage/plugin-entity-feedback-common@0.1.2
+
+## @backstage/plugin-entity-validation@0.1.8-next.0
+
+### Patch Changes
+
+- 482bb5c0bbf8: Moved `@types/react` to be a regular dependency
+- Updated dependencies
+  - @backstage/core-plugin-api@1.6.0-next.0
+  - @backstage/core-components@0.13.5-next.0
+  - @backstage/catalog-client@1.4.3
+  - @backstage/catalog-model@1.4.1
+  - @backstage/errors@1.2.1
+  - @backstage/theme@0.4.1
+  - @backstage/plugin-catalog-common@1.0.15
+  - @backstage/plugin-catalog-react@1.8.3-next.0
+
+## @backstage/plugin-events-backend@0.2.11-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.19.4-next.0
+  - @backstage/backend-plugin-api@0.6.2-next.0
+  - @backstage/config@1.0.8
+  - @backstage/plugin-events-node@0.2.11-next.0
+
+## @backstage/plugin-events-backend-module-aws-sqs@0.2.5-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.19.4-next.0
+  - @backstage/backend-tasks@0.5.7-next.0
+  - @backstage/backend-plugin-api@0.6.2-next.0
+  - @backstage/config@1.0.8
+  - @backstage/types@1.1.0
+  - @backstage/plugin-events-node@0.2.11-next.0
+
+## @backstage/plugin-events-backend-module-azure@0.1.12-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@0.6.2-next.0
+  - @backstage/plugin-events-node@0.2.11-next.0
+
+## @backstage/plugin-events-backend-module-bitbucket-cloud@0.1.12-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@0.6.2-next.0
+  - @backstage/plugin-events-node@0.2.11-next.0
+
+## @backstage/plugin-events-backend-module-gerrit@0.1.12-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@0.6.2-next.0
+  - @backstage/plugin-events-node@0.2.11-next.0
+
+## @backstage/plugin-events-backend-module-github@0.1.12-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@0.6.2-next.0
+  - @backstage/config@1.0.8
+  - @backstage/plugin-events-node@0.2.11-next.0
+
+## @backstage/plugin-events-backend-module-gitlab@0.1.12-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@0.6.2-next.0
+  - @backstage/config@1.0.8
+  - @backstage/plugin-events-node@0.2.11-next.0
+
+## @backstage/plugin-events-backend-test-utils@0.1.12-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-events-node@0.2.11-next.0
+
+## @backstage/plugin-events-node@0.2.11-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@0.6.2-next.0
+
+## @backstage/plugin-explore@0.4.9-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-plugin-api@1.6.0-next.0
+  - @backstage/core-components@0.13.5-next.0
+  - @backstage/catalog-model@1.4.1
+  - @backstage/errors@1.2.1
+  - @backstage/theme@0.4.1
+  - @backstage/plugin-catalog-react@1.8.3-next.0
+  - @backstage/plugin-explore-common@0.0.1
+  - @backstage/plugin-explore-react@0.0.31-next.0
+  - @backstage/plugin-search-common@1.2.5
+  - @backstage/plugin-search-react@1.6.5-next.0
+
+## @backstage/plugin-explore-backend@0.0.12-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.19.4-next.0
+  - @backstage/config@1.0.8
+  - @backstage/types@1.1.0
+  - @backstage/plugin-explore-common@0.0.1
+  - @backstage/plugin-search-backend-module-explore@0.1.6-next.0
+  - @backstage/plugin-search-common@1.2.5
+
+## @backstage/plugin-explore-react@0.0.31-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-plugin-api@1.6.0-next.0
+  - @backstage/plugin-explore-common@0.0.1
+
+## @backstage/plugin-firehydrant@0.2.7-next.0
+
+### Patch Changes
+
+- 482bb5c0bbf8: Moved `@types/react` to be a regular dependency
+- Updated dependencies
+  - @backstage/core-plugin-api@1.6.0-next.0
+  - @backstage/core-components@0.13.5-next.0
+  - @backstage/catalog-model@1.4.1
+  - @backstage/theme@0.4.1
+  - @backstage/plugin-catalog-react@1.8.3-next.0
+
+## @backstage/plugin-fossa@0.2.55-next.0
+
+### Patch Changes
+
+- 482bb5c0bbf8: Moved `@types/react` to be a regular dependency
+- Updated dependencies
+  - @backstage/core-plugin-api@1.6.0-next.0
+  - @backstage/core-components@0.13.5-next.0
+  - @backstage/catalog-model@1.4.1
+  - @backstage/errors@1.2.1
+  - @backstage/theme@0.4.1
+  - @backstage/plugin-catalog-react@1.8.3-next.0
+
+## @backstage/plugin-gcalendar@0.3.18-next.0
+
+### Patch Changes
+
+- 482bb5c0bbf8: Moved `@types/react` to be a regular dependency
+- Updated dependencies
+  - @backstage/core-plugin-api@1.6.0-next.0
+  - @backstage/core-components@0.13.5-next.0
+  - @backstage/errors@1.2.1
+  - @backstage/theme@0.4.1
+
+## @backstage/plugin-gcp-projects@0.3.41-next.0
+
+### Patch Changes
+
+- 482bb5c0bbf8: Moved `@types/react` to be a regular dependency
+- Updated dependencies
+  - @backstage/core-plugin-api@1.6.0-next.0
+  - @backstage/core-components@0.13.5-next.0
+  - @backstage/theme@0.4.1
+
+## @backstage/plugin-git-release-manager@0.3.36-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/integration@1.7.0-next.0
+  - @backstage/core-plugin-api@1.6.0-next.0
+  - @backstage/core-components@0.13.5-next.0
+  - @backstage/theme@0.4.1
+
+## @backstage/plugin-github-actions@0.6.4-next.0
+
+### Patch Changes
+
+- 482bb5c0bbf8: Moved `@types/react` to be a regular dependency
+- Updated dependencies
+  - @backstage/integration-react@1.1.18-next.0
+  - @backstage/integration@1.7.0-next.0
+  - @backstage/core-plugin-api@1.6.0-next.0
+  - @backstage/core-components@0.13.5-next.0
+  - @backstage/catalog-model@1.4.1
+  - @backstage/theme@0.4.1
+  - @backstage/plugin-catalog-react@1.8.3-next.0
+
+## @backstage/plugin-github-deployments@0.1.54-next.0
+
+### Patch Changes
+
+- 482bb5c0bbf8: Moved `@types/react` to be a regular dependency
+- Updated dependencies
+  - @backstage/integration-react@1.1.18-next.0
+  - @backstage/integration@1.7.0-next.0
+  - @backstage/core-plugin-api@1.6.0-next.0
+  - @backstage/core-components@0.13.5-next.0
+  - @backstage/catalog-model@1.4.1
+  - @backstage/errors@1.2.1
+  - @backstage/theme@0.4.1
+  - @backstage/plugin-catalog-react@1.8.3-next.0
+
+## @backstage/plugin-github-issues@0.2.12-next.0
+
+### Patch Changes
+
+- 482bb5c0bbf8: Moved `@types/react` to be a regular dependency
+- Updated dependencies
+  - @backstage/integration@1.7.0-next.0
+  - @backstage/core-plugin-api@1.6.0-next.0
+  - @backstage/core-components@0.13.5-next.0
+  - @backstage/catalog-model@1.4.1
+  - @backstage/errors@1.2.1
+  - @backstage/theme@0.4.1
+  - @backstage/plugin-catalog-react@1.8.3-next.0
+
+## @backstage/plugin-github-pull-requests-board@0.1.17-next.0
+
+### Patch Changes
+
+- 482bb5c0bbf8: Moved `@types/react` to be a regular dependency
+- Updated dependencies
+  - @backstage/integration@1.7.0-next.0
+  - @backstage/core-plugin-api@1.6.0-next.0
+  - @backstage/core-components@0.13.5-next.0
+  - @backstage/catalog-model@1.4.1
+  - @backstage/theme@0.4.1
+  - @backstage/plugin-catalog-react@1.8.3-next.0
+
+## @backstage/plugin-gitops-profiles@0.3.40-next.0
+
+### Patch Changes
+
+- 482bb5c0bbf8: Moved `@types/react` to be a regular dependency
+- Updated dependencies
+  - @backstage/core-plugin-api@1.6.0-next.0
+  - @backstage/core-components@0.13.5-next.0
+  - @backstage/config@1.0.8
+  - @backstage/theme@0.4.1
+
+## @backstage/plugin-gocd@0.1.29-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-plugin-api@1.6.0-next.0
+  - @backstage/core-components@0.13.5-next.0
+  - @backstage/catalog-model@1.4.1
+  - @backstage/errors@1.2.1
+  - @backstage/theme@0.4.1
+  - @backstage/plugin-catalog-react@1.8.3-next.0
+
+## @backstage/plugin-graphiql@0.2.54-next.0
+
+### Patch Changes
+
+- 482bb5c0bbf8: Moved `@types/react` to be a regular dependency
+- Updated dependencies
+  - @backstage/core-plugin-api@1.6.0-next.0
+  - @backstage/core-components@0.13.5-next.0
+  - @backstage/theme@0.4.1
+
+## @backstage/plugin-graphql-backend@0.1.40-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.19.4-next.0
+  - @backstage/config@1.0.8
+  - @backstage/plugin-catalog-graphql@0.3.22
+
+## @backstage/plugin-graphql-voyager@0.1.7-next.0
+
+### Patch Changes
+
+- 482bb5c0bbf8: Moved `@types/react` to be a regular dependency
+- Updated dependencies
+  - @backstage/core-plugin-api@1.6.0-next.0
+  - @backstage/core-components@0.13.5-next.0
+  - @backstage/theme@0.4.1
+
+## @backstage/plugin-home@0.5.7-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-home-react@0.1.3-next.0
+  - @backstage/core-plugin-api@1.6.0-next.0
+  - @backstage/core-components@0.13.5-next.0
+  - @backstage/catalog-model@1.4.1
+  - @backstage/config@1.0.8
+  - @backstage/theme@0.4.1
+  - @backstage/plugin-catalog-react@1.8.3-next.0
+
+## @backstage/plugin-home-react@0.1.3-next.0
+
+### Patch Changes
+
+- 482bb5c0bbf8: Moved `@types/react` to be a regular dependency
+- Updated dependencies
+  - @backstage/core-plugin-api@1.6.0-next.0
+  - @backstage/core-components@0.13.5-next.0
+
+## @backstage/plugin-ilert@0.2.12-next.0
+
+### Patch Changes
+
+- 482bb5c0bbf8: Moved `@types/react` to be a regular dependency
+- Updated dependencies
+  - @backstage/core-plugin-api@1.6.0-next.0
+  - @backstage/core-components@0.13.5-next.0
+  - @backstage/catalog-model@1.4.1
+  - @backstage/errors@1.2.1
+  - @backstage/theme@0.4.1
+  - @backstage/plugin-catalog-react@1.8.3-next.0
+
+## @backstage/plugin-jenkins@0.8.5-next.0
+
+### Patch Changes
+
+- 482bb5c0bbf8: Moved `@types/react` to be a regular dependency
+- Updated dependencies
+  - @backstage/core-plugin-api@1.6.0-next.0
+  - @backstage/core-components@0.13.5-next.0
+  - @backstage/catalog-model@1.4.1
+  - @backstage/errors@1.2.1
+  - @backstage/theme@0.4.1
+  - @backstage/plugin-catalog-react@1.8.3-next.0
+  - @backstage/plugin-jenkins-common@0.1.18
+
+## @backstage/plugin-jenkins-backend@0.2.5-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-auth-node@0.3.0-next.0
+  - @backstage/backend-common@0.19.4-next.0
+  - @backstage/catalog-client@1.4.3
+  - @backstage/catalog-model@1.4.1
+  - @backstage/config@1.0.8
+  - @backstage/errors@1.2.1
+  - @backstage/plugin-jenkins-common@0.1.18
+  - @backstage/plugin-permission-common@0.7.7
+  - @backstage/plugin-permission-node@0.7.13-next.0
+
+## @backstage/plugin-kafka@0.3.23-next.0
+
+### Patch Changes
+
+- 482bb5c0bbf8: Moved `@types/react` to be a regular dependency
+- Updated dependencies
+  - @backstage/core-plugin-api@1.6.0-next.0
+  - @backstage/core-components@0.13.5-next.0
+  - @backstage/catalog-model@1.4.1
+  - @backstage/config@1.0.8
+  - @backstage/theme@0.4.1
+  - @backstage/plugin-catalog-react@1.8.3-next.0
+
+## @backstage/plugin-kafka-backend@0.2.43-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.19.4-next.0
+  - @backstage/backend-plugin-api@0.6.2-next.0
+  - @backstage/catalog-model@1.4.1
+  - @backstage/config@1.0.8
+  - @backstage/errors@1.2.1
+
+## @backstage/plugin-kubernetes@0.10.2-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-plugin-api@1.6.0-next.0
+  - @backstage/core-components@0.13.5-next.0
+  - @backstage/catalog-model@1.4.1
+  - @backstage/config@1.0.8
+  - @backstage/errors@1.2.1
+  - @backstage/theme@0.4.1
+  - @backstage/plugin-catalog-react@1.8.3-next.0
+  - @backstage/plugin-kubernetes-common@0.6.5
+
+## @backstage/plugin-kubernetes-backend@0.11.5-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-auth-node@0.3.0-next.0
+  - @backstage/backend-common@0.19.4-next.0
+  - @backstage/backend-plugin-api@0.6.2-next.0
+  - @backstage/catalog-client@1.4.3
+  - @backstage/catalog-model@1.4.1
+  - @backstage/config@1.0.8
+  - @backstage/errors@1.2.1
+  - @backstage/integration-aws-node@0.1.5
+  - @backstage/plugin-catalog-node@1.4.3-next.0
+  - @backstage/plugin-kubernetes-common@0.6.5
+  - @backstage/plugin-permission-common@0.7.7
+  - @backstage/plugin-permission-node@0.7.13-next.0
+
+## @backstage/plugin-lighthouse@0.4.8-next.0
+
+### Patch Changes
+
+- 482bb5c0bbf8: Moved `@types/react` to be a regular dependency
+- Updated dependencies
+  - @backstage/core-plugin-api@1.6.0-next.0
+  - @backstage/core-components@0.13.5-next.0
+  - @backstage/catalog-model@1.4.1
+  - @backstage/config@1.0.8
+  - @backstage/theme@0.4.1
+  - @backstage/plugin-catalog-react@1.8.3-next.0
+  - @backstage/plugin-lighthouse-common@0.1.2
+
+## @backstage/plugin-lighthouse-backend@0.2.6-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.19.4-next.0
+  - @backstage/backend-tasks@0.5.7-next.0
+  - @backstage/backend-plugin-api@0.6.2-next.0
+  - @backstage/catalog-client@1.4.3
+  - @backstage/catalog-model@1.4.1
+  - @backstage/config@1.0.8
+  - @backstage/types@1.1.0
+  - @backstage/plugin-catalog-node@1.4.3-next.0
+  - @backstage/plugin-lighthouse-common@0.1.2
+
+## @backstage/plugin-linguist@0.1.8-next.0
+
+### Patch Changes
+
+- 482bb5c0bbf8: Moved `@types/react` to be a regular dependency
+- Updated dependencies
+  - @backstage/core-plugin-api@1.6.0-next.0
+  - @backstage/core-components@0.13.5-next.0
+  - @backstage/catalog-model@1.4.1
+  - @backstage/errors@1.2.1
+  - @backstage/theme@0.4.1
+  - @backstage/plugin-catalog-react@1.8.3-next.0
+  - @backstage/plugin-linguist-common@0.1.1
+
+## @backstage/plugin-linguist-backend@0.4.2-next.0
+
+### Patch Changes
+
+- b2de501bda31: When creating the router using `createRouterFromConfig` or using the plugin for the new backend system the `linguist.useSourceLocation` configuration is now optional.
+- cfc3ca6ce060: Changes needed to support MySQL
+- Updated dependencies
+  - @backstage/plugin-auth-node@0.3.0-next.0
+  - @backstage/backend-common@0.19.4-next.0
+  - @backstage/backend-tasks@0.5.7-next.0
+  - @backstage/backend-plugin-api@0.6.2-next.0
+  - @backstage/catalog-client@1.4.3
+  - @backstage/catalog-model@1.4.1
+  - @backstage/config@1.0.8
+  - @backstage/errors@1.2.1
+  - @backstage/types@1.1.0
+  - @backstage/plugin-catalog-node@1.4.3-next.0
+  - @backstage/plugin-linguist-common@0.1.1
+
+## @backstage/plugin-microsoft-calendar@0.1.7-next.0
+
+### Patch Changes
+
+- 482bb5c0bbf8: Moved `@types/react` to be a regular dependency
+- Updated dependencies
+  - @backstage/core-plugin-api@1.6.0-next.0
+  - @backstage/core-components@0.13.5-next.0
+  - @backstage/errors@1.2.1
+  - @backstage/theme@0.4.1
+
+## @backstage/plugin-newrelic@0.3.40-next.0
+
+### Patch Changes
+
+- 482bb5c0bbf8: Moved `@types/react` to be a regular dependency
+- Updated dependencies
+  - @backstage/core-plugin-api@1.6.0-next.0
+  - @backstage/core-components@0.13.5-next.0
+  - @backstage/theme@0.4.1
+
+## @backstage/plugin-newrelic-dashboard@0.2.16-next.0
+
+### Patch Changes
+
+- 482bb5c0bbf8: Moved `@types/react` to be a regular dependency
+- Updated dependencies
+  - @backstage/core-plugin-api@1.6.0-next.0
+  - @backstage/core-components@0.13.5-next.0
+  - @backstage/catalog-model@1.4.1
+  - @backstage/errors@1.2.1
+  - @backstage/plugin-catalog-react@1.8.3-next.0
+
+## @backstage/plugin-nomad@0.1.4-next.0
+
+### Patch Changes
+
+- 482bb5c0bbf8: Moved `@types/react` to be a regular dependency
+- Updated dependencies
+  - @backstage/core-plugin-api@1.6.0-next.0
+  - @backstage/core-components@0.13.5-next.0
+  - @backstage/catalog-model@1.4.1
+  - @backstage/config@1.0.8
+  - @backstage/theme@0.4.1
+  - @backstage/plugin-catalog-react@1.8.3-next.0
+
+## @backstage/plugin-nomad-backend@0.1.4-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.19.4-next.0
+  - @backstage/config@1.0.8
+  - @backstage/errors@1.2.1
+
+## @backstage/plugin-octopus-deploy@0.2.5-next.0
+
+### Patch Changes
+
+- 482bb5c0bbf8: Moved `@types/react` to be a regular dependency
+- Updated dependencies
+  - @backstage/core-plugin-api@1.6.0-next.0
+  - @backstage/core-components@0.13.5-next.0
+  - @backstage/catalog-model@1.4.1
+  - @backstage/theme@0.4.1
+  - @backstage/plugin-catalog-react@1.8.3-next.0
+
+## @backstage/plugin-org@0.6.13-next.0
+
+### Patch Changes
+
+- 482bb5c0bbf8: Moved `@types/react` to be a regular dependency
+- Updated dependencies
+  - @backstage/core-plugin-api@1.6.0-next.0
+  - @backstage/core-components@0.13.5-next.0
+  - @backstage/catalog-model@1.4.1
+  - @backstage/theme@0.4.1
+  - @backstage/plugin-catalog-react@1.8.3-next.0
+
+## @backstage/plugin-org-react@0.1.12-next.0
+
+### Patch Changes
+
+- 482bb5c0bbf8: Moved `@types/react` to be a regular dependency
+- Updated dependencies
+  - @backstage/core-plugin-api@1.6.0-next.0
+  - @backstage/core-components@0.13.5-next.0
+  - @backstage/catalog-client@1.4.3
+  - @backstage/catalog-model@1.4.1
+  - @backstage/theme@0.4.1
+  - @backstage/plugin-catalog-react@1.8.3-next.0
+
+## @backstage/plugin-pagerduty@0.6.4-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-home-react@0.1.3-next.0
+  - @backstage/core-plugin-api@1.6.0-next.0
+  - @backstage/core-components@0.13.5-next.0
+  - @backstage/catalog-model@1.4.1
+  - @backstage/errors@1.2.1
+  - @backstage/theme@0.4.1
+  - @backstage/plugin-catalog-react@1.8.3-next.0
+
+## @backstage/plugin-periskop@0.1.21-next.0
+
+### Patch Changes
+
+- 482bb5c0bbf8: Moved `@types/react` to be a regular dependency
+- Updated dependencies
+  - @backstage/core-plugin-api@1.6.0-next.0
+  - @backstage/core-components@0.13.5-next.0
+  - @backstage/catalog-model@1.4.1
+  - @backstage/errors@1.2.1
+  - @backstage/theme@0.4.1
+  - @backstage/plugin-catalog-react@1.8.3-next.0
+
+## @backstage/plugin-periskop-backend@0.1.21-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.19.4-next.0
+  - @backstage/backend-plugin-api@0.6.2-next.0
+  - @backstage/config@1.0.8
+
+## @backstage/plugin-permission-backend@0.5.25-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-auth-node@0.3.0-next.0
+  - @backstage/backend-common@0.19.4-next.0
+  - @backstage/backend-plugin-api@0.6.2-next.0
+  - @backstage/config@1.0.8
+  - @backstage/errors@1.2.1
+  - @backstage/plugin-permission-common@0.7.7
+  - @backstage/plugin-permission-node@0.7.13-next.0
+
+## @backstage/plugin-permission-node@0.7.13-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-auth-node@0.3.0-next.0
+  - @backstage/backend-common@0.19.4-next.0
+  - @backstage/backend-plugin-api@0.6.2-next.0
+  - @backstage/config@1.0.8
+  - @backstage/errors@1.2.1
+  - @backstage/plugin-permission-common@0.7.7
+
+## @backstage/plugin-permission-react@0.4.15-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-plugin-api@1.6.0-next.0
+  - @backstage/config@1.0.8
+  - @backstage/plugin-permission-common@0.7.7
+
+## @backstage/plugin-playlist@0.1.15-next.0
+
+### Patch Changes
+
+- 482bb5c0bbf8: Moved `@types/react` to be a regular dependency
+- Updated dependencies
+  - @backstage/core-plugin-api@1.6.0-next.0
+  - @backstage/core-components@0.13.5-next.0
+  - @backstage/catalog-model@1.4.1
+  - @backstage/errors@1.2.1
+  - @backstage/theme@0.4.1
+  - @backstage/plugin-catalog-common@1.0.15
+  - @backstage/plugin-catalog-react@1.8.3-next.0
+  - @backstage/plugin-permission-common@0.7.7
+  - @backstage/plugin-permission-react@0.4.15-next.0
+  - @backstage/plugin-playlist-common@0.1.9
+  - @backstage/plugin-search-react@1.6.5-next.0
+
+## @backstage/plugin-playlist-backend@0.3.6-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-auth-node@0.3.0-next.0
+  - @backstage/backend-common@0.19.4-next.0
+  - @backstage/catalog-client@1.4.3
+  - @backstage/catalog-model@1.4.1
+  - @backstage/config@1.0.8
+  - @backstage/errors@1.2.1
+  - @backstage/plugin-permission-common@0.7.7
+  - @backstage/plugin-permission-node@0.7.13-next.0
+  - @backstage/plugin-playlist-common@0.1.9
+
+## @backstage/plugin-proxy-backend@0.3.2-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.19.4-next.0
+  - @backstage/backend-plugin-api@0.6.2-next.0
+  - @backstage/config@1.0.8
+
+## @backstage/plugin-puppetdb@0.1.6-next.0
+
+### Patch Changes
+
+- 482bb5c0bbf8: Moved `@types/react` to be a regular dependency
+- Updated dependencies
+  - @backstage/core-plugin-api@1.6.0-next.0
+  - @backstage/core-components@0.13.5-next.0
+  - @backstage/catalog-model@1.4.1
+  - @backstage/errors@1.2.1
+  - @backstage/theme@0.4.1
+  - @backstage/plugin-catalog-react@1.8.3-next.0
+
+## @backstage/plugin-rollbar@0.4.23-next.0
+
+### Patch Changes
+
+- 482bb5c0bbf8: Moved `@types/react` to be a regular dependency
+- Updated dependencies
+  - @backstage/core-plugin-api@1.6.0-next.0
+  - @backstage/core-components@0.13.5-next.0
+  - @backstage/catalog-model@1.4.1
+  - @backstage/theme@0.4.1
+  - @backstage/plugin-catalog-react@1.8.3-next.0
+
+## @backstage/plugin-rollbar-backend@0.1.47-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.19.4-next.0
+  - @backstage/config@1.0.8
+
+## @backstage/plugin-scaffolder@1.14.4-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/integration-react@1.1.18-next.0
+  - @backstage/integration@1.7.0-next.0
+  - @backstage/core-plugin-api@1.6.0-next.0
+  - @backstage/core-components@0.13.5-next.0
+  - @backstage/plugin-scaffolder-react@1.5.4-next.0
+  - @backstage/catalog-client@1.4.3
+  - @backstage/catalog-model@1.4.1
+  - @backstage/config@1.0.8
+  - @backstage/errors@1.2.1
+  - @backstage/theme@0.4.1
+  - @backstage/types@1.1.0
+  - @backstage/plugin-catalog-common@1.0.15
+  - @backstage/plugin-catalog-react@1.8.3-next.0
+  - @backstage/plugin-permission-react@0.4.15-next.0
+  - @backstage/plugin-scaffolder-common@1.4.0
+
+## @backstage/plugin-scaffolder-backend@1.16.3-next.0
+
+### Patch Changes
+
+- a4989552d828: Add examples for `publish:github` and `publish:gitlab` scaffolder actions.
+- 5f1a92b9f19f: Use `DefaultAzureDevOpsCredentialsProvider` to retrieve credentials for Azure DevOps.
+- fb57a4694fc6: Fixed the plugin and module ID of the alpha `catalogModuleTemplateKind` export.
+- cfc3ca6ce060: Changes needed to support MySQL
+- Updated dependencies
+  - @backstage/plugin-catalog-backend@1.12.2-next.0
+  - @backstage/plugin-auth-node@0.3.0-next.0
+  - @backstage/backend-common@0.19.4-next.0
+  - @backstage/integration@1.7.0-next.0
+  - @backstage/backend-tasks@0.5.7-next.0
+  - @backstage/backend-plugin-api@0.6.2-next.0
+  - @backstage/catalog-client@1.4.3
+  - @backstage/catalog-model@1.4.1
+  - @backstage/config@1.0.8
+  - @backstage/errors@1.2.1
+  - @backstage/types@1.1.0
+  - @backstage/plugin-catalog-common@1.0.15
+  - @backstage/plugin-catalog-node@1.4.3-next.0
+  - @backstage/plugin-permission-common@0.7.7
+  - @backstage/plugin-permission-node@0.7.13-next.0
+  - @backstage/plugin-scaffolder-common@1.4.0
+  - @backstage/plugin-scaffolder-node@0.2.2-next.0
+
+## @backstage/plugin-scaffolder-backend-module-confluence-to-markdown@0.2.3-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.19.4-next.0
+  - @backstage/integration@1.7.0-next.0
+  - @backstage/config@1.0.8
+  - @backstage/errors@1.2.1
+  - @backstage/types@1.1.0
+  - @backstage/plugin-scaffolder-node@0.2.2-next.0
+
+## @backstage/plugin-scaffolder-backend-module-cookiecutter@0.2.26-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.19.4-next.0
+  - @backstage/integration@1.7.0-next.0
+  - @backstage/config@1.0.8
+  - @backstage/errors@1.2.1
+  - @backstage/types@1.1.0
+  - @backstage/plugin-scaffolder-node@0.2.2-next.0
+
+## @backstage/plugin-scaffolder-backend-module-gitlab@0.2.5-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/integration@1.7.0-next.0
+  - @backstage/config@1.0.8
+  - @backstage/errors@1.2.1
+  - @backstage/plugin-scaffolder-node@0.2.2-next.0
+
+## @backstage/plugin-scaffolder-backend-module-rails@0.4.19-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.19.4-next.0
+  - @backstage/integration@1.7.0-next.0
+  - @backstage/config@1.0.8
+  - @backstage/errors@1.2.1
+  - @backstage/types@1.1.0
+  - @backstage/plugin-scaffolder-node@0.2.2-next.0
+
+## @backstage/plugin-scaffolder-backend-module-sentry@0.1.10-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config@1.0.8
+  - @backstage/errors@1.2.1
+  - @backstage/plugin-scaffolder-node@0.2.2-next.0
+
+## @backstage/plugin-scaffolder-backend-module-yeoman@0.2.23-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config@1.0.8
+  - @backstage/types@1.1.0
+  - @backstage/plugin-scaffolder-node@0.2.2-next.0
+
+## @backstage/plugin-scaffolder-node@0.2.2-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.19.4-next.0
+  - @backstage/integration@1.7.0-next.0
+  - @backstage/backend-plugin-api@0.6.2-next.0
+  - @backstage/catalog-model@1.4.1
+  - @backstage/errors@1.2.1
+  - @backstage/types@1.1.0
+  - @backstage/plugin-scaffolder-common@1.4.0
+
+## @backstage/plugin-scaffolder-react@1.5.4-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-plugin-api@1.6.0-next.0
+  - @backstage/core-components@0.13.5-next.0
+  - @backstage/catalog-client@1.4.3
+  - @backstage/catalog-model@1.4.1
+  - @backstage/errors@1.2.1
+  - @backstage/theme@0.4.1
+  - @backstage/types@1.1.0
+  - @backstage/version-bridge@1.0.4
+  - @backstage/plugin-catalog-react@1.8.3-next.0
+  - @backstage/plugin-scaffolder-common@1.4.0
+
+## @backstage/plugin-search@1.3.6-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-plugin-api@1.6.0-next.0
+  - @backstage/core-components@0.13.5-next.0
+  - @backstage/catalog-model@1.4.1
+  - @backstage/config@1.0.8
+  - @backstage/errors@1.2.1
+  - @backstage/theme@0.4.1
+  - @backstage/types@1.1.0
+  - @backstage/version-bridge@1.0.4
+  - @backstage/plugin-catalog-react@1.8.3-next.0
+  - @backstage/plugin-search-common@1.2.5
+  - @backstage/plugin-search-react@1.6.5-next.0
+
+## @backstage/plugin-search-backend@1.4.2-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-auth-node@0.3.0-next.0
+  - @backstage/backend-common@0.19.4-next.0
+  - @backstage/backend-openapi-utils@0.0.3
+  - @backstage/backend-plugin-api@0.6.2-next.0
+  - @backstage/config@1.0.8
+  - @backstage/errors@1.2.1
+  - @backstage/types@1.1.0
+  - @backstage/plugin-permission-common@0.7.7
+  - @backstage/plugin-permission-node@0.7.13-next.0
+  - @backstage/plugin-search-backend-node@1.2.6-next.0
+  - @backstage/plugin-search-common@1.2.5
+
+## @backstage/plugin-search-backend-module-catalog@0.1.6-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.19.4-next.0
+  - @backstage/backend-tasks@0.5.7-next.0
+  - @backstage/backend-plugin-api@0.6.2-next.0
+  - @backstage/catalog-client@1.4.3
+  - @backstage/catalog-model@1.4.1
+  - @backstage/config@1.0.8
+  - @backstage/errors@1.2.1
+  - @backstage/plugin-catalog-common@1.0.15
+  - @backstage/plugin-catalog-node@1.4.3-next.0
+  - @backstage/plugin-permission-common@0.7.7
+  - @backstage/plugin-search-backend-node@1.2.6-next.0
+  - @backstage/plugin-search-common@1.2.5
+
+## @backstage/plugin-search-backend-module-elasticsearch@1.3.5-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.19.4-next.0
+  - @backstage/backend-plugin-api@0.6.2-next.0
+  - @backstage/config@1.0.8
+  - @backstage/integration-aws-node@0.1.5
+  - @backstage/plugin-search-backend-node@1.2.6-next.0
+  - @backstage/plugin-search-common@1.2.5
+
+## @backstage/plugin-search-backend-module-explore@0.1.6-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.19.4-next.0
+  - @backstage/backend-tasks@0.5.7-next.0
+  - @backstage/backend-plugin-api@0.6.2-next.0
+  - @backstage/config@1.0.8
+  - @backstage/plugin-explore-common@0.0.1
+  - @backstage/plugin-search-backend-node@1.2.6-next.0
+  - @backstage/plugin-search-common@1.2.5
+
+## @backstage/plugin-search-backend-module-pg@0.5.11-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.19.4-next.0
+  - @backstage/backend-plugin-api@0.6.2-next.0
+  - @backstage/config@1.0.8
+  - @backstage/plugin-search-backend-node@1.2.6-next.0
+  - @backstage/plugin-search-common@1.2.5
+
+## @backstage/plugin-search-backend-module-techdocs@0.1.6-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.19.4-next.0
+  - @backstage/backend-tasks@0.5.7-next.0
+  - @backstage/backend-plugin-api@0.6.2-next.0
+  - @backstage/catalog-client@1.4.3
+  - @backstage/catalog-model@1.4.1
+  - @backstage/config@1.0.8
+  - @backstage/plugin-catalog-common@1.0.15
+  - @backstage/plugin-catalog-node@1.4.3-next.0
+  - @backstage/plugin-permission-common@0.7.7
+  - @backstage/plugin-search-backend-node@1.2.6-next.0
+  - @backstage/plugin-search-common@1.2.5
+  - @backstage/plugin-techdocs-node@1.7.6-next.0
+
+## @backstage/plugin-search-backend-node@1.2.6-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.19.4-next.0
+  - @backstage/backend-tasks@0.5.7-next.0
+  - @backstage/backend-plugin-api@0.6.2-next.0
+  - @backstage/config@1.0.8
+  - @backstage/errors@1.2.1
+  - @backstage/plugin-permission-common@0.7.7
+  - @backstage/plugin-search-common@1.2.5
+
+## @backstage/plugin-search-react@1.6.5-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-plugin-api@1.6.0-next.0
+  - @backstage/core-components@0.13.5-next.0
+  - @backstage/theme@0.4.1
+  - @backstage/types@1.1.0
+  - @backstage/version-bridge@1.0.4
+  - @backstage/plugin-search-common@1.2.5
+
+## @backstage/plugin-sentry@0.5.8-next.0
+
+### Patch Changes
+
+- 482bb5c0bbf8: Moved `@types/react` to be a regular dependency
+- Updated dependencies
+  - @backstage/core-plugin-api@1.6.0-next.0
+  - @backstage/core-components@0.13.5-next.0
+  - @backstage/catalog-model@1.4.1
+  - @backstage/theme@0.4.1
+  - @backstage/plugin-catalog-react@1.8.3-next.0
+
+## @backstage/plugin-shortcuts@0.3.14-next.0
+
+### Patch Changes
+
+- 482bb5c0bbf8: Moved `@types/react` to be a regular dependency
+- Updated dependencies
+  - @backstage/core-plugin-api@1.6.0-next.0
+  - @backstage/core-components@0.13.5-next.0
+  - @backstage/theme@0.4.1
+  - @backstage/types@1.1.0
+
+## @backstage/plugin-sonarqube@0.7.4-next.0
+
+### Patch Changes
+
+- 482bb5c0bbf8: Moved `@types/react` to be a regular dependency
+- Updated dependencies
+  - @backstage/core-plugin-api@1.6.0-next.0
+  - @backstage/core-components@0.13.5-next.0
+  - @backstage/catalog-model@1.4.1
+  - @backstage/theme@0.4.1
+  - @backstage/plugin-catalog-react@1.8.3-next.0
+  - @backstage/plugin-sonarqube-react@0.1.8-next.0
+
+## @backstage/plugin-sonarqube-backend@0.2.4-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.19.4-next.0
+  - @backstage/config@1.0.8
+  - @backstage/errors@1.2.1
+
+## @backstage/plugin-sonarqube-react@0.1.8-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-plugin-api@1.6.0-next.0
+  - @backstage/catalog-model@1.4.1
+
+## @backstage/plugin-splunk-on-call@0.4.12-next.0
+
+### Patch Changes
+
+- 482bb5c0bbf8: Moved `@types/react` to be a regular dependency
+- Updated dependencies
+  - @backstage/core-plugin-api@1.6.0-next.0
+  - @backstage/core-components@0.13.5-next.0
+  - @backstage/catalog-model@1.4.1
+  - @backstage/theme@0.4.1
+  - @backstage/plugin-catalog-react@1.8.3-next.0
+
+## @backstage/plugin-stack-overflow@0.1.20-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-home-react@0.1.3-next.0
+  - @backstage/core-plugin-api@1.6.0-next.0
+  - @backstage/core-components@0.13.5-next.0
+  - @backstage/config@1.0.8
+  - @backstage/theme@0.4.1
+  - @backstage/plugin-search-common@1.2.5
+  - @backstage/plugin-search-react@1.6.5-next.0
+
+## @backstage/plugin-stack-overflow-backend@0.2.6-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.19.4-next.0
+  - @backstage/config@1.0.8
+  - @backstage/plugin-search-common@1.2.5
+
+## @backstage/plugin-stackstorm@0.1.6-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-plugin-api@1.6.0-next.0
+  - @backstage/core-components@0.13.5-next.0
+  - @backstage/errors@1.2.1
+  - @backstage/theme@0.4.1
+
+## @backstage/plugin-tech-insights@0.3.15-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-plugin-api@1.6.0-next.0
+  - @backstage/core-components@0.13.5-next.0
+  - @backstage/catalog-model@1.4.1
+  - @backstage/errors@1.2.1
+  - @backstage/theme@0.4.1
+  - @backstage/types@1.1.0
+  - @backstage/plugin-catalog-react@1.8.3-next.0
+  - @backstage/plugin-tech-insights-common@0.2.11
+
+## @backstage/plugin-tech-insights-backend@0.5.16-next.0
+
+### Patch Changes
+
+- cfc3ca6ce060: Changes needed to support MySQL
+- Updated dependencies
+  - @backstage/backend-common@0.19.4-next.0
+  - @backstage/backend-tasks@0.5.7-next.0
+  - @backstage/catalog-client@1.4.3
+  - @backstage/catalog-model@1.4.1
+  - @backstage/config@1.0.8
+  - @backstage/errors@1.2.1
+  - @backstage/types@1.1.0
+  - @backstage/plugin-tech-insights-common@0.2.11
+  - @backstage/plugin-tech-insights-node@0.4.8-next.0
+
+## @backstage/plugin-tech-insights-backend-module-jsonfc@0.1.34-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.19.4-next.0
+  - @backstage/config@1.0.8
+  - @backstage/errors@1.2.1
+  - @backstage/plugin-tech-insights-common@0.2.11
+  - @backstage/plugin-tech-insights-node@0.4.8-next.0
+
+## @backstage/plugin-tech-insights-node@0.4.8-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.19.4-next.0
+  - @backstage/backend-tasks@0.5.7-next.0
+  - @backstage/config@1.0.8
+  - @backstage/types@1.1.0
+  - @backstage/plugin-tech-insights-common@0.2.11
+
+## @backstage/plugin-tech-radar@0.6.8-next.0
+
+### Patch Changes
+
+- 482bb5c0bbf8: Moved `@types/react` to be a regular dependency
+- Updated dependencies
+  - @backstage/core-plugin-api@1.6.0-next.0
+  - @backstage/core-components@0.13.5-next.0
+  - @backstage/theme@0.4.1
+
+## @backstage/plugin-techdocs@1.6.8-next.0
+
+### Patch Changes
+
+- 88c9525a36f3: Fixed bug in styles that caused next and previous links in footer to overlap page content.
+- Updated dependencies
+  - @backstage/integration-react@1.1.18-next.0
+  - @backstage/integration@1.7.0-next.0
+  - @backstage/core-plugin-api@1.6.0-next.0
+  - @backstage/core-components@0.13.5-next.0
+  - @backstage/catalog-model@1.4.1
+  - @backstage/config@1.0.8
+  - @backstage/errors@1.2.1
+  - @backstage/theme@0.4.1
+  - @backstage/plugin-catalog-react@1.8.3-next.0
+  - @backstage/plugin-search-common@1.2.5
+  - @backstage/plugin-search-react@1.6.5-next.0
+  - @backstage/plugin-techdocs-react@1.1.10-next.0
+
+## @backstage/plugin-techdocs-addons-test-utils@1.0.20-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/integration-react@1.1.18-next.0
+  - @backstage/plugin-catalog@1.12.4-next.0
+  - @backstage/plugin-techdocs@1.6.8-next.0
+  - @backstage/core-app-api@1.10.0-next.0
+  - @backstage/core-plugin-api@1.6.0-next.0
+  - @backstage/core-components@0.13.5-next.0
+  - @backstage/test-utils@1.4.3-next.0
+  - @backstage/theme@0.4.1
+  - @backstage/plugin-search-react@1.6.5-next.0
+  - @backstage/plugin-techdocs-react@1.1.10-next.0
+
+## @backstage/plugin-techdocs-backend@1.6.7-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.19.4-next.0
+  - @backstage/integration@1.7.0-next.0
+  - @backstage/backend-plugin-api@0.6.2-next.0
+  - @backstage/catalog-client@1.4.3
+  - @backstage/catalog-model@1.4.1
+  - @backstage/config@1.0.8
+  - @backstage/errors@1.2.1
+  - @backstage/plugin-catalog-common@1.0.15
+  - @backstage/plugin-permission-common@0.7.7
+  - @backstage/plugin-search-backend-module-techdocs@0.1.6-next.0
+  - @backstage/plugin-search-common@1.2.5
+  - @backstage/plugin-techdocs-node@1.7.6-next.0
+
+## @backstage/plugin-techdocs-module-addons-contrib@1.0.18-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/integration-react@1.1.18-next.0
+  - @backstage/integration@1.7.0-next.0
+  - @backstage/core-plugin-api@1.6.0-next.0
+  - @backstage/core-components@0.13.5-next.0
+  - @backstage/theme@0.4.1
+  - @backstage/plugin-techdocs-react@1.1.10-next.0
+
+## @backstage/plugin-techdocs-node@1.7.6-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.19.4-next.0
+  - @backstage/integration@1.7.0-next.0
+  - @backstage/catalog-model@1.4.1
+  - @backstage/config@1.0.8
+  - @backstage/errors@1.2.1
+  - @backstage/integration-aws-node@0.1.5
+  - @backstage/plugin-search-common@1.2.5
+
+## @backstage/plugin-techdocs-react@1.1.10-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-plugin-api@1.6.0-next.0
+  - @backstage/core-components@0.13.5-next.0
+  - @backstage/catalog-model@1.4.1
+  - @backstage/config@1.0.8
+  - @backstage/version-bridge@1.0.4
+
+## @backstage/plugin-todo@0.2.25-next.0
+
+### Patch Changes
+
+- 482bb5c0bbf8: Moved `@types/react` to be a regular dependency
+- Updated dependencies
+  - @backstage/core-plugin-api@1.6.0-next.0
+  - @backstage/core-components@0.13.5-next.0
+  - @backstage/catalog-model@1.4.1
+  - @backstage/errors@1.2.1
+  - @backstage/theme@0.4.1
+  - @backstage/plugin-catalog-react@1.8.3-next.0
+
+## @backstage/plugin-todo-backend@0.2.2-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.19.4-next.0
+  - @backstage/integration@1.7.0-next.0
+  - @backstage/backend-openapi-utils@0.0.3
+  - @backstage/backend-plugin-api@0.6.2-next.0
+  - @backstage/catalog-client@1.4.3
+  - @backstage/catalog-model@1.4.1
+  - @backstage/config@1.0.8
+  - @backstage/errors@1.2.1
+  - @backstage/plugin-catalog-node@1.4.3-next.0
+
+## @backstage/plugin-user-settings@0.7.8-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-app-api@1.10.0-next.0
+  - @backstage/core-plugin-api@1.6.0-next.0
+  - @backstage/core-components@0.13.5-next.0
+  - @backstage/errors@1.2.1
+  - @backstage/theme@0.4.1
+  - @backstage/types@1.1.0
+  - @backstage/plugin-catalog-react@1.8.3-next.0
+
+## @backstage/plugin-user-settings-backend@0.1.14-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-auth-node@0.3.0-next.0
+  - @backstage/backend-common@0.19.4-next.0
+  - @backstage/backend-plugin-api@0.6.2-next.0
+  - @backstage/catalog-model@1.4.1
+  - @backstage/errors@1.2.1
+  - @backstage/types@1.1.0
+
+## @backstage/plugin-vault@0.1.17-next.0
+
+### Patch Changes
+
+- 482bb5c0bbf8: Moved `@types/react` to be a regular dependency
+- Updated dependencies
+  - @backstage/core-plugin-api@1.6.0-next.0
+  - @backstage/core-components@0.13.5-next.0
+  - @backstage/catalog-model@1.4.1
+  - @backstage/errors@1.2.1
+  - @backstage/theme@0.4.1
+  - @backstage/plugin-catalog-react@1.8.3-next.0
+
+## @backstage/plugin-vault-backend@0.3.6-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.19.4-next.0
+  - @backstage/backend-tasks@0.5.7-next.0
+  - @backstage/config@1.0.8
+  - @backstage/errors@1.2.1
+
+## @backstage/plugin-xcmetrics@0.2.42-next.0
+
+### Patch Changes
+
+- 482bb5c0bbf8: Moved `@types/react` to be a regular dependency
+- Updated dependencies
+  - @backstage/core-plugin-api@1.6.0-next.0
+  - @backstage/core-components@0.13.5-next.0
+  - @backstage/errors@1.2.1
+  - @backstage/theme@0.4.1
+
+## example-app@0.2.87-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-unprocessed-entities@0.1.3-next.0
+  - @backstage/integration-react@1.1.18-next.0
+  - @backstage/plugin-microsoft-calendar@0.1.7-next.0
+  - @backstage/plugin-newrelic-dashboard@0.2.16-next.0
+  - @backstage/plugin-apache-airflow@0.2.15-next.0
+  - @backstage/plugin-github-actions@0.6.4-next.0
+  - @backstage/plugin-octopus-deploy@0.2.5-next.0
+  - @backstage/plugin-azure-devops@0.3.5-next.0
+  - @backstage/plugin-gcp-projects@0.3.41-next.0
+  - @backstage/plugin-azure-sites@0.1.12-next.0
+  - @backstage/plugin-cloudbuild@0.3.23-next.0
+  - @backstage/plugin-lighthouse@0.4.8-next.0
+  - @backstage/plugin-tech-radar@0.6.8-next.0
+  - @backstage/plugin-dynatrace@7.0.3-next.0
+  - @backstage/plugin-gcalendar@0.3.18-next.0
+  - @backstage/plugin-shortcuts@0.3.14-next.0
+  - @backstage/plugin-airbrake@0.3.23-next.0
+  - @backstage/plugin-circleci@0.3.23-next.0
+  - @backstage/plugin-graphiql@0.2.54-next.0
+  - @backstage/plugin-linguist@0.1.8-next.0
+  - @backstage/plugin-newrelic@0.3.40-next.0
+  - @backstage/plugin-playlist@0.1.15-next.0
+  - @backstage/plugin-puppetdb@0.1.6-next.0
+  - @backstage/plugin-jenkins@0.8.5-next.0
+  - @backstage/plugin-rollbar@0.4.23-next.0
+  - @backstage/plugin-badges@0.2.47-next.0
+  - @backstage/plugin-sentry@0.5.8-next.0
+  - @backstage/plugin-kafka@0.3.23-next.0
+  - @backstage/plugin-nomad@0.1.4-next.0
+  - @backstage/plugin-todo@0.2.25-next.0
+  - @backstage/plugin-org@0.6.13-next.0
+  - @backstage/cli@0.22.12-next.0
+  - @backstage/plugin-techdocs@1.6.8-next.0
+  - @backstage/plugin-entity-feedback@0.2.6-next.0
+  - @backstage/core-app-api@1.10.0-next.0
+  - @backstage/plugin-code-coverage@0.2.16-next.0
+  - @backstage/core-plugin-api@1.6.0-next.0
+  - @backstage/plugin-cost-insights@0.12.12-next.0
+  - @backstage/core-components@0.13.5-next.0
+  - @backstage/plugin-adr@0.6.6-next.0
+  - @backstage/plugin-catalog-import@0.9.13-next.0
+  - @backstage/plugin-scaffolder@1.14.4-next.0
+  - @backstage/plugin-techdocs-module-addons-contrib@1.0.18-next.0
+  - @backstage/plugin-home@0.5.7-next.0
+  - @backstage/plugin-pagerduty@0.6.4-next.0
+  - @backstage/plugin-stack-overflow@0.1.20-next.0
+  - @backstage/plugin-api-docs@0.9.10-next.0
+  - @internal/plugin-catalog-customized@0.0.14-next.0
+  - @backstage/plugin-catalog-graph@0.2.35-next.0
+  - @backstage/plugin-explore@0.4.9-next.0
+  - @backstage/plugin-scaffolder-react@1.5.4-next.0
+  - @backstage/app-defaults@1.4.3-next.0
+  - @backstage/catalog-model@1.4.1
+  - @backstage/config@1.0.8
+  - @backstage/theme@0.4.1
+  - @backstage/plugin-catalog-common@1.0.15
+  - @backstage/plugin-catalog-react@1.8.3-next.0
+  - @backstage/plugin-devtools@0.1.4-next.0
+  - @backstage/plugin-gocd@0.1.29-next.0
+  - @backstage/plugin-kubernetes@0.10.2-next.0
+  - @backstage/plugin-linguist-common@0.1.1
+  - @backstage/plugin-permission-react@0.4.15-next.0
+  - @backstage/plugin-search@1.3.6-next.0
+  - @backstage/plugin-search-common@1.2.5
+  - @backstage/plugin-search-react@1.6.5-next.0
+  - @backstage/plugin-stackstorm@0.1.6-next.0
+  - @backstage/plugin-tech-insights@0.3.15-next.0
+  - @backstage/plugin-techdocs-react@1.1.10-next.0
+  - @backstage/plugin-user-settings@0.7.8-next.0
+
+## example-backend@0.2.87-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-backend@1.12.2-next.0
+  - @backstage/plugin-auth-backend@0.18.8-next.0
+  - @backstage/plugin-code-coverage-backend@0.2.16-next.0
+  - @backstage/plugin-scaffolder-backend@1.16.3-next.0
+  - @backstage/plugin-auth-node@0.3.0-next.0
+  - @backstage/backend-common@0.19.4-next.0
+  - @backstage/plugin-linguist-backend@0.4.2-next.0
+  - @backstage/integration@1.7.0-next.0
+  - @backstage/plugin-entity-feedback-backend@0.1.8-next.0
+  - @backstage/plugin-tech-insights-backend@0.5.16-next.0
+  - @backstage/backend-tasks@0.5.7-next.0
+  - @backstage/plugin-app-backend@0.3.50-next.0
+  - example-app@0.2.87-next.0
+  - @backstage/catalog-client@1.4.3
+  - @backstage/catalog-model@1.4.1
+  - @backstage/config@1.0.8
+  - @backstage/plugin-adr-backend@0.3.8-next.0
+  - @backstage/plugin-azure-devops-backend@0.3.29-next.0
+  - @backstage/plugin-azure-sites-backend@0.1.12-next.0
+  - @backstage/plugin-badges-backend@0.2.5-next.0
+  - @backstage/plugin-catalog-backend-module-unprocessed@0.2.2-next.0
+  - @backstage/plugin-catalog-node@1.4.3-next.0
+  - @backstage/plugin-devtools-backend@0.1.5-next.0
+  - @backstage/plugin-events-backend@0.2.11-next.0
+  - @backstage/plugin-events-node@0.2.11-next.0
+  - @backstage/plugin-explore-backend@0.0.12-next.0
+  - @backstage/plugin-graphql-backend@0.1.40-next.0
+  - @backstage/plugin-jenkins-backend@0.2.5-next.0
+  - @backstage/plugin-kafka-backend@0.2.43-next.0
+  - @backstage/plugin-kubernetes-backend@0.11.5-next.0
+  - @backstage/plugin-lighthouse-backend@0.2.6-next.0
+  - @backstage/plugin-nomad-backend@0.1.4-next.0
+  - @backstage/plugin-permission-backend@0.5.25-next.0
+  - @backstage/plugin-permission-common@0.7.7
+  - @backstage/plugin-permission-node@0.7.13-next.0
+  - @backstage/plugin-playlist-backend@0.3.6-next.0
+  - @backstage/plugin-proxy-backend@0.3.2-next.0
+  - @backstage/plugin-rollbar-backend@0.1.47-next.0
+  - @backstage/plugin-scaffolder-backend-module-confluence-to-markdown@0.2.3-next.0
+  - @backstage/plugin-scaffolder-backend-module-rails@0.4.19-next.0
+  - @backstage/plugin-search-backend@1.4.2-next.0
+  - @backstage/plugin-search-backend-module-elasticsearch@1.3.5-next.0
+  - @backstage/plugin-search-backend-module-pg@0.5.11-next.0
+  - @backstage/plugin-search-backend-node@1.2.6-next.0
+  - @backstage/plugin-search-common@1.2.5
+  - @backstage/plugin-tech-insights-backend-module-jsonfc@0.1.34-next.0
+  - @backstage/plugin-tech-insights-node@0.4.8-next.0
+  - @backstage/plugin-techdocs-backend@1.6.7-next.0
+  - @backstage/plugin-todo-backend@0.2.2-next.0
+
+## example-backend-next@0.0.15-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-backend@1.12.2-next.0
+  - @backstage/plugin-scaffolder-backend@1.16.3-next.0
+  - @backstage/plugin-auth-node@0.3.0-next.0
+  - @backstage/plugin-linguist-backend@0.4.2-next.0
+  - @backstage/plugin-entity-feedback-backend@0.1.8-next.0
+  - @backstage/backend-tasks@0.5.7-next.0
+  - @backstage/plugin-app-backend@0.3.50-next.0
+  - @backstage/backend-defaults@0.2.2-next.0
+  - @backstage/backend-plugin-api@0.6.2-next.0
+  - @backstage/plugin-adr-backend@0.3.8-next.0
+  - @backstage/plugin-azure-devops-backend@0.3.29-next.0
+  - @backstage/plugin-badges-backend@0.2.5-next.0
+  - @backstage/plugin-catalog-backend-module-unprocessed@0.2.2-next.0
+  - @backstage/plugin-devtools-backend@0.1.5-next.0
+  - @backstage/plugin-kubernetes-backend@0.11.5-next.0
+  - @backstage/plugin-lighthouse-backend@0.2.6-next.0
+  - @backstage/plugin-permission-backend@0.5.25-next.0
+  - @backstage/plugin-permission-common@0.7.7
+  - @backstage/plugin-permission-node@0.7.13-next.0
+  - @backstage/plugin-proxy-backend@0.3.2-next.0
+  - @backstage/plugin-search-backend@1.4.2-next.0
+  - @backstage/plugin-search-backend-module-catalog@0.1.6-next.0
+  - @backstage/plugin-search-backend-module-explore@0.1.6-next.0
+  - @backstage/plugin-search-backend-module-techdocs@0.1.6-next.0
+  - @backstage/plugin-search-backend-node@1.2.6-next.0
+  - @backstage/plugin-techdocs-backend@1.6.7-next.0
+  - @backstage/plugin-todo-backend@0.2.2-next.0
+
+## e2e-test@0.2.7-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/create-app@0.5.5-next.0
+  - @backstage/cli-common@0.1.12
+  - @backstage/errors@1.2.1
+
+## techdocs-cli-embedded-app@0.2.86-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/integration-react@1.1.18-next.0
+  - @backstage/plugin-catalog@1.12.4-next.0
+  - @backstage/cli@0.22.12-next.0
+  - @backstage/plugin-techdocs@1.6.8-next.0
+  - @backstage/core-app-api@1.10.0-next.0
+  - @backstage/core-plugin-api@1.6.0-next.0
+  - @backstage/core-components@0.13.5-next.0
+  - @backstage/app-defaults@1.4.3-next.0
+  - @backstage/catalog-model@1.4.1
+  - @backstage/config@1.0.8
+  - @backstage/test-utils@1.4.3-next.0
+  - @backstage/theme@0.4.1
+  - @backstage/plugin-techdocs-react@1.1.10-next.0
+
+## @internal/plugin-catalog-customized@0.0.14-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog@1.12.4-next.0
+  - @backstage/plugin-catalog-react@1.8.3-next.0
+
+## @internal/plugin-todo-list@1.0.17-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-plugin-api@1.6.0-next.0
+  - @backstage/core-components@0.13.5-next.0
+  - @backstage/theme@0.4.1
+
+## @internal/plugin-todo-list-backend@1.0.17-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-auth-node@0.3.0-next.0
+  - @backstage/backend-common@0.19.4-next.0
+  - @backstage/backend-plugin-api@0.6.2-next.0
+  - @backstage/config@1.0.8
+  - @backstage/errors@1.2.1
diff --git a/docs/releases/v1.18.0-next.1-changelog.md b/docs/releases/v1.18.0-next.1-changelog.md
new file mode 100644
index 0000000000..9e5212dfc5
--- /dev/null
+++ b/docs/releases/v1.18.0-next.1-changelog.md
@@ -0,0 +1,2857 @@
+# Release v1.18.0-next.1
+
+## @backstage/config@1.1.0-next.0
+
+### Minor Changes
+
+- 62f448edb0b5: Added a `readDurationFromConfig` function
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/errors@1.2.1
+  - @backstage/types@1.1.0
+
+## @techdocs/cli@1.5.0-next.1
+
+### Minor Changes
+
+- 10a86bd4ae12: Add optional config and cli option for techdocs to specify default mkdocs plugins.
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config@1.1.0-next.0
+  - @backstage/plugin-techdocs-node@1.8.0-next.1
+  - @backstage/backend-common@0.19.5-next.1
+  - @backstage/catalog-model@1.4.2-next.0
+  - @backstage/cli-common@0.1.12
+
+## @backstage/plugin-auth-backend-module-gitlab-provider@0.1.0-next.0
+
+### Minor Changes
+
+- 080cc7794700: New module for `@backstage/plugin-auth-backend` that adds a GitLab auth provider.
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.19.5-next.1
+  - @backstage/backend-plugin-api@0.6.3-next.1
+  - @backstage/plugin-auth-node@0.3.0-next.1
+
+## @backstage/plugin-catalog-backend@1.13.0-next.1
+
+### Minor Changes
+
+- 62f448edb0b5: Allow configuring the processing interval in your app-config, under the `catalog.processingInterval` key.
+
+### Patch Changes
+
+- 1fd2109739c1: Changed the processing loop task pipeline implementation from recursive to iterative
+- 0f8a97777489: Update OpenAPI schema to relax the encoding validation of all request parameters.
+- 2d32d8a611e3: Fixed validation of the `fullTextFilterFields` query parameter.
+- 618257f3e413: Fix issue with `catalogFileName` not being a required property for `/analyze-location`
+- Updated dependencies
+  - @backstage/config@1.1.0-next.0
+  - @backstage/integration@1.7.0-next.1
+  - @backstage/backend-tasks@0.5.8-next.1
+  - @backstage/backend-common@0.19.5-next.1
+  - @backstage/backend-plugin-api@0.6.3-next.1
+  - @backstage/catalog-model@1.4.2-next.0
+  - @backstage/plugin-auth-node@0.3.0-next.1
+  - @backstage/plugin-permission-common@0.7.8-next.0
+  - @backstage/plugin-permission-node@0.7.14-next.1
+  - @backstage/plugin-search-backend-module-catalog@0.1.7-next.1
+  - @backstage/plugin-catalog-node@1.4.4-next.1
+  - @backstage/plugin-events-node@0.2.12-next.1
+  - @backstage/catalog-client@1.4.4-next.0
+  - @backstage/plugin-catalog-common@1.0.16-next.0
+  - @backstage/plugin-scaffolder-common@1.4.1-next.0
+  - @backstage/backend-openapi-utils@0.0.3
+  - @backstage/errors@1.2.1
+  - @backstage/types@1.1.0
+  - @backstage/plugin-search-common@1.2.6-next.0
+
+## @backstage/plugin-search@1.4.0-next.1
+
+### Minor Changes
+
+- b78f570f44d3: The SearchPage component can now be configured via app-config.yaml with default query parameters to define how it behaves when it is first loaded or reset. Check out the following example:
+
+  ```yaml
+  search:
+    query:
+      pageLimit: 50
+  ```
+
+  Acceptable values for `pageLimit` are `10`, `25`, `50` or `100`.
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.8.4-next.1
+  - @backstage/core-components@0.13.5-next.1
+  - @backstage/config@1.1.0-next.0
+  - @backstage/plugin-search-react@1.7.0-next.1
+  - @backstage/catalog-model@1.4.2-next.0
+  - @backstage/core-plugin-api@1.6.0-next.1
+  - @backstage/errors@1.2.1
+  - @backstage/theme@0.4.1
+  - @backstage/types@1.1.0
+  - @backstage/version-bridge@1.0.4
+  - @backstage/plugin-search-common@1.2.6-next.0
+
+## @backstage/plugin-search-react@1.7.0-next.1
+
+### Minor Changes
+
+- b78f570f44d3: The SearchPage component can now be configured via app-config.yaml with default query parameters to define how it behaves when it is first loaded or reset. Check out the following example:
+
+  ```yaml
+  search:
+    query:
+      pageLimit: 50
+  ```
+
+  Acceptable values for `pageLimit` are `10`, `25`, `50` or `100`.
+
+### Patch Changes
+
+- 45f8a95e1068: Optionally initializes the search context with default settings for search queries only when the config is defined, rather than always overriding it.
+- Updated dependencies
+  - @backstage/core-components@0.13.5-next.1
+  - @backstage/core-plugin-api@1.6.0-next.1
+  - @backstage/theme@0.4.1
+  - @backstage/types@1.1.0
+  - @backstage/version-bridge@1.0.4
+  - @backstage/plugin-search-common@1.2.6-next.0
+
+## @backstage/plugin-techdocs-backend@1.7.0-next.1
+
+### Minor Changes
+
+- 5985d458ee30: Add a `techdocs.publisher.azureBlobStorage.connectionString` app-config setting, which can be leveraged for improved Azurite support.
+- 10a86bd4ae12: Add optional config and cli option for techdocs to specify default mkdocs plugins.
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config@1.1.0-next.0
+  - @backstage/integration@1.7.0-next.1
+  - @backstage/plugin-techdocs-node@1.8.0-next.1
+  - @backstage/backend-common@0.19.5-next.1
+  - @backstage/backend-plugin-api@0.6.3-next.1
+  - @backstage/catalog-model@1.4.2-next.0
+  - @backstage/plugin-permission-common@0.7.8-next.0
+  - @backstage/plugin-search-backend-module-techdocs@0.1.7-next.1
+  - @backstage/catalog-client@1.4.4-next.0
+  - @backstage/plugin-catalog-common@1.0.16-next.0
+  - @backstage/errors@1.2.1
+  - @backstage/plugin-search-common@1.2.6-next.0
+
+## @backstage/plugin-techdocs-module-addons-contrib@1.1.0-next.1
+
+### Minor Changes
+
+- 86c19906fe4b: Enable zoom icon for techdocs images inside lightbox
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.13.5-next.1
+  - @backstage/integration@1.7.0-next.1
+  - @backstage/integration-react@1.1.19-next.1
+  - @backstage/plugin-techdocs-react@1.1.10-next.1
+  - @backstage/core-plugin-api@1.6.0-next.1
+  - @backstage/theme@0.4.1
+
+## @backstage/plugin-techdocs-node@1.8.0-next.1
+
+### Minor Changes
+
+- 5985d458ee30: Add a `techdocs.publisher.azureBlobStorage.connectionString` app-config setting, which can be leveraged for improved Azurite support.
+- 10a86bd4ae12: Add optional config and cli option for techdocs to specify default mkdocs plugins.
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config@1.1.0-next.0
+  - @backstage/integration@1.7.0-next.1
+  - @backstage/backend-common@0.19.5-next.1
+  - @backstage/catalog-model@1.4.2-next.0
+  - @backstage/integration-aws-node@0.1.6-next.0
+  - @backstage/errors@1.2.1
+  - @backstage/plugin-search-common@1.2.6-next.0
+
+## @backstage/app-defaults@1.4.3-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.13.5-next.1
+  - @backstage/core-app-api@1.10.0-next.1
+  - @backstage/core-plugin-api@1.6.0-next.1
+  - @backstage/plugin-permission-react@0.4.15-next.1
+  - @backstage/theme@0.4.1
+
+## @backstage/backend-app-api@0.5.3-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config@1.1.0-next.0
+  - @backstage/backend-tasks@0.5.8-next.1
+  - @backstage/backend-common@0.19.5-next.1
+  - @backstage/backend-plugin-api@0.6.3-next.1
+  - @backstage/config-loader@1.5.0-next.1
+  - @backstage/plugin-auth-node@0.3.0-next.1
+  - @backstage/plugin-permission-node@0.7.14-next.1
+  - @backstage/cli-common@0.1.12
+  - @backstage/cli-node@0.1.3
+  - @backstage/errors@1.2.1
+  - @backstage/types@1.1.0
+
+## @backstage/backend-common@0.19.5-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config@1.1.0-next.0
+  - @backstage/integration@1.7.0-next.1
+  - @backstage/backend-app-api@0.5.3-next.1
+  - @backstage/backend-plugin-api@0.6.3-next.1
+  - @backstage/config-loader@1.5.0-next.1
+  - @backstage/integration-aws-node@0.1.6-next.0
+  - @backstage/backend-dev-utils@0.1.1
+  - @backstage/cli-common@0.1.12
+  - @backstage/errors@1.2.1
+  - @backstage/types@1.1.0
+
+## @backstage/backend-defaults@0.2.3-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-app-api@0.5.3-next.1
+  - @backstage/backend-common@0.19.5-next.1
+  - @backstage/backend-plugin-api@0.6.3-next.1
+
+## @backstage/backend-plugin-api@0.6.3-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config@1.1.0-next.0
+  - @backstage/backend-tasks@0.5.8-next.1
+  - @backstage/plugin-auth-node@0.3.0-next.1
+  - @backstage/plugin-permission-common@0.7.8-next.0
+  - @backstage/types@1.1.0
+
+## @backstage/backend-tasks@0.5.8-next.1
+
+### Patch Changes
+
+- 62f448edb0b5: Use `readDurationFromConfig` from the config package
+- Updated dependencies
+  - @backstage/config@1.1.0-next.0
+  - @backstage/backend-common@0.19.5-next.1
+  - @backstage/errors@1.2.1
+  - @backstage/types@1.1.0
+
+## @backstage/backend-test-utils@0.2.3-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config@1.1.0-next.0
+  - @backstage/backend-app-api@0.5.3-next.1
+  - @backstage/backend-common@0.19.5-next.1
+  - @backstage/backend-plugin-api@0.6.3-next.1
+  - @backstage/plugin-auth-node@0.3.0-next.1
+  - @backstage/types@1.1.0
+
+## @backstage/catalog-client@1.4.4-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/catalog-model@1.4.2-next.0
+  - @backstage/errors@1.2.1
+
+## @backstage/catalog-model@1.4.2-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config@1.1.0-next.0
+  - @backstage/errors@1.2.1
+  - @backstage/types@1.1.0
+
+## @backstage/cli@0.22.13-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config@1.1.0-next.0
+  - @backstage/integration@1.7.0-next.1
+  - @backstage/catalog-model@1.4.2-next.0
+  - @backstage/config-loader@1.5.0-next.1
+  - @backstage/cli-common@0.1.12
+  - @backstage/cli-node@0.1.3
+  - @backstage/errors@1.2.1
+  - @backstage/eslint-plugin@0.1.3
+  - @backstage/release-manifests@0.0.9
+  - @backstage/types@1.1.0
+
+## @backstage/config-loader@1.5.0-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config@1.1.0-next.0
+  - @backstage/cli-common@0.1.12
+  - @backstage/errors@1.2.1
+  - @backstage/types@1.1.0
+
+## @backstage/core-app-api@1.10.0-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config@1.1.0-next.0
+  - @backstage/core-plugin-api@1.6.0-next.1
+  - @backstage/types@1.1.0
+  - @backstage/version-bridge@1.0.4
+
+## @backstage/core-components@0.13.5-next.1
+
+### Patch Changes
+
+- 0c9907645aab: Fixed an issue causing `StructuredMetadataTable` to crash in case metadata contained `null` values.
+- Updated dependencies
+  - @backstage/config@1.1.0-next.0
+  - @backstage/core-plugin-api@1.6.0-next.1
+  - @backstage/errors@1.2.1
+  - @backstage/theme@0.4.1
+  - @backstage/version-bridge@1.0.4
+
+## @backstage/core-plugin-api@1.6.0-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config@1.1.0-next.0
+  - @backstage/types@1.1.0
+  - @backstage/version-bridge@1.0.4
+
+## @backstage/create-app@0.5.5-next.1
+
+### Patch Changes
+
+- Bumped create-app version.
+- Updated dependencies
+  - @backstage/cli-common@0.1.12
+
+## @backstage/dev-utils@1.0.21-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.8.4-next.1
+  - @backstage/core-components@0.13.5-next.1
+  - @backstage/app-defaults@1.4.3-next.1
+  - @backstage/integration-react@1.1.19-next.1
+  - @backstage/catalog-model@1.4.2-next.0
+  - @backstage/core-app-api@1.10.0-next.1
+  - @backstage/core-plugin-api@1.6.0-next.1
+  - @backstage/test-utils@1.4.3-next.1
+  - @backstage/theme@0.4.1
+
+## @backstage/integration@1.7.0-next.1
+
+### Patch Changes
+
+- 2d2fc9d20ebb: Additional fix for Gitiles auth links
+- Updated dependencies
+  - @backstage/config@1.1.0-next.0
+  - @backstage/errors@1.2.1
+
+## @backstage/integration-aws-node@0.1.6-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config@1.1.0-next.0
+  - @backstage/errors@1.2.1
+
+## @backstage/integration-react@1.1.19-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.13.5-next.1
+  - @backstage/config@1.1.0-next.0
+  - @backstage/integration@1.7.0-next.1
+  - @backstage/core-plugin-api@1.6.0-next.1
+  - @backstage/theme@0.4.1
+
+## @backstage/repo-tools@0.3.4-next.1
+
+### Patch Changes
+
+- 6f874cdb04eb: Fixed a bug with the `generate-catalog-info` command that could cause `metadata.description` values to be overwritten by `package.json` description values only because unrelated attributes were being changed.
+- Updated dependencies
+  - @backstage/catalog-model@1.4.2-next.0
+  - @backstage/cli-common@0.1.12
+  - @backstage/cli-node@0.1.3
+  - @backstage/errors@1.2.1
+
+## @backstage/test-utils@1.4.3-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config@1.1.0-next.0
+  - @backstage/core-app-api@1.10.0-next.1
+  - @backstage/core-plugin-api@1.6.0-next.1
+  - @backstage/plugin-permission-common@0.7.8-next.0
+  - @backstage/plugin-permission-react@0.4.15-next.1
+  - @backstage/theme@0.4.1
+  - @backstage/types@1.1.0
+
+## @backstage/plugin-adr@0.6.7-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.8.4-next.1
+  - @backstage/core-components@0.13.5-next.1
+  - @backstage/plugin-search-react@1.7.0-next.1
+  - @backstage/integration-react@1.1.19-next.1
+  - @backstage/catalog-model@1.4.2-next.0
+  - @backstage/core-plugin-api@1.6.0-next.1
+  - @backstage/plugin-adr-common@0.2.15-next.1
+  - @backstage/theme@0.4.1
+  - @backstage/plugin-search-common@1.2.6-next.0
+
+## @backstage/plugin-adr-backend@0.3.9-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config@1.1.0-next.0
+  - @backstage/integration@1.7.0-next.1
+  - @backstage/backend-common@0.19.5-next.1
+  - @backstage/backend-plugin-api@0.6.3-next.1
+  - @backstage/catalog-model@1.4.2-next.0
+  - @backstage/plugin-adr-common@0.2.15-next.1
+  - @backstage/catalog-client@1.4.4-next.0
+  - @backstage/errors@1.2.1
+  - @backstage/plugin-search-common@1.2.6-next.0
+
+## @backstage/plugin-adr-common@0.2.15-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/integration@1.7.0-next.1
+  - @backstage/catalog-model@1.4.2-next.0
+  - @backstage/plugin-search-common@1.2.6-next.0
+
+## @backstage/plugin-airbrake@0.3.24-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.8.4-next.1
+  - @backstage/core-components@0.13.5-next.1
+  - @backstage/dev-utils@1.0.21-next.1
+  - @backstage/catalog-model@1.4.2-next.0
+  - @backstage/core-plugin-api@1.6.0-next.1
+  - @backstage/test-utils@1.4.3-next.1
+  - @backstage/theme@0.4.1
+
+## @backstage/plugin-airbrake-backend@0.2.24-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config@1.1.0-next.0
+  - @backstage/backend-common@0.19.5-next.1
+  - @backstage/backend-plugin-api@0.6.3-next.1
+
+## @backstage/plugin-allure@0.1.40-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.8.4-next.1
+  - @backstage/core-components@0.13.5-next.1
+  - @backstage/catalog-model@1.4.2-next.0
+  - @backstage/core-plugin-api@1.6.0-next.1
+  - @backstage/theme@0.4.1
+
+## @backstage/plugin-analytics-module-ga@0.1.33-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.13.5-next.1
+  - @backstage/config@1.1.0-next.0
+  - @backstage/core-plugin-api@1.6.0-next.1
+  - @backstage/theme@0.4.1
+
+## @backstage/plugin-analytics-module-ga4@0.1.4-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.13.5-next.1
+  - @backstage/config@1.1.0-next.0
+  - @backstage/core-plugin-api@1.6.0-next.1
+  - @backstage/theme@0.4.1
+
+## @backstage/plugin-analytics-module-newrelic-browser@0.0.2-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.13.5-next.1
+  - @backstage/config@1.1.0-next.0
+  - @backstage/core-plugin-api@1.6.0-next.1
+
+## @backstage/plugin-apache-airflow@0.2.15-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.13.5-next.1
+  - @backstage/core-plugin-api@1.6.0-next.1
+
+## @backstage/plugin-api-docs@0.9.11-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.8.4-next.1
+  - @backstage/core-components@0.13.5-next.1
+  - @backstage/plugin-catalog@1.12.5-next.1
+  - @backstage/catalog-model@1.4.2-next.0
+  - @backstage/core-plugin-api@1.6.0-next.1
+  - @backstage/theme@0.4.1
+
+## @backstage/plugin-apollo-explorer@0.1.15-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.13.5-next.1
+  - @backstage/core-plugin-api@1.6.0-next.1
+  - @backstage/theme@0.4.1
+
+## @backstage/plugin-app-backend@0.3.51-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config@1.1.0-next.0
+  - @backstage/backend-common@0.19.5-next.1
+  - @backstage/backend-plugin-api@0.6.3-next.1
+  - @backstage/config-loader@1.5.0-next.1
+  - @backstage/plugin-app-node@0.1.3-next.1
+  - @backstage/types@1.1.0
+
+## @backstage/plugin-app-node@0.1.3-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@0.6.3-next.1
+
+## @backstage/plugin-auth-backend@0.18.9-next.1
+
+### Patch Changes
+
+- 080cc7794700: Migrated the GitLab auth provider to be implemented using the new `@backstage/plugin-auth-backend-module-gitlab-provider` module.
+- Updated dependencies
+  - @backstage/config@1.1.0-next.0
+  - @backstage/plugin-auth-backend-module-gitlab-provider@0.1.0-next.0
+  - @backstage/plugin-auth-backend-module-github-provider@0.1.0-next.1
+  - @backstage/plugin-auth-backend-module-google-provider@0.1.0-next.1
+  - @backstage/backend-common@0.19.5-next.1
+  - @backstage/backend-plugin-api@0.6.3-next.1
+  - @backstage/catalog-model@1.4.2-next.0
+  - @backstage/plugin-auth-node@0.3.0-next.1
+  - @backstage/plugin-catalog-node@1.4.4-next.1
+  - @backstage/plugin-auth-backend-module-gcp-iap-provider@0.1.0-next.1
+  - @backstage/catalog-client@1.4.4-next.0
+  - @backstage/errors@1.2.1
+  - @backstage/types@1.1.0
+
+## @backstage/plugin-auth-backend-module-gcp-iap-provider@0.1.0-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@0.6.3-next.1
+  - @backstage/plugin-auth-node@0.3.0-next.1
+  - @backstage/errors@1.2.1
+  - @backstage/types@1.1.0
+
+## @backstage/plugin-auth-backend-module-github-provider@0.1.0-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.19.5-next.1
+  - @backstage/backend-plugin-api@0.6.3-next.1
+  - @backstage/plugin-auth-node@0.3.0-next.1
+
+## @backstage/plugin-auth-backend-module-google-provider@0.1.0-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@0.6.3-next.1
+  - @backstage/plugin-auth-node@0.3.0-next.1
+
+## @backstage/plugin-auth-node@0.3.0-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config@1.1.0-next.0
+  - @backstage/backend-common@0.19.5-next.1
+  - @backstage/backend-plugin-api@0.6.3-next.1
+  - @backstage/catalog-model@1.4.2-next.0
+  - @backstage/catalog-client@1.4.4-next.0
+  - @backstage/errors@1.2.1
+  - @backstage/types@1.1.0
+
+## @backstage/plugin-azure-devops@0.3.6-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.8.4-next.1
+  - @backstage/core-components@0.13.5-next.1
+  - @backstage/catalog-model@1.4.2-next.0
+  - @backstage/core-plugin-api@1.6.0-next.1
+  - @backstage/errors@1.2.1
+  - @backstage/theme@0.4.1
+  - @backstage/plugin-azure-devops-common@0.3.0
+
+## @backstage/plugin-azure-devops-backend@0.3.30-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config@1.1.0-next.0
+  - @backstage/backend-common@0.19.5-next.1
+  - @backstage/backend-plugin-api@0.6.3-next.1
+  - @backstage/plugin-azure-devops-common@0.3.0
+
+## @backstage/plugin-azure-sites@0.1.13-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.8.4-next.1
+  - @backstage/core-components@0.13.5-next.1
+  - @backstage/catalog-model@1.4.2-next.0
+  - @backstage/core-plugin-api@1.6.0-next.1
+  - @backstage/theme@0.4.1
+  - @backstage/plugin-azure-sites-common@0.1.0
+
+## @backstage/plugin-azure-sites-backend@0.1.13-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config@1.1.0-next.0
+  - @backstage/backend-common@0.19.5-next.1
+  - @backstage/plugin-azure-sites-common@0.1.0
+
+## @backstage/plugin-badges@0.2.48-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.8.4-next.1
+  - @backstage/core-components@0.13.5-next.1
+  - @backstage/catalog-model@1.4.2-next.0
+  - @backstage/core-plugin-api@1.6.0-next.1
+  - @backstage/errors@1.2.1
+  - @backstage/theme@0.4.1
+
+## @backstage/plugin-badges-backend@0.2.6-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config@1.1.0-next.0
+  - @backstage/backend-common@0.19.5-next.1
+  - @backstage/backend-plugin-api@0.6.3-next.1
+  - @backstage/catalog-model@1.4.2-next.0
+  - @backstage/plugin-auth-node@0.3.0-next.1
+  - @backstage/catalog-client@1.4.4-next.0
+  - @backstage/errors@1.2.1
+
+## @backstage/plugin-bazaar@0.2.16-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.8.4-next.1
+  - @backstage/core-components@0.13.5-next.1
+  - @backstage/plugin-catalog@1.12.5-next.1
+  - @backstage/cli@0.22.13-next.1
+  - @backstage/catalog-model@1.4.2-next.0
+  - @backstage/core-plugin-api@1.6.0-next.1
+  - @backstage/catalog-client@1.4.4-next.0
+  - @backstage/errors@1.2.1
+  - @backstage/theme@0.4.1
+
+## @backstage/plugin-bazaar-backend@0.2.14-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config@1.1.0-next.0
+  - @backstage/backend-common@0.19.5-next.1
+  - @backstage/backend-plugin-api@0.6.3-next.1
+  - @backstage/plugin-auth-node@0.3.0-next.1
+  - @backstage/errors@1.2.1
+
+## @backstage/plugin-bitbucket-cloud-common@0.2.12-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/integration@1.7.0-next.1
+
+## @backstage/plugin-bitrise@0.1.51-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.8.4-next.1
+  - @backstage/core-components@0.13.5-next.1
+  - @backstage/catalog-model@1.4.2-next.0
+  - @backstage/core-plugin-api@1.6.0-next.1
+  - @backstage/theme@0.4.1
+
+## @backstage/plugin-catalog@1.12.5-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.8.4-next.1
+  - @backstage/core-components@0.13.5-next.1
+  - @backstage/plugin-search-react@1.7.0-next.1
+  - @backstage/integration-react@1.1.19-next.1
+  - @backstage/catalog-model@1.4.2-next.0
+  - @backstage/core-plugin-api@1.6.0-next.1
+  - @backstage/catalog-client@1.4.4-next.0
+  - @backstage/plugin-catalog-common@1.0.16-next.0
+  - @backstage/plugin-scaffolder-common@1.4.1-next.0
+  - @backstage/errors@1.2.1
+  - @backstage/theme@0.4.1
+  - @backstage/types@1.1.0
+  - @backstage/plugin-search-common@1.2.6-next.0
+
+## @backstage/plugin-catalog-backend-module-aws@0.2.6-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-kubernetes-common@0.6.6-next.0
+  - @backstage/config@1.1.0-next.0
+  - @backstage/integration@1.7.0-next.1
+  - @backstage/backend-tasks@0.5.8-next.1
+  - @backstage/backend-common@0.19.5-next.1
+  - @backstage/backend-plugin-api@0.6.3-next.1
+  - @backstage/catalog-model@1.4.2-next.0
+  - @backstage/integration-aws-node@0.1.6-next.0
+  - @backstage/plugin-catalog-node@1.4.4-next.1
+  - @backstage/plugin-catalog-common@1.0.16-next.0
+  - @backstage/errors@1.2.1
+  - @backstage/types@1.1.0
+
+## @backstage/plugin-catalog-backend-module-azure@0.1.22-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config@1.1.0-next.0
+  - @backstage/integration@1.7.0-next.1
+  - @backstage/backend-tasks@0.5.8-next.1
+  - @backstage/backend-common@0.19.5-next.1
+  - @backstage/backend-plugin-api@0.6.3-next.1
+  - @backstage/catalog-model@1.4.2-next.0
+  - @backstage/plugin-catalog-node@1.4.4-next.1
+  - @backstage/plugin-catalog-common@1.0.16-next.0
+  - @backstage/errors@1.2.1
+  - @backstage/types@1.1.0
+
+## @backstage/plugin-catalog-backend-module-bitbucket@0.2.18-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config@1.1.0-next.0
+  - @backstage/integration@1.7.0-next.1
+  - @backstage/backend-common@0.19.5-next.1
+  - @backstage/catalog-model@1.4.2-next.0
+  - @backstage/plugin-bitbucket-cloud-common@0.2.12-next.1
+  - @backstage/plugin-catalog-node@1.4.4-next.1
+  - @backstage/errors@1.2.1
+  - @backstage/types@1.1.0
+
+## @backstage/plugin-catalog-backend-module-bitbucket-cloud@0.1.18-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config@1.1.0-next.0
+  - @backstage/integration@1.7.0-next.1
+  - @backstage/backend-tasks@0.5.8-next.1
+  - @backstage/backend-common@0.19.5-next.1
+  - @backstage/backend-plugin-api@0.6.3-next.1
+  - @backstage/catalog-model@1.4.2-next.0
+  - @backstage/plugin-bitbucket-cloud-common@0.2.12-next.1
+  - @backstage/plugin-catalog-node@1.4.4-next.1
+  - @backstage/plugin-events-node@0.2.12-next.1
+  - @backstage/catalog-client@1.4.4-next.0
+  - @backstage/plugin-catalog-common@1.0.16-next.0
+
+## @backstage/plugin-catalog-backend-module-bitbucket-server@0.1.16-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config@1.1.0-next.0
+  - @backstage/integration@1.7.0-next.1
+  - @backstage/backend-tasks@0.5.8-next.1
+  - @backstage/backend-common@0.19.5-next.1
+  - @backstage/backend-plugin-api@0.6.3-next.1
+  - @backstage/catalog-model@1.4.2-next.0
+  - @backstage/plugin-catalog-node@1.4.4-next.1
+  - @backstage/errors@1.2.1
+
+## @backstage/plugin-catalog-backend-module-gcp@0.1.3-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-kubernetes-common@0.6.6-next.0
+  - @backstage/config@1.1.0-next.0
+  - @backstage/backend-tasks@0.5.8-next.1
+  - @backstage/backend-common@0.19.5-next.1
+  - @backstage/backend-plugin-api@0.6.3-next.1
+  - @backstage/plugin-catalog-node@1.4.4-next.1
+
+## @backstage/plugin-catalog-backend-module-gerrit@0.1.19-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config@1.1.0-next.0
+  - @backstage/integration@1.7.0-next.1
+  - @backstage/backend-tasks@0.5.8-next.1
+  - @backstage/backend-common@0.19.5-next.1
+  - @backstage/backend-plugin-api@0.6.3-next.1
+  - @backstage/catalog-model@1.4.2-next.0
+  - @backstage/plugin-catalog-node@1.4.4-next.1
+  - @backstage/errors@1.2.1
+
+## @backstage/plugin-catalog-backend-module-github@0.3.8-next.1
+
+### Patch Changes
+
+- 3c44761b9191: Allow github user and team transforms to return any Entity
+- Updated dependencies
+  - @backstage/plugin-catalog-backend@1.13.0-next.1
+  - @backstage/config@1.1.0-next.0
+  - @backstage/integration@1.7.0-next.1
+  - @backstage/backend-tasks@0.5.8-next.1
+  - @backstage/backend-common@0.19.5-next.1
+  - @backstage/backend-plugin-api@0.6.3-next.1
+  - @backstage/catalog-model@1.4.2-next.0
+  - @backstage/plugin-catalog-node@1.4.4-next.1
+  - @backstage/plugin-events-node@0.2.12-next.1
+  - @backstage/catalog-client@1.4.4-next.0
+  - @backstage/plugin-catalog-common@1.0.16-next.0
+  - @backstage/errors@1.2.1
+  - @backstage/types@1.1.0
+
+## @backstage/plugin-catalog-backend-module-gitlab@0.2.7-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config@1.1.0-next.0
+  - @backstage/integration@1.7.0-next.1
+  - @backstage/backend-tasks@0.5.8-next.1
+  - @backstage/backend-common@0.19.5-next.1
+  - @backstage/backend-plugin-api@0.6.3-next.1
+  - @backstage/catalog-model@1.4.2-next.0
+  - @backstage/plugin-catalog-node@1.4.4-next.1
+  - @backstage/errors@1.2.1
+  - @backstage/types@1.1.0
+
+## @backstage/plugin-catalog-backend-module-incremental-ingestion@0.4.6-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-backend@1.13.0-next.1
+  - @backstage/config@1.1.0-next.0
+  - @backstage/backend-tasks@0.5.8-next.1
+  - @backstage/backend-common@0.19.5-next.1
+  - @backstage/backend-plugin-api@0.6.3-next.1
+  - @backstage/catalog-model@1.4.2-next.0
+  - @backstage/plugin-permission-common@0.7.8-next.0
+  - @backstage/plugin-catalog-node@1.4.4-next.1
+  - @backstage/plugin-events-node@0.2.12-next.1
+  - @backstage/errors@1.2.1
+
+## @backstage/plugin-catalog-backend-module-ldap@0.5.18-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config@1.1.0-next.0
+  - @backstage/backend-tasks@0.5.8-next.1
+  - @backstage/catalog-model@1.4.2-next.0
+  - @backstage/plugin-catalog-node@1.4.4-next.1
+  - @backstage/plugin-catalog-common@1.0.16-next.0
+  - @backstage/errors@1.2.1
+  - @backstage/types@1.1.0
+
+## @backstage/plugin-catalog-backend-module-msgraph@0.5.10-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config@1.1.0-next.0
+  - @backstage/backend-tasks@0.5.8-next.1
+  - @backstage/backend-common@0.19.5-next.1
+  - @backstage/backend-plugin-api@0.6.3-next.1
+  - @backstage/catalog-model@1.4.2-next.0
+  - @backstage/plugin-catalog-node@1.4.4-next.1
+  - @backstage/plugin-catalog-common@1.0.16-next.0
+
+## @backstage/plugin-catalog-backend-module-openapi@0.1.19-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-backend@1.13.0-next.1
+  - @backstage/config@1.1.0-next.0
+  - @backstage/integration@1.7.0-next.1
+  - @backstage/backend-common@0.19.5-next.1
+  - @backstage/catalog-model@1.4.2-next.0
+  - @backstage/plugin-catalog-node@1.4.4-next.1
+  - @backstage/plugin-catalog-common@1.0.16-next.0
+  - @backstage/types@1.1.0
+
+## @backstage/plugin-catalog-backend-module-puppetdb@0.1.8-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config@1.1.0-next.0
+  - @backstage/backend-tasks@0.5.8-next.1
+  - @backstage/backend-common@0.19.5-next.1
+  - @backstage/backend-plugin-api@0.6.3-next.1
+  - @backstage/catalog-model@1.4.2-next.0
+  - @backstage/plugin-catalog-node@1.4.4-next.1
+  - @backstage/errors@1.2.1
+  - @backstage/types@1.1.0
+
+## @backstage/plugin-catalog-backend-module-unprocessed@0.2.3-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@0.6.3-next.1
+  - @backstage/catalog-model@1.4.2-next.0
+  - @backstage/plugin-auth-node@0.3.0-next.1
+
+## @backstage/plugin-catalog-common@1.0.16-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/catalog-model@1.4.2-next.0
+  - @backstage/plugin-permission-common@0.7.8-next.0
+  - @backstage/plugin-search-common@1.2.6-next.0
+
+## @backstage/plugin-catalog-graph@0.2.36-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.8.4-next.1
+  - @backstage/core-components@0.13.5-next.1
+  - @backstage/catalog-model@1.4.2-next.0
+  - @backstage/core-plugin-api@1.6.0-next.1
+  - @backstage/catalog-client@1.4.4-next.0
+  - @backstage/theme@0.4.1
+  - @backstage/types@1.1.0
+
+## @backstage/plugin-catalog-graphql@0.3.23-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config@1.1.0-next.0
+  - @backstage/catalog-model@1.4.2-next.0
+  - @backstage/types@1.1.0
+
+## @backstage/plugin-catalog-import@0.9.14-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.8.4-next.1
+  - @backstage/core-components@0.13.5-next.1
+  - @backstage/config@1.1.0-next.0
+  - @backstage/integration@1.7.0-next.1
+  - @backstage/integration-react@1.1.19-next.1
+  - @backstage/catalog-model@1.4.2-next.0
+  - @backstage/core-plugin-api@1.6.0-next.1
+  - @backstage/catalog-client@1.4.4-next.0
+  - @backstage/plugin-catalog-common@1.0.16-next.0
+  - @backstage/errors@1.2.1
+
+## @backstage/plugin-catalog-node@1.4.4-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@0.6.3-next.1
+  - @backstage/catalog-model@1.4.2-next.0
+  - @backstage/catalog-client@1.4.4-next.0
+  - @backstage/plugin-catalog-common@1.0.16-next.0
+  - @backstage/errors@1.2.1
+  - @backstage/types@1.1.0
+
+## @backstage/plugin-catalog-react@1.8.4-next.1
+
+### Patch Changes
+
+- bd817209ddd7: Export the `EntityAutocompletePicker` component.
+- 7029ba1ce0af: Added delete alert popup when user delete the entity
+- Updated dependencies
+  - @backstage/core-components@0.13.5-next.1
+  - @backstage/integration@1.7.0-next.1
+  - @backstage/catalog-model@1.4.2-next.0
+  - @backstage/core-plugin-api@1.6.0-next.1
+  - @backstage/plugin-permission-common@0.7.8-next.0
+  - @backstage/plugin-permission-react@0.4.15-next.1
+  - @backstage/catalog-client@1.4.4-next.0
+  - @backstage/plugin-catalog-common@1.0.16-next.0
+  - @backstage/errors@1.2.1
+  - @backstage/theme@0.4.1
+  - @backstage/types@1.1.0
+  - @backstage/version-bridge@1.0.4
+
+## @backstage/plugin-catalog-unprocessed-entities@0.1.3-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.13.5-next.1
+  - @backstage/catalog-model@1.4.2-next.0
+  - @backstage/core-plugin-api@1.6.0-next.1
+  - @backstage/errors@1.2.1
+  - @backstage/theme@0.4.1
+
+## @backstage/plugin-cicd-statistics@0.1.26-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.8.4-next.1
+  - @backstage/catalog-model@1.4.2-next.0
+  - @backstage/core-plugin-api@1.6.0-next.1
+
+## @backstage/plugin-cicd-statistics-module-gitlab@0.1.20-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-cicd-statistics@0.1.26-next.1
+  - @backstage/catalog-model@1.4.2-next.0
+  - @backstage/core-plugin-api@1.6.0-next.1
+
+## @backstage/plugin-circleci@0.3.24-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.8.4-next.1
+  - @backstage/core-components@0.13.5-next.1
+  - @backstage/catalog-model@1.4.2-next.0
+  - @backstage/core-plugin-api@1.6.0-next.1
+  - @backstage/theme@0.4.1
+
+## @backstage/plugin-cloudbuild@0.3.24-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.8.4-next.1
+  - @backstage/core-components@0.13.5-next.1
+  - @backstage/catalog-model@1.4.2-next.0
+  - @backstage/core-plugin-api@1.6.0-next.1
+  - @backstage/theme@0.4.1
+
+## @backstage/plugin-code-climate@0.1.24-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.8.4-next.1
+  - @backstage/core-components@0.13.5-next.1
+  - @backstage/catalog-model@1.4.2-next.0
+  - @backstage/core-plugin-api@1.6.0-next.1
+  - @backstage/theme@0.4.1
+
+## @backstage/plugin-code-coverage@0.2.17-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.8.4-next.1
+  - @backstage/core-components@0.13.5-next.1
+  - @backstage/config@1.1.0-next.0
+  - @backstage/catalog-model@1.4.2-next.0
+  - @backstage/core-plugin-api@1.6.0-next.1
+  - @backstage/errors@1.2.1
+  - @backstage/theme@0.4.1
+
+## @backstage/plugin-code-coverage-backend@0.2.17-next.1
+
+### Patch Changes
+
+- d409ed988aed: Correct the line hits calculation for Cobertura reports
+- Updated dependencies
+  - @backstage/config@1.1.0-next.0
+  - @backstage/integration@1.7.0-next.1
+  - @backstage/backend-common@0.19.5-next.1
+  - @backstage/catalog-model@1.4.2-next.0
+  - @backstage/catalog-client@1.4.4-next.0
+  - @backstage/errors@1.2.1
+
+## @backstage/plugin-codescene@0.1.17-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.13.5-next.1
+  - @backstage/config@1.1.0-next.0
+  - @backstage/core-plugin-api@1.6.0-next.1
+  - @backstage/errors@1.2.1
+  - @backstage/theme@0.4.1
+
+## @backstage/plugin-config-schema@0.1.45-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.13.5-next.1
+  - @backstage/config@1.1.0-next.0
+  - @backstage/core-plugin-api@1.6.0-next.1
+  - @backstage/errors@1.2.1
+  - @backstage/theme@0.4.1
+  - @backstage/types@1.1.0
+
+## @backstage/plugin-cost-insights@0.12.13-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.8.4-next.1
+  - @backstage/core-components@0.13.5-next.1
+  - @backstage/config@1.1.0-next.0
+  - @backstage/catalog-model@1.4.2-next.0
+  - @backstage/core-plugin-api@1.6.0-next.1
+  - @backstage/theme@0.4.1
+  - @backstage/plugin-cost-insights-common@0.1.1
+
+## @backstage/plugin-devtools@0.1.4-next.1
+
+### Patch Changes
+
+- 12e644aa4eef: Show resource utilization in `DevTools` plugin
+- Updated dependencies
+  - @backstage/core-components@0.13.5-next.1
+  - @backstage/plugin-devtools-common@0.1.4-next.0
+  - @backstage/core-plugin-api@1.6.0-next.1
+  - @backstage/plugin-permission-react@0.4.15-next.1
+  - @backstage/errors@1.2.1
+  - @backstage/theme@0.4.1
+  - @backstage/types@1.1.0
+
+## @backstage/plugin-devtools-backend@0.1.6-next.1
+
+### Patch Changes
+
+- 12e644aa4eef: Show resource utilization in `DevTools` plugin
+- Updated dependencies
+  - @backstage/config@1.1.0-next.0
+  - @backstage/plugin-devtools-common@0.1.4-next.0
+  - @backstage/backend-common@0.19.5-next.1
+  - @backstage/backend-plugin-api@0.6.3-next.1
+  - @backstage/config-loader@1.5.0-next.1
+  - @backstage/plugin-auth-node@0.3.0-next.1
+  - @backstage/plugin-permission-common@0.7.8-next.0
+  - @backstage/plugin-permission-node@0.7.14-next.1
+  - @backstage/cli-common@0.1.12
+  - @backstage/errors@1.2.1
+  - @backstage/types@1.1.0
+
+## @backstage/plugin-devtools-common@0.1.4-next.0
+
+### Patch Changes
+
+- 12e644aa4eef: Show resource utilization in `DevTools` plugin
+- Updated dependencies
+  - @backstage/plugin-permission-common@0.7.8-next.0
+  - @backstage/types@1.1.0
+
+## @backstage/plugin-dynatrace@7.0.4-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.8.4-next.1
+  - @backstage/core-components@0.13.5-next.1
+  - @backstage/catalog-model@1.4.2-next.0
+  - @backstage/core-plugin-api@1.6.0-next.1
+  - @backstage/theme@0.4.1
+
+## @backstage/plugin-entity-feedback@0.2.7-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.8.4-next.1
+  - @backstage/core-components@0.13.5-next.1
+  - @backstage/catalog-model@1.4.2-next.0
+  - @backstage/core-plugin-api@1.6.0-next.1
+  - @backstage/errors@1.2.1
+  - @backstage/theme@0.4.1
+  - @backstage/plugin-entity-feedback-common@0.1.2
+
+## @backstage/plugin-entity-feedback-backend@0.1.9-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config@1.1.0-next.0
+  - @backstage/backend-common@0.19.5-next.1
+  - @backstage/backend-plugin-api@0.6.3-next.1
+  - @backstage/catalog-model@1.4.2-next.0
+  - @backstage/plugin-auth-node@0.3.0-next.1
+  - @backstage/catalog-client@1.4.4-next.0
+  - @backstage/plugin-entity-feedback-common@0.1.2
+
+## @backstage/plugin-entity-validation@0.1.9-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.8.4-next.1
+  - @backstage/core-components@0.13.5-next.1
+  - @backstage/catalog-model@1.4.2-next.0
+  - @backstage/core-plugin-api@1.6.0-next.1
+  - @backstage/catalog-client@1.4.4-next.0
+  - @backstage/plugin-catalog-common@1.0.16-next.0
+  - @backstage/errors@1.2.1
+  - @backstage/theme@0.4.1
+
+## @backstage/plugin-events-backend@0.2.12-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config@1.1.0-next.0
+  - @backstage/backend-common@0.19.5-next.1
+  - @backstage/backend-plugin-api@0.6.3-next.1
+  - @backstage/plugin-events-node@0.2.12-next.1
+
+## @backstage/plugin-events-backend-module-aws-sqs@0.2.6-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config@1.1.0-next.0
+  - @backstage/backend-tasks@0.5.8-next.1
+  - @backstage/backend-common@0.19.5-next.1
+  - @backstage/backend-plugin-api@0.6.3-next.1
+  - @backstage/plugin-events-node@0.2.12-next.1
+  - @backstage/types@1.1.0
+
+## @backstage/plugin-events-backend-module-azure@0.1.13-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@0.6.3-next.1
+  - @backstage/plugin-events-node@0.2.12-next.1
+
+## @backstage/plugin-events-backend-module-bitbucket-cloud@0.1.13-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@0.6.3-next.1
+  - @backstage/plugin-events-node@0.2.12-next.1
+
+## @backstage/plugin-events-backend-module-gerrit@0.1.13-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@0.6.3-next.1
+  - @backstage/plugin-events-node@0.2.12-next.1
+
+## @backstage/plugin-events-backend-module-github@0.1.13-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config@1.1.0-next.0
+  - @backstage/backend-plugin-api@0.6.3-next.1
+  - @backstage/plugin-events-node@0.2.12-next.1
+
+## @backstage/plugin-events-backend-module-gitlab@0.1.13-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config@1.1.0-next.0
+  - @backstage/backend-plugin-api@0.6.3-next.1
+  - @backstage/plugin-events-node@0.2.12-next.1
+
+## @backstage/plugin-events-backend-test-utils@0.1.13-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-events-node@0.2.12-next.1
+
+## @backstage/plugin-events-node@0.2.12-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@0.6.3-next.1
+
+## @backstage/plugin-explore@0.4.10-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.8.4-next.1
+  - @backstage/core-components@0.13.5-next.1
+  - @backstage/plugin-search-react@1.7.0-next.1
+  - @backstage/catalog-model@1.4.2-next.0
+  - @backstage/core-plugin-api@1.6.0-next.1
+  - @backstage/plugin-explore-react@0.0.31-next.1
+  - @backstage/errors@1.2.1
+  - @backstage/theme@0.4.1
+  - @backstage/plugin-explore-common@0.0.1
+  - @backstage/plugin-search-common@1.2.6-next.0
+
+## @backstage/plugin-explore-backend@0.0.13-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config@1.1.0-next.0
+  - @backstage/backend-common@0.19.5-next.1
+  - @backstage/plugin-search-backend-module-explore@0.1.7-next.1
+  - @backstage/types@1.1.0
+  - @backstage/plugin-explore-common@0.0.1
+  - @backstage/plugin-search-common@1.2.6-next.0
+
+## @backstage/plugin-explore-react@0.0.31-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-plugin-api@1.6.0-next.1
+  - @backstage/plugin-explore-common@0.0.1
+
+## @backstage/plugin-firehydrant@0.2.8-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.8.4-next.1
+  - @backstage/core-components@0.13.5-next.1
+  - @backstage/catalog-model@1.4.2-next.0
+  - @backstage/core-plugin-api@1.6.0-next.1
+  - @backstage/theme@0.4.1
+
+## @backstage/plugin-fossa@0.2.56-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.8.4-next.1
+  - @backstage/core-components@0.13.5-next.1
+  - @backstage/catalog-model@1.4.2-next.0
+  - @backstage/core-plugin-api@1.6.0-next.1
+  - @backstage/errors@1.2.1
+  - @backstage/theme@0.4.1
+
+## @backstage/plugin-gcalendar@0.3.18-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.13.5-next.1
+  - @backstage/core-plugin-api@1.6.0-next.1
+  - @backstage/errors@1.2.1
+  - @backstage/theme@0.4.1
+
+## @backstage/plugin-gcp-projects@0.3.41-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.13.5-next.1
+  - @backstage/core-plugin-api@1.6.0-next.1
+  - @backstage/theme@0.4.1
+
+## @backstage/plugin-git-release-manager@0.3.37-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.13.5-next.1
+  - @backstage/integration@1.7.0-next.1
+  - @backstage/core-plugin-api@1.6.0-next.1
+  - @backstage/theme@0.4.1
+
+## @backstage/plugin-github-actions@0.6.5-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.8.4-next.1
+  - @backstage/core-components@0.13.5-next.1
+  - @backstage/integration@1.7.0-next.1
+  - @backstage/integration-react@1.1.19-next.1
+  - @backstage/catalog-model@1.4.2-next.0
+  - @backstage/core-plugin-api@1.6.0-next.1
+  - @backstage/theme@0.4.1
+
+## @backstage/plugin-github-deployments@0.1.55-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.8.4-next.1
+  - @backstage/core-components@0.13.5-next.1
+  - @backstage/integration@1.7.0-next.1
+  - @backstage/integration-react@1.1.19-next.1
+  - @backstage/catalog-model@1.4.2-next.0
+  - @backstage/core-plugin-api@1.6.0-next.1
+  - @backstage/errors@1.2.1
+  - @backstage/theme@0.4.1
+
+## @backstage/plugin-github-issues@0.2.13-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.8.4-next.1
+  - @backstage/core-components@0.13.5-next.1
+  - @backstage/integration@1.7.0-next.1
+  - @backstage/catalog-model@1.4.2-next.0
+  - @backstage/core-plugin-api@1.6.0-next.1
+  - @backstage/errors@1.2.1
+  - @backstage/theme@0.4.1
+
+## @backstage/plugin-github-pull-requests-board@0.1.18-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.8.4-next.1
+  - @backstage/core-components@0.13.5-next.1
+  - @backstage/integration@1.7.0-next.1
+  - @backstage/catalog-model@1.4.2-next.0
+  - @backstage/core-plugin-api@1.6.0-next.1
+  - @backstage/theme@0.4.1
+
+## @backstage/plugin-gitops-profiles@0.3.40-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.13.5-next.1
+  - @backstage/config@1.1.0-next.0
+  - @backstage/core-plugin-api@1.6.0-next.1
+  - @backstage/theme@0.4.1
+
+## @backstage/plugin-gocd@0.1.30-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.8.4-next.1
+  - @backstage/core-components@0.13.5-next.1
+  - @backstage/catalog-model@1.4.2-next.0
+  - @backstage/core-plugin-api@1.6.0-next.1
+  - @backstage/errors@1.2.1
+  - @backstage/theme@0.4.1
+
+## @backstage/plugin-graphiql@0.2.54-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.13.5-next.1
+  - @backstage/core-plugin-api@1.6.0-next.1
+  - @backstage/theme@0.4.1
+
+## @backstage/plugin-graphql-backend@0.1.41-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config@1.1.0-next.0
+  - @backstage/backend-common@0.19.5-next.1
+  - @backstage/plugin-catalog-graphql@0.3.23-next.0
+
+## @backstage/plugin-graphql-voyager@0.1.7-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.13.5-next.1
+  - @backstage/core-plugin-api@1.6.0-next.1
+  - @backstage/theme@0.4.1
+
+## @backstage/plugin-home@0.5.8-next.1
+
+### Patch Changes
+
+- 98bb77c1f0b8: Align zod dependency to align with other packages.
+- 1853ffa09b50: Allow specifying static widgets to custom home page
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.8.4-next.1
+  - @backstage/core-components@0.13.5-next.1
+  - @backstage/config@1.1.0-next.0
+  - @backstage/plugin-home-react@0.1.3-next.1
+  - @backstage/catalog-model@1.4.2-next.0
+  - @backstage/core-plugin-api@1.6.0-next.1
+  - @backstage/theme@0.4.1
+
+## @backstage/plugin-home-react@0.1.3-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.13.5-next.1
+  - @backstage/core-plugin-api@1.6.0-next.1
+
+## @backstage/plugin-ilert@0.2.13-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.8.4-next.1
+  - @backstage/core-components@0.13.5-next.1
+  - @backstage/catalog-model@1.4.2-next.0
+  - @backstage/core-plugin-api@1.6.0-next.1
+  - @backstage/errors@1.2.1
+  - @backstage/theme@0.4.1
+
+## @backstage/plugin-jenkins@0.8.6-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.8.4-next.1
+  - @backstage/core-components@0.13.5-next.1
+  - @backstage/catalog-model@1.4.2-next.0
+  - @backstage/core-plugin-api@1.6.0-next.1
+  - @backstage/errors@1.2.1
+  - @backstage/theme@0.4.1
+  - @backstage/plugin-jenkins-common@0.1.19-next.0
+
+## @backstage/plugin-jenkins-backend@0.2.6-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config@1.1.0-next.0
+  - @backstage/backend-common@0.19.5-next.1
+  - @backstage/catalog-model@1.4.2-next.0
+  - @backstage/plugin-auth-node@0.3.0-next.1
+  - @backstage/plugin-permission-common@0.7.8-next.0
+  - @backstage/plugin-permission-node@0.7.14-next.1
+  - @backstage/catalog-client@1.4.4-next.0
+  - @backstage/errors@1.2.1
+  - @backstage/plugin-jenkins-common@0.1.19-next.0
+
+## @backstage/plugin-jenkins-common@0.1.19-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-permission-common@0.7.8-next.0
+  - @backstage/plugin-catalog-common@1.0.16-next.0
+
+## @backstage/plugin-kafka@0.3.24-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.8.4-next.1
+  - @backstage/core-components@0.13.5-next.1
+  - @backstage/config@1.1.0-next.0
+  - @backstage/catalog-model@1.4.2-next.0
+  - @backstage/core-plugin-api@1.6.0-next.1
+  - @backstage/theme@0.4.1
+
+## @backstage/plugin-kafka-backend@0.2.44-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config@1.1.0-next.0
+  - @backstage/backend-common@0.19.5-next.1
+  - @backstage/backend-plugin-api@0.6.3-next.1
+  - @backstage/catalog-model@1.4.2-next.0
+  - @backstage/errors@1.2.1
+
+## @backstage/plugin-kubernetes@0.10.3-next.1
+
+### Patch Changes
+
+- 6a5e04e20e6e: fix logs dialog min height
+- Updated dependencies
+  - @backstage/plugin-kubernetes-common@0.6.6-next.0
+  - @backstage/plugin-catalog-react@1.8.4-next.1
+  - @backstage/core-components@0.13.5-next.1
+  - @backstage/config@1.1.0-next.0
+  - @backstage/catalog-model@1.4.2-next.0
+  - @backstage/core-plugin-api@1.6.0-next.1
+  - @backstage/errors@1.2.1
+  - @backstage/theme@0.4.1
+
+## @backstage/plugin-kubernetes-backend@0.11.6-next.1
+
+### Patch Changes
+
+- ccf00accb408: Add AWS Annotations to Kubernetes Cluster Resource
+- 47ea122590f5: fix "undefined" kind for custom resources
+- Updated dependencies
+  - @backstage/plugin-kubernetes-common@0.6.6-next.0
+  - @backstage/config@1.1.0-next.0
+  - @backstage/backend-common@0.19.5-next.1
+  - @backstage/backend-plugin-api@0.6.3-next.1
+  - @backstage/catalog-model@1.4.2-next.0
+  - @backstage/integration-aws-node@0.1.6-next.0
+  - @backstage/plugin-auth-node@0.3.0-next.1
+  - @backstage/plugin-permission-common@0.7.8-next.0
+  - @backstage/plugin-permission-node@0.7.14-next.1
+  - @backstage/plugin-catalog-node@1.4.4-next.1
+  - @backstage/catalog-client@1.4.4-next.0
+  - @backstage/errors@1.2.1
+  - @backstage/types@1.1.0
+
+## @backstage/plugin-kubernetes-common@0.6.6-next.0
+
+### Patch Changes
+
+- ccf00accb408: Add AWS Annotations to Kubernetes Cluster Resource
+- Updated dependencies
+  - @backstage/catalog-model@1.4.2-next.0
+  - @backstage/plugin-permission-common@0.7.8-next.0
+
+## @backstage/plugin-lighthouse@0.4.9-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.8.4-next.1
+  - @backstage/core-components@0.13.5-next.1
+  - @backstage/config@1.1.0-next.0
+  - @backstage/catalog-model@1.4.2-next.0
+  - @backstage/core-plugin-api@1.6.0-next.1
+  - @backstage/plugin-lighthouse-common@0.1.3-next.0
+  - @backstage/theme@0.4.1
+
+## @backstage/plugin-lighthouse-backend@0.2.7-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config@1.1.0-next.0
+  - @backstage/backend-tasks@0.5.8-next.1
+  - @backstage/backend-common@0.19.5-next.1
+  - @backstage/backend-plugin-api@0.6.3-next.1
+  - @backstage/catalog-model@1.4.2-next.0
+  - @backstage/plugin-lighthouse-common@0.1.3-next.0
+  - @backstage/plugin-catalog-node@1.4.4-next.1
+  - @backstage/catalog-client@1.4.4-next.0
+  - @backstage/types@1.1.0
+
+## @backstage/plugin-lighthouse-common@0.1.3-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config@1.1.0-next.0
+
+## @backstage/plugin-linguist@0.1.9-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.8.4-next.1
+  - @backstage/core-components@0.13.5-next.1
+  - @backstage/catalog-model@1.4.2-next.0
+  - @backstage/core-plugin-api@1.6.0-next.1
+  - @backstage/errors@1.2.1
+  - @backstage/theme@0.4.1
+  - @backstage/plugin-linguist-common@0.1.1
+
+## @backstage/plugin-linguist-backend@0.4.3-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config@1.1.0-next.0
+  - @backstage/backend-tasks@0.5.8-next.1
+  - @backstage/backend-common@0.19.5-next.1
+  - @backstage/backend-plugin-api@0.6.3-next.1
+  - @backstage/catalog-model@1.4.2-next.0
+  - @backstage/plugin-auth-node@0.3.0-next.1
+  - @backstage/plugin-catalog-node@1.4.4-next.1
+  - @backstage/catalog-client@1.4.4-next.0
+  - @backstage/errors@1.2.1
+  - @backstage/types@1.1.0
+  - @backstage/plugin-linguist-common@0.1.1
+
+## @backstage/plugin-microsoft-calendar@0.1.7-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.13.5-next.1
+  - @backstage/core-plugin-api@1.6.0-next.1
+  - @backstage/errors@1.2.1
+  - @backstage/theme@0.4.1
+
+## @backstage/plugin-newrelic@0.3.40-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.13.5-next.1
+  - @backstage/core-plugin-api@1.6.0-next.1
+  - @backstage/theme@0.4.1
+
+## @backstage/plugin-newrelic-dashboard@0.2.17-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.8.4-next.1
+  - @backstage/core-components@0.13.5-next.1
+  - @backstage/catalog-model@1.4.2-next.0
+  - @backstage/core-plugin-api@1.6.0-next.1
+  - @backstage/errors@1.2.1
+
+## @backstage/plugin-nomad@0.1.5-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.8.4-next.1
+  - @backstage/core-components@0.13.5-next.1
+  - @backstage/config@1.1.0-next.0
+  - @backstage/catalog-model@1.4.2-next.0
+  - @backstage/core-plugin-api@1.6.0-next.1
+  - @backstage/theme@0.4.1
+
+## @backstage/plugin-nomad-backend@0.1.5-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config@1.1.0-next.0
+  - @backstage/backend-common@0.19.5-next.1
+  - @backstage/errors@1.2.1
+
+## @backstage/plugin-octopus-deploy@0.2.6-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.8.4-next.1
+  - @backstage/core-components@0.13.5-next.1
+  - @backstage/catalog-model@1.4.2-next.0
+  - @backstage/core-plugin-api@1.6.0-next.1
+  - @backstage/theme@0.4.1
+
+## @backstage/plugin-opencost@0.2.0-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.13.5-next.1
+  - @backstage/core-plugin-api@1.6.0-next.1
+  - @backstage/theme@0.4.1
+
+## @backstage/plugin-org@0.6.14-next.1
+
+### Patch Changes
+
+- 43a2137bb829: Ensure direct relations are shown for User entities while keeping support for aggregating closest parent group ownership
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.8.4-next.1
+  - @backstage/core-components@0.13.5-next.1
+  - @backstage/catalog-model@1.4.2-next.0
+  - @backstage/core-plugin-api@1.6.0-next.1
+  - @backstage/theme@0.4.1
+
+## @backstage/plugin-org-react@0.1.13-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.8.4-next.1
+  - @backstage/core-components@0.13.5-next.1
+  - @backstage/catalog-model@1.4.2-next.0
+  - @backstage/core-plugin-api@1.6.0-next.1
+  - @backstage/catalog-client@1.4.4-next.0
+  - @backstage/theme@0.4.1
+
+## @backstage/plugin-pagerduty@0.6.5-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.8.4-next.1
+  - @backstage/core-components@0.13.5-next.1
+  - @backstage/plugin-home-react@0.1.3-next.1
+  - @backstage/catalog-model@1.4.2-next.0
+  - @backstage/core-plugin-api@1.6.0-next.1
+  - @backstage/errors@1.2.1
+  - @backstage/theme@0.4.1
+
+## @backstage/plugin-periskop@0.1.22-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.8.4-next.1
+  - @backstage/core-components@0.13.5-next.1
+  - @backstage/catalog-model@1.4.2-next.0
+  - @backstage/core-plugin-api@1.6.0-next.1
+  - @backstage/errors@1.2.1
+  - @backstage/theme@0.4.1
+
+## @backstage/plugin-periskop-backend@0.1.22-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config@1.1.0-next.0
+  - @backstage/backend-common@0.19.5-next.1
+  - @backstage/backend-plugin-api@0.6.3-next.1
+
+## @backstage/plugin-permission-backend@0.5.26-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config@1.1.0-next.0
+  - @backstage/backend-common@0.19.5-next.1
+  - @backstage/backend-plugin-api@0.6.3-next.1
+  - @backstage/plugin-auth-node@0.3.0-next.1
+  - @backstage/plugin-permission-common@0.7.8-next.0
+  - @backstage/plugin-permission-node@0.7.14-next.1
+  - @backstage/errors@1.2.1
+
+## @backstage/plugin-permission-common@0.7.8-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config@1.1.0-next.0
+  - @backstage/errors@1.2.1
+  - @backstage/types@1.1.0
+
+## @backstage/plugin-permission-node@0.7.14-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config@1.1.0-next.0
+  - @backstage/backend-common@0.19.5-next.1
+  - @backstage/backend-plugin-api@0.6.3-next.1
+  - @backstage/plugin-auth-node@0.3.0-next.1
+  - @backstage/plugin-permission-common@0.7.8-next.0
+  - @backstage/errors@1.2.1
+
+## @backstage/plugin-permission-react@0.4.15-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config@1.1.0-next.0
+  - @backstage/core-plugin-api@1.6.0-next.1
+  - @backstage/plugin-permission-common@0.7.8-next.0
+
+## @backstage/plugin-playlist@0.1.16-next.1
+
+### Patch Changes
+
+- ec4b0f8cd957: change color of delete icon to secondary in playlist table
+- b5ba33a92750: Limit the use of the same playlist name when adding a playlist
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.8.4-next.1
+  - @backstage/core-components@0.13.5-next.1
+  - @backstage/plugin-search-react@1.7.0-next.1
+  - @backstage/catalog-model@1.4.2-next.0
+  - @backstage/core-plugin-api@1.6.0-next.1
+  - @backstage/plugin-permission-common@0.7.8-next.0
+  - @backstage/plugin-permission-react@0.4.15-next.1
+  - @backstage/plugin-catalog-common@1.0.16-next.0
+  - @backstage/errors@1.2.1
+  - @backstage/theme@0.4.1
+  - @backstage/plugin-playlist-common@0.1.10-next.0
+
+## @backstage/plugin-playlist-backend@0.3.7-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config@1.1.0-next.0
+  - @backstage/backend-common@0.19.5-next.1
+  - @backstage/catalog-model@1.4.2-next.0
+  - @backstage/plugin-auth-node@0.3.0-next.1
+  - @backstage/plugin-permission-common@0.7.8-next.0
+  - @backstage/plugin-permission-node@0.7.14-next.1
+  - @backstage/catalog-client@1.4.4-next.0
+  - @backstage/errors@1.2.1
+  - @backstage/plugin-playlist-common@0.1.10-next.0
+
+## @backstage/plugin-playlist-common@0.1.10-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-permission-common@0.7.8-next.0
+
+## @backstage/plugin-proxy-backend@0.3.3-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config@1.1.0-next.0
+  - @backstage/backend-common@0.19.5-next.1
+  - @backstage/backend-plugin-api@0.6.3-next.1
+
+## @backstage/plugin-puppetdb@0.1.7-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.8.4-next.1
+  - @backstage/core-components@0.13.5-next.1
+  - @backstage/catalog-model@1.4.2-next.0
+  - @backstage/core-plugin-api@1.6.0-next.1
+  - @backstage/errors@1.2.1
+  - @backstage/theme@0.4.1
+
+## @backstage/plugin-rollbar@0.4.24-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.8.4-next.1
+  - @backstage/core-components@0.13.5-next.1
+  - @backstage/catalog-model@1.4.2-next.0
+  - @backstage/core-plugin-api@1.6.0-next.1
+  - @backstage/theme@0.4.1
+
+## @backstage/plugin-rollbar-backend@0.1.48-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config@1.1.0-next.0
+  - @backstage/backend-common@0.19.5-next.1
+
+## @backstage/plugin-scaffolder@1.14.5-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.8.4-next.1
+  - @backstage/core-components@0.13.5-next.1
+  - @backstage/config@1.1.0-next.0
+  - @backstage/integration@1.7.0-next.1
+  - @backstage/plugin-scaffolder-react@1.5.5-next.1
+  - @backstage/integration-react@1.1.19-next.1
+  - @backstage/catalog-model@1.4.2-next.0
+  - @backstage/core-plugin-api@1.6.0-next.1
+  - @backstage/plugin-permission-react@0.4.15-next.1
+  - @backstage/catalog-client@1.4.4-next.0
+  - @backstage/plugin-catalog-common@1.0.16-next.0
+  - @backstage/plugin-scaffolder-common@1.4.1-next.0
+  - @backstage/errors@1.2.1
+  - @backstage/theme@0.4.1
+  - @backstage/types@1.1.0
+
+## @backstage/plugin-scaffolder-backend@1.16.6-next.1
+
+### Patch Changes
+
+- f3c0b95e3ef1: Add examples for `github:actions:dispatch` scaffolder actions.
+- Updated dependencies
+  - @backstage/plugin-catalog-backend@1.13.0-next.1
+  - @backstage/config@1.1.0-next.0
+  - @backstage/integration@1.7.0-next.1
+  - @backstage/backend-tasks@0.5.8-next.1
+  - @backstage/backend-common@0.19.5-next.1
+  - @backstage/backend-plugin-api@0.6.3-next.1
+  - @backstage/catalog-model@1.4.2-next.0
+  - @backstage/plugin-auth-node@0.3.0-next.1
+  - @backstage/plugin-permission-common@0.7.8-next.0
+  - @backstage/plugin-permission-node@0.7.14-next.1
+  - @backstage/plugin-scaffolder-node@0.2.3-next.1
+  - @backstage/plugin-catalog-node@1.4.4-next.1
+  - @backstage/catalog-client@1.4.4-next.0
+  - @backstage/plugin-catalog-common@1.0.16-next.0
+  - @backstage/plugin-scaffolder-common@1.4.1-next.0
+  - @backstage/errors@1.2.1
+  - @backstage/types@1.1.0
+
+## @backstage/plugin-scaffolder-backend-module-confluence-to-markdown@0.2.4-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config@1.1.0-next.0
+  - @backstage/integration@1.7.0-next.1
+  - @backstage/backend-common@0.19.5-next.1
+  - @backstage/plugin-scaffolder-node@0.2.3-next.1
+  - @backstage/errors@1.2.1
+  - @backstage/types@1.1.0
+
+## @backstage/plugin-scaffolder-backend-module-cookiecutter@0.2.27-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config@1.1.0-next.0
+  - @backstage/integration@1.7.0-next.1
+  - @backstage/backend-common@0.19.5-next.1
+  - @backstage/plugin-scaffolder-node@0.2.3-next.1
+  - @backstage/errors@1.2.1
+  - @backstage/types@1.1.0
+
+## @backstage/plugin-scaffolder-backend-module-gitlab@0.2.6-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config@1.1.0-next.0
+  - @backstage/integration@1.7.0-next.1
+  - @backstage/plugin-scaffolder-node@0.2.3-next.1
+  - @backstage/errors@1.2.1
+
+## @backstage/plugin-scaffolder-backend-module-rails@0.4.20-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config@1.1.0-next.0
+  - @backstage/integration@1.7.0-next.1
+  - @backstage/backend-common@0.19.5-next.1
+  - @backstage/plugin-scaffolder-node@0.2.3-next.1
+  - @backstage/errors@1.2.1
+  - @backstage/types@1.1.0
+
+## @backstage/plugin-scaffolder-backend-module-sentry@0.1.11-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config@1.1.0-next.0
+  - @backstage/plugin-scaffolder-node@0.2.3-next.1
+  - @backstage/errors@1.2.1
+
+## @backstage/plugin-scaffolder-backend-module-yeoman@0.2.24-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config@1.1.0-next.0
+  - @backstage/plugin-scaffolder-node@0.2.3-next.1
+  - @backstage/types@1.1.0
+
+## @backstage/plugin-scaffolder-common@1.4.1-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/catalog-model@1.4.2-next.0
+  - @backstage/plugin-permission-common@0.7.8-next.0
+  - @backstage/types@1.1.0
+
+## @backstage/plugin-scaffolder-node@0.2.3-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/integration@1.7.0-next.1
+  - @backstage/backend-common@0.19.5-next.1
+  - @backstage/backend-plugin-api@0.6.3-next.1
+  - @backstage/catalog-model@1.4.2-next.0
+  - @backstage/plugin-scaffolder-common@1.4.1-next.0
+  - @backstage/errors@1.2.1
+  - @backstage/types@1.1.0
+
+## @backstage/plugin-scaffolder-react@1.5.5-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.8.4-next.1
+  - @backstage/core-components@0.13.5-next.1
+  - @backstage/catalog-model@1.4.2-next.0
+  - @backstage/core-plugin-api@1.6.0-next.1
+  - @backstage/catalog-client@1.4.4-next.0
+  - @backstage/plugin-scaffolder-common@1.4.1-next.0
+  - @backstage/errors@1.2.1
+  - @backstage/theme@0.4.1
+  - @backstage/types@1.1.0
+  - @backstage/version-bridge@1.0.4
+
+## @backstage/plugin-search-backend@1.4.3-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config@1.1.0-next.0
+  - @backstage/backend-common@0.19.5-next.1
+  - @backstage/backend-plugin-api@0.6.3-next.1
+  - @backstage/plugin-auth-node@0.3.0-next.1
+  - @backstage/plugin-permission-common@0.7.8-next.0
+  - @backstage/plugin-permission-node@0.7.14-next.1
+  - @backstage/plugin-search-backend-node@1.2.7-next.1
+  - @backstage/backend-openapi-utils@0.0.3
+  - @backstage/errors@1.2.1
+  - @backstage/types@1.1.0
+  - @backstage/plugin-search-common@1.2.6-next.0
+
+## @backstage/plugin-search-backend-module-catalog@0.1.7-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config@1.1.0-next.0
+  - @backstage/backend-tasks@0.5.8-next.1
+  - @backstage/backend-common@0.19.5-next.1
+  - @backstage/backend-plugin-api@0.6.3-next.1
+  - @backstage/catalog-model@1.4.2-next.0
+  - @backstage/plugin-permission-common@0.7.8-next.0
+  - @backstage/plugin-search-backend-node@1.2.7-next.1
+  - @backstage/plugin-catalog-node@1.4.4-next.1
+  - @backstage/catalog-client@1.4.4-next.0
+  - @backstage/plugin-catalog-common@1.0.16-next.0
+  - @backstage/errors@1.2.1
+  - @backstage/plugin-search-common@1.2.6-next.0
+
+## @backstage/plugin-search-backend-module-elasticsearch@1.3.6-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config@1.1.0-next.0
+  - @backstage/backend-common@0.19.5-next.1
+  - @backstage/backend-plugin-api@0.6.3-next.1
+  - @backstage/integration-aws-node@0.1.6-next.0
+  - @backstage/plugin-search-backend-node@1.2.7-next.1
+  - @backstage/plugin-search-common@1.2.6-next.0
+
+## @backstage/plugin-search-backend-module-explore@0.1.7-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config@1.1.0-next.0
+  - @backstage/backend-tasks@0.5.8-next.1
+  - @backstage/backend-common@0.19.5-next.1
+  - @backstage/backend-plugin-api@0.6.3-next.1
+  - @backstage/plugin-search-backend-node@1.2.7-next.1
+  - @backstage/plugin-explore-common@0.0.1
+  - @backstage/plugin-search-common@1.2.6-next.0
+
+## @backstage/plugin-search-backend-module-pg@0.5.12-next.1
+
+### Patch Changes
+
+- 4ccf9204bc95: Added `indexerBatchSize` option to be able to control the size of the batches being indexed. Also added a debug log entry to list out all the entities in the batch
+- Updated dependencies
+  - @backstage/config@1.1.0-next.0
+  - @backstage/backend-common@0.19.5-next.1
+  - @backstage/backend-plugin-api@0.6.3-next.1
+  - @backstage/plugin-search-backend-node@1.2.7-next.1
+  - @backstage/plugin-search-common@1.2.6-next.0
+
+## @backstage/plugin-search-backend-module-techdocs@0.1.7-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config@1.1.0-next.0
+  - @backstage/backend-tasks@0.5.8-next.1
+  - @backstage/plugin-techdocs-node@1.8.0-next.1
+  - @backstage/backend-common@0.19.5-next.1
+  - @backstage/backend-plugin-api@0.6.3-next.1
+  - @backstage/catalog-model@1.4.2-next.0
+  - @backstage/plugin-permission-common@0.7.8-next.0
+  - @backstage/plugin-search-backend-node@1.2.7-next.1
+  - @backstage/plugin-catalog-node@1.4.4-next.1
+  - @backstage/catalog-client@1.4.4-next.0
+  - @backstage/plugin-catalog-common@1.0.16-next.0
+  - @backstage/plugin-search-common@1.2.6-next.0
+
+## @backstage/plugin-search-backend-node@1.2.7-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config@1.1.0-next.0
+  - @backstage/backend-tasks@0.5.8-next.1
+  - @backstage/backend-common@0.19.5-next.1
+  - @backstage/backend-plugin-api@0.6.3-next.1
+  - @backstage/plugin-permission-common@0.7.8-next.0
+  - @backstage/errors@1.2.1
+  - @backstage/plugin-search-common@1.2.6-next.0
+
+## @backstage/plugin-search-common@1.2.6-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-permission-common@0.7.8-next.0
+  - @backstage/types@1.1.0
+
+## @backstage/plugin-sentry@0.5.9-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.8.4-next.1
+  - @backstage/core-components@0.13.5-next.1
+  - @backstage/catalog-model@1.4.2-next.0
+  - @backstage/core-plugin-api@1.6.0-next.1
+  - @backstage/theme@0.4.1
+
+## @backstage/plugin-shortcuts@0.3.14-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.13.5-next.1
+  - @backstage/core-plugin-api@1.6.0-next.1
+  - @backstage/theme@0.4.1
+  - @backstage/types@1.1.0
+
+## @backstage/plugin-sonarqube@0.7.5-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.8.4-next.1
+  - @backstage/core-components@0.13.5-next.1
+  - @backstage/catalog-model@1.4.2-next.0
+  - @backstage/core-plugin-api@1.6.0-next.1
+  - @backstage/plugin-sonarqube-react@0.1.8-next.1
+  - @backstage/theme@0.4.1
+
+## @backstage/plugin-sonarqube-backend@0.2.5-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config@1.1.0-next.0
+  - @backstage/backend-common@0.19.5-next.1
+  - @backstage/errors@1.2.1
+
+## @backstage/plugin-sonarqube-react@0.1.8-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/catalog-model@1.4.2-next.0
+  - @backstage/core-plugin-api@1.6.0-next.1
+
+## @backstage/plugin-splunk-on-call@0.4.13-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.8.4-next.1
+  - @backstage/core-components@0.13.5-next.1
+  - @backstage/catalog-model@1.4.2-next.0
+  - @backstage/core-plugin-api@1.6.0-next.1
+  - @backstage/theme@0.4.1
+
+## @backstage/plugin-stack-overflow@0.1.20-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.13.5-next.1
+  - @backstage/config@1.1.0-next.0
+  - @backstage/plugin-search-react@1.7.0-next.1
+  - @backstage/plugin-home-react@0.1.3-next.1
+  - @backstage/core-plugin-api@1.6.0-next.1
+  - @backstage/theme@0.4.1
+  - @backstage/plugin-search-common@1.2.6-next.0
+
+## @backstage/plugin-stack-overflow-backend@0.2.7-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config@1.1.0-next.0
+  - @backstage/backend-common@0.19.5-next.1
+  - @backstage/plugin-search-common@1.2.6-next.0
+
+## @backstage/plugin-stackstorm@0.1.6-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.13.5-next.1
+  - @backstage/core-plugin-api@1.6.0-next.1
+  - @backstage/errors@1.2.1
+  - @backstage/theme@0.4.1
+
+## @backstage/plugin-tech-insights@0.3.16-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.8.4-next.1
+  - @backstage/core-components@0.13.5-next.1
+  - @backstage/catalog-model@1.4.2-next.0
+  - @backstage/core-plugin-api@1.6.0-next.1
+  - @backstage/errors@1.2.1
+  - @backstage/theme@0.4.1
+  - @backstage/types@1.1.0
+  - @backstage/plugin-tech-insights-common@0.2.11
+
+## @backstage/plugin-tech-insights-backend@0.5.17-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config@1.1.0-next.0
+  - @backstage/backend-tasks@0.5.8-next.1
+  - @backstage/backend-common@0.19.5-next.1
+  - @backstage/catalog-model@1.4.2-next.0
+  - @backstage/plugin-tech-insights-node@0.4.9-next.1
+  - @backstage/catalog-client@1.4.4-next.0
+  - @backstage/errors@1.2.1
+  - @backstage/types@1.1.0
+  - @backstage/plugin-tech-insights-common@0.2.11
+
+## @backstage/plugin-tech-insights-backend-module-jsonfc@0.1.35-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config@1.1.0-next.0
+  - @backstage/backend-common@0.19.5-next.1
+  - @backstage/plugin-tech-insights-node@0.4.9-next.1
+  - @backstage/errors@1.2.1
+  - @backstage/plugin-tech-insights-common@0.2.11
+
+## @backstage/plugin-tech-insights-node@0.4.9-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config@1.1.0-next.0
+  - @backstage/backend-tasks@0.5.8-next.1
+  - @backstage/backend-common@0.19.5-next.1
+  - @backstage/types@1.1.0
+  - @backstage/plugin-tech-insights-common@0.2.11
+
+## @backstage/plugin-tech-radar@0.6.8-next.1
+
+### Patch Changes
+
+- 80b4d0b34f14: Fixed the width of the tech radar dialog so that the content fits
+- Updated dependencies
+  - @backstage/core-components@0.13.5-next.1
+  - @backstage/core-plugin-api@1.6.0-next.1
+  - @backstage/theme@0.4.1
+
+## @backstage/plugin-techdocs@1.6.9-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.8.4-next.1
+  - @backstage/core-components@0.13.5-next.1
+  - @backstage/config@1.1.0-next.0
+  - @backstage/integration@1.7.0-next.1
+  - @backstage/plugin-search-react@1.7.0-next.1
+  - @backstage/integration-react@1.1.19-next.1
+  - @backstage/plugin-techdocs-react@1.1.10-next.1
+  - @backstage/catalog-model@1.4.2-next.0
+  - @backstage/core-plugin-api@1.6.0-next.1
+  - @backstage/errors@1.2.1
+  - @backstage/theme@0.4.1
+  - @backstage/plugin-search-common@1.2.6-next.0
+
+## @backstage/plugin-techdocs-addons-test-utils@1.0.21-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.13.5-next.1
+  - @backstage/plugin-search-react@1.7.0-next.1
+  - @backstage/plugin-catalog@1.12.5-next.1
+  - @backstage/plugin-techdocs@1.6.9-next.1
+  - @backstage/integration-react@1.1.19-next.1
+  - @backstage/plugin-techdocs-react@1.1.10-next.1
+  - @backstage/core-app-api@1.10.0-next.1
+  - @backstage/core-plugin-api@1.6.0-next.1
+  - @backstage/test-utils@1.4.3-next.1
+  - @backstage/theme@0.4.1
+
+## @backstage/plugin-techdocs-react@1.1.10-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.13.5-next.1
+  - @backstage/config@1.1.0-next.0
+  - @backstage/catalog-model@1.4.2-next.0
+  - @backstage/core-plugin-api@1.6.0-next.1
+  - @backstage/version-bridge@1.0.4
+
+## @backstage/plugin-todo@0.2.26-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.8.4-next.1
+  - @backstage/core-components@0.13.5-next.1
+  - @backstage/catalog-model@1.4.2-next.0
+  - @backstage/core-plugin-api@1.6.0-next.1
+  - @backstage/errors@1.2.1
+  - @backstage/theme@0.4.1
+
+## @backstage/plugin-todo-backend@0.2.3-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config@1.1.0-next.0
+  - @backstage/integration@1.7.0-next.1
+  - @backstage/backend-common@0.19.5-next.1
+  - @backstage/backend-plugin-api@0.6.3-next.1
+  - @backstage/catalog-model@1.4.2-next.0
+  - @backstage/plugin-catalog-node@1.4.4-next.1
+  - @backstage/catalog-client@1.4.4-next.0
+  - @backstage/backend-openapi-utils@0.0.3
+  - @backstage/errors@1.2.1
+
+## @backstage/plugin-user-settings@0.7.9-next.1
+
+### Patch Changes
+
+- ce77b23423cb: conditionally rendering the user email in user profile card
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.8.4-next.1
+  - @backstage/core-components@0.13.5-next.1
+  - @backstage/core-app-api@1.10.0-next.1
+  - @backstage/core-plugin-api@1.6.0-next.1
+  - @backstage/errors@1.2.1
+  - @backstage/theme@0.4.1
+  - @backstage/types@1.1.0
+
+## @backstage/plugin-user-settings-backend@0.1.15-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.19.5-next.1
+  - @backstage/backend-plugin-api@0.6.3-next.1
+  - @backstage/catalog-model@1.4.2-next.0
+  - @backstage/plugin-auth-node@0.3.0-next.1
+  - @backstage/errors@1.2.1
+  - @backstage/types@1.1.0
+
+## @backstage/plugin-vault@0.1.18-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.8.4-next.1
+  - @backstage/core-components@0.13.5-next.1
+  - @backstage/catalog-model@1.4.2-next.0
+  - @backstage/core-plugin-api@1.6.0-next.1
+  - @backstage/errors@1.2.1
+  - @backstage/theme@0.4.1
+
+## @backstage/plugin-vault-backend@0.3.7-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config@1.1.0-next.0
+  - @backstage/backend-tasks@0.5.8-next.1
+  - @backstage/backend-common@0.19.5-next.1
+  - @backstage/errors@1.2.1
+
+## @backstage/plugin-xcmetrics@0.2.42-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.13.5-next.1
+  - @backstage/core-plugin-api@1.6.0-next.1
+  - @backstage/errors@1.2.1
+  - @backstage/theme@0.4.1
+
+## example-app@0.2.87-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-playlist@0.1.16-next.1
+  - @backstage/plugin-tech-radar@0.6.8-next.1
+  - @backstage/plugin-catalog-react@1.8.4-next.1
+  - @backstage/core-components@0.13.5-next.1
+  - @backstage/config@1.1.0-next.0
+  - @backstage/plugin-org@0.6.14-next.1
+  - @backstage/plugin-home@0.5.8-next.1
+  - @backstage/plugin-devtools@0.1.4-next.1
+  - @backstage/plugin-user-settings@0.7.9-next.1
+  - @backstage/plugin-search-react@1.7.0-next.1
+  - @backstage/plugin-search@1.4.0-next.1
+  - @backstage/plugin-kubernetes@0.10.3-next.1
+  - @backstage/plugin-techdocs-module-addons-contrib@1.1.0-next.1
+  - @backstage/plugin-adr@0.6.7-next.1
+  - @backstage/plugin-airbrake@0.3.24-next.1
+  - @backstage/plugin-api-docs@0.9.11-next.1
+  - @backstage/plugin-azure-devops@0.3.6-next.1
+  - @backstage/plugin-azure-sites@0.1.13-next.1
+  - @backstage/plugin-badges@0.2.48-next.1
+  - @internal/plugin-catalog-customized@0.0.14-next.1
+  - @backstage/plugin-catalog-graph@0.2.36-next.1
+  - @backstage/plugin-catalog-import@0.9.14-next.1
+  - @backstage/plugin-circleci@0.3.24-next.1
+  - @backstage/plugin-cloudbuild@0.3.24-next.1
+  - @backstage/plugin-code-coverage@0.2.17-next.1
+  - @backstage/plugin-cost-insights@0.12.13-next.1
+  - @backstage/plugin-dynatrace@7.0.4-next.1
+  - @backstage/plugin-entity-feedback@0.2.7-next.1
+  - @backstage/plugin-explore@0.4.10-next.1
+  - @backstage/plugin-github-actions@0.6.5-next.1
+  - @backstage/plugin-gocd@0.1.30-next.1
+  - @backstage/plugin-jenkins@0.8.6-next.1
+  - @backstage/plugin-kafka@0.3.24-next.1
+  - @backstage/plugin-lighthouse@0.4.9-next.1
+  - @backstage/plugin-linguist@0.1.9-next.1
+  - @backstage/plugin-newrelic-dashboard@0.2.17-next.1
+  - @backstage/plugin-nomad@0.1.5-next.1
+  - @backstage/plugin-octopus-deploy@0.2.6-next.1
+  - @backstage/plugin-pagerduty@0.6.5-next.1
+  - @backstage/plugin-puppetdb@0.1.7-next.1
+  - @backstage/plugin-rollbar@0.4.24-next.1
+  - @backstage/plugin-scaffolder@1.14.5-next.1
+  - @backstage/plugin-scaffolder-react@1.5.5-next.1
+  - @backstage/plugin-sentry@0.5.9-next.1
+  - @backstage/plugin-tech-insights@0.3.16-next.1
+  - @backstage/plugin-techdocs@1.6.9-next.1
+  - @backstage/plugin-todo@0.2.26-next.1
+  - @backstage/app-defaults@1.4.3-next.1
+  - @backstage/cli@0.22.13-next.1
+  - @backstage/integration-react@1.1.19-next.1
+  - @backstage/plugin-apache-airflow@0.2.15-next.1
+  - @backstage/plugin-catalog-unprocessed-entities@0.1.3-next.1
+  - @backstage/plugin-gcalendar@0.3.18-next.1
+  - @backstage/plugin-gcp-projects@0.3.41-next.1
+  - @backstage/plugin-graphiql@0.2.54-next.1
+  - @backstage/plugin-microsoft-calendar@0.1.7-next.1
+  - @backstage/plugin-newrelic@0.3.40-next.1
+  - @backstage/plugin-shortcuts@0.3.14-next.1
+  - @backstage/plugin-stack-overflow@0.1.20-next.1
+  - @backstage/plugin-stackstorm@0.1.6-next.1
+  - @backstage/plugin-techdocs-react@1.1.10-next.1
+  - @backstage/catalog-model@1.4.2-next.0
+  - @backstage/core-app-api@1.10.0-next.1
+  - @backstage/core-plugin-api@1.6.0-next.1
+  - @backstage/plugin-permission-react@0.4.15-next.1
+  - @backstage/plugin-catalog-common@1.0.16-next.0
+  - @backstage/theme@0.4.1
+  - @backstage/plugin-linguist-common@0.1.1
+  - @backstage/plugin-search-common@1.2.6-next.0
+
+## example-app-next@0.0.1-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-playlist@0.1.16-next.1
+  - @backstage/plugin-tech-radar@0.6.8-next.1
+  - @backstage/plugin-catalog-react@1.8.4-next.1
+  - @backstage/core-components@0.13.5-next.1
+  - @backstage/config@1.1.0-next.0
+  - @backstage/plugin-org@0.6.14-next.1
+  - @backstage/plugin-home@0.5.8-next.1
+  - @backstage/plugin-devtools@0.1.4-next.1
+  - @backstage/plugin-user-settings@0.7.9-next.1
+  - @backstage/plugin-search-react@1.7.0-next.1
+  - @backstage/plugin-search@1.4.0-next.1
+  - @backstage/plugin-kubernetes@0.10.3-next.1
+  - @backstage/plugin-techdocs-module-addons-contrib@1.1.0-next.1
+  - @backstage/plugin-adr@0.6.7-next.1
+  - @backstage/plugin-airbrake@0.3.24-next.1
+  - @backstage/plugin-api-docs@0.9.11-next.1
+  - @backstage/plugin-azure-devops@0.3.6-next.1
+  - @backstage/plugin-azure-sites@0.1.13-next.1
+  - @backstage/plugin-badges@0.2.48-next.1
+  - @internal/plugin-catalog-customized@0.0.14-next.1
+  - @backstage/plugin-catalog-graph@0.2.36-next.1
+  - @backstage/plugin-catalog-import@0.9.14-next.1
+  - @backstage/plugin-circleci@0.3.24-next.1
+  - @backstage/plugin-cloudbuild@0.3.24-next.1
+  - @backstage/plugin-code-coverage@0.2.17-next.1
+  - @backstage/plugin-cost-insights@0.12.13-next.1
+  - @backstage/plugin-dynatrace@7.0.4-next.1
+  - @backstage/plugin-entity-feedback@0.2.7-next.1
+  - @backstage/plugin-explore@0.4.10-next.1
+  - @backstage/plugin-github-actions@0.6.5-next.1
+  - @backstage/plugin-gocd@0.1.30-next.1
+  - @backstage/plugin-jenkins@0.8.6-next.1
+  - @backstage/plugin-kafka@0.3.24-next.1
+  - @backstage/plugin-lighthouse@0.4.9-next.1
+  - @backstage/plugin-linguist@0.1.9-next.1
+  - @backstage/plugin-newrelic-dashboard@0.2.17-next.1
+  - @backstage/plugin-octopus-deploy@0.2.6-next.1
+  - @backstage/plugin-pagerduty@0.6.5-next.1
+  - @backstage/plugin-puppetdb@0.1.7-next.1
+  - @backstage/plugin-rollbar@0.4.24-next.1
+  - @backstage/plugin-scaffolder@1.14.5-next.1
+  - @backstage/plugin-scaffolder-react@1.5.5-next.1
+  - @backstage/plugin-sentry@0.5.9-next.1
+  - @backstage/plugin-tech-insights@0.3.16-next.1
+  - @backstage/plugin-techdocs@1.6.9-next.1
+  - @backstage/plugin-todo@0.2.26-next.1
+  - @backstage/app-defaults@1.4.3-next.1
+  - @backstage/cli@0.22.13-next.1
+  - @backstage/integration-react@1.1.19-next.1
+  - @backstage/plugin-apache-airflow@0.2.15-next.1
+  - @backstage/plugin-catalog-unprocessed-entities@0.1.3-next.1
+  - @backstage/plugin-gcalendar@0.3.18-next.1
+  - @backstage/plugin-gcp-projects@0.3.41-next.1
+  - @backstage/plugin-graphiql@0.2.54-next.1
+  - @backstage/plugin-microsoft-calendar@0.1.7-next.1
+  - @backstage/plugin-newrelic@0.3.40-next.1
+  - @backstage/plugin-shortcuts@0.3.14-next.1
+  - @backstage/plugin-stack-overflow@0.1.20-next.1
+  - @backstage/plugin-stackstorm@0.1.6-next.1
+  - @backstage/plugin-techdocs-react@1.1.10-next.1
+  - @backstage/catalog-model@1.4.2-next.0
+  - @backstage/core-app-api@1.10.0-next.1
+  - @backstage/core-plugin-api@1.6.0-next.1
+  - @backstage/frontend-app-api@0.0.1-next.0
+  - @backstage/plugin-permission-react@0.4.15-next.1
+  - @backstage/plugin-catalog-common@1.0.16-next.0
+  - @backstage/frontend-plugin-api@0.0.0
+  - @backstage/theme@0.4.1
+  - @backstage/plugin-linguist-common@0.1.1
+  - @backstage/plugin-search-common@1.2.6-next.0
+
+## example-backend@0.2.87-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-search-backend-module-pg@0.5.12-next.1
+  - @backstage/plugin-kubernetes-backend@0.11.6-next.1
+  - @backstage/plugin-catalog-backend@1.13.0-next.1
+  - @backstage/plugin-auth-backend@0.18.9-next.1
+  - @backstage/config@1.1.0-next.0
+  - @backstage/integration@1.7.0-next.1
+  - @backstage/plugin-devtools-backend@0.1.6-next.1
+  - @backstage/backend-tasks@0.5.8-next.1
+  - @backstage/plugin-techdocs-backend@1.7.0-next.1
+  - @backstage/plugin-scaffolder-backend@1.16.6-next.1
+  - @backstage/plugin-code-coverage-backend@0.2.17-next.1
+  - example-app@0.2.87-next.1
+  - @backstage/backend-common@0.19.5-next.1
+  - @backstage/catalog-model@1.4.2-next.0
+  - @backstage/plugin-adr-backend@0.3.9-next.1
+  - @backstage/plugin-app-backend@0.3.51-next.1
+  - @backstage/plugin-auth-node@0.3.0-next.1
+  - @backstage/plugin-azure-devops-backend@0.3.30-next.1
+  - @backstage/plugin-azure-sites-backend@0.1.13-next.1
+  - @backstage/plugin-badges-backend@0.2.6-next.1
+  - @backstage/plugin-entity-feedback-backend@0.1.9-next.1
+  - @backstage/plugin-events-backend@0.2.12-next.1
+  - @backstage/plugin-explore-backend@0.0.13-next.1
+  - @backstage/plugin-graphql-backend@0.1.41-next.1
+  - @backstage/plugin-jenkins-backend@0.2.6-next.1
+  - @backstage/plugin-kafka-backend@0.2.44-next.1
+  - @backstage/plugin-lighthouse-backend@0.2.7-next.1
+  - @backstage/plugin-linguist-backend@0.4.3-next.1
+  - @backstage/plugin-nomad-backend@0.1.5-next.1
+  - @backstage/plugin-permission-backend@0.5.26-next.1
+  - @backstage/plugin-permission-common@0.7.8-next.0
+  - @backstage/plugin-permission-node@0.7.14-next.1
+  - @backstage/plugin-playlist-backend@0.3.7-next.1
+  - @backstage/plugin-proxy-backend@0.3.3-next.1
+  - @backstage/plugin-rollbar-backend@0.1.48-next.1
+  - @backstage/plugin-scaffolder-backend-module-confluence-to-markdown@0.2.4-next.1
+  - @backstage/plugin-scaffolder-backend-module-rails@0.4.20-next.1
+  - @backstage/plugin-search-backend@1.4.3-next.1
+  - @backstage/plugin-search-backend-module-catalog@0.1.7-next.1
+  - @backstage/plugin-search-backend-module-elasticsearch@1.3.6-next.1
+  - @backstage/plugin-search-backend-module-explore@0.1.7-next.1
+  - @backstage/plugin-search-backend-module-techdocs@0.1.7-next.1
+  - @backstage/plugin-search-backend-node@1.2.7-next.1
+  - @backstage/plugin-tech-insights-backend@0.5.17-next.1
+  - @backstage/plugin-tech-insights-backend-module-jsonfc@0.1.35-next.1
+  - @backstage/plugin-tech-insights-node@0.4.9-next.1
+  - @backstage/plugin-todo-backend@0.2.3-next.1
+  - @backstage/plugin-catalog-node@1.4.4-next.1
+  - @backstage/plugin-catalog-backend-module-unprocessed@0.2.3-next.1
+  - @backstage/plugin-events-node@0.2.12-next.1
+  - @backstage/catalog-client@1.4.4-next.0
+  - @backstage/plugin-search-common@1.2.6-next.0
+
+## example-backend-next@0.0.15-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-kubernetes-backend@0.11.6-next.1
+  - @backstage/plugin-catalog-backend@1.13.0-next.1
+  - @backstage/plugin-devtools-backend@0.1.6-next.1
+  - @backstage/backend-tasks@0.5.8-next.1
+  - @backstage/plugin-techdocs-backend@1.7.0-next.1
+  - @backstage/plugin-scaffolder-backend@1.16.6-next.1
+  - @backstage/backend-plugin-api@0.6.3-next.1
+  - @backstage/plugin-adr-backend@0.3.9-next.1
+  - @backstage/plugin-app-backend@0.3.51-next.1
+  - @backstage/plugin-auth-node@0.3.0-next.1
+  - @backstage/plugin-azure-devops-backend@0.3.30-next.1
+  - @backstage/plugin-badges-backend@0.2.6-next.1
+  - @backstage/plugin-entity-feedback-backend@0.1.9-next.1
+  - @backstage/plugin-lighthouse-backend@0.2.7-next.1
+  - @backstage/plugin-linguist-backend@0.4.3-next.1
+  - @backstage/plugin-permission-backend@0.5.26-next.1
+  - @backstage/plugin-permission-common@0.7.8-next.0
+  - @backstage/plugin-permission-node@0.7.14-next.1
+  - @backstage/plugin-proxy-backend@0.3.3-next.1
+  - @backstage/plugin-search-backend@1.4.3-next.1
+  - @backstage/plugin-search-backend-module-catalog@0.1.7-next.1
+  - @backstage/plugin-search-backend-module-explore@0.1.7-next.1
+  - @backstage/plugin-search-backend-module-techdocs@0.1.7-next.1
+  - @backstage/plugin-search-backend-node@1.2.7-next.1
+  - @backstage/plugin-todo-backend@0.2.3-next.1
+  - @backstage/backend-defaults@0.2.3-next.1
+  - @backstage/plugin-catalog-backend-module-unprocessed@0.2.3-next.1
+
+## e2e-test@0.2.7-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/create-app@0.5.5-next.1
+  - @backstage/cli-common@0.1.12
+  - @backstage/errors@1.2.1
+
+## @backstage/frontend-app-api@0.0.1-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config@1.1.0-next.0
+  - @backstage/plugin-graphiql@0.2.54-next.1
+  - @backstage/frontend-plugin-api@0.0.0
+  - @backstage/types@1.1.0
+
+## techdocs-cli-embedded-app@0.2.86-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.13.5-next.1
+  - @backstage/config@1.1.0-next.0
+  - @backstage/plugin-catalog@1.12.5-next.1
+  - @backstage/plugin-techdocs@1.6.9-next.1
+  - @backstage/app-defaults@1.4.3-next.1
+  - @backstage/cli@0.22.13-next.1
+  - @backstage/integration-react@1.1.19-next.1
+  - @backstage/plugin-techdocs-react@1.1.10-next.1
+  - @backstage/catalog-model@1.4.2-next.0
+  - @backstage/core-app-api@1.10.0-next.1
+  - @backstage/core-plugin-api@1.6.0-next.1
+  - @backstage/test-utils@1.4.3-next.1
+  - @backstage/theme@0.4.1
+
+## @internal/plugin-catalog-customized@0.0.14-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.8.4-next.1
+  - @backstage/plugin-catalog@1.12.5-next.1
+
+## @internal/plugin-todo-list@1.0.17-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.13.5-next.1
+  - @backstage/core-plugin-api@1.6.0-next.1
+  - @backstage/theme@0.4.1
+
+## @internal/plugin-todo-list-backend@1.0.17-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config@1.1.0-next.0
+  - @backstage/backend-common@0.19.5-next.1
+  - @backstage/backend-plugin-api@0.6.3-next.1
+  - @backstage/plugin-auth-node@0.3.0-next.1
+  - @backstage/errors@1.2.1
+
+## @internal/plugin-todo-list-common@1.0.13-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-permission-common@0.7.8-next.0
diff --git a/docs/releases/v1.18.0-next.2-changelog.md b/docs/releases/v1.18.0-next.2-changelog.md
new file mode 100644
index 0000000000..e28718c022
--- /dev/null
+++ b/docs/releases/v1.18.0-next.2-changelog.md
@@ -0,0 +1,2977 @@
+# Release v1.18.0-next.2
+
+## @backstage/core-app-api@1.10.0-next.2
+
+### Minor Changes
+
+- 6e30769cc627: Introduced experimental support for internationalization.
+
+### Patch Changes
+
+- 8cec7664e146: Removed `@types/node` dependency
+- Updated dependencies
+  - @backstage/core-plugin-api@1.6.0-next.2
+  - @backstage/config@1.1.0-next.1
+  - @backstage/types@1.1.0
+  - @backstage/version-bridge@1.0.4
+
+## @backstage/core-plugin-api@1.6.0-next.2
+
+### Minor Changes
+
+- 6e30769cc627: Introduced experimental support for internationalization.
+
+### Patch Changes
+
+- 8cec7664e146: Removed `@types/node` dependency
+- Updated dependencies
+  - @backstage/config@1.1.0-next.1
+  - @backstage/types@1.1.0
+  - @backstage/version-bridge@1.0.4
+
+## @backstage/plugin-catalog@1.13.0-next.2
+
+### Minor Changes
+
+- e44f45ac4515: This change allows a new annotation of `backstage.io/techdocs-entity` this ref allows you to reference another entity for its TechDocs. This allows you have a single TechDoc for all items in a system, for example you might have a frontend and a backend in the same repo. This would allow you to have TechDocs build under a `System` entity while referencing the system e.g.: `backstage.io/techdocs-entity: system:default/example` that will show the systems docs in both the TechDocs button and the TechDocs tab without needing to do duplicate builds and filling the TechDocs page with garbage.
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/integration-react@1.1.19-next.2
+  - @backstage/core-components@0.13.5-next.2
+  - @backstage/core-plugin-api@1.6.0-next.2
+  - @backstage/plugin-catalog-react@1.8.4-next.2
+  - @backstage/plugin-search-react@1.7.0-next.2
+  - @backstage/catalog-model@1.4.2-next.1
+  - @backstage/catalog-client@1.4.4-next.1
+  - @backstage/errors@1.2.1
+  - @backstage/theme@0.4.1
+  - @backstage/types@1.1.0
+  - @backstage/plugin-catalog-common@1.0.16-next.1
+  - @backstage/plugin-scaffolder-common@1.4.1-next.1
+  - @backstage/plugin-search-common@1.2.6-next.1
+
+## @backstage/plugin-permission-backend-module-allow-all-policy@0.1.0-next.0
+
+### Minor Changes
+
+- 5f7b2153526b: Created package with policy `permissionModuleAllowAllPolicy`
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.19.5-next.2
+  - @backstage/plugin-auth-node@0.3.0-next.2
+  - @backstage/plugin-permission-node@0.7.14-next.2
+  - @backstage/backend-plugin-api@0.6.3-next.2
+  - @backstage/plugin-permission-common@0.7.8-next.1
+
+## @backstage/plugin-techdocs@1.7.0-next.2
+
+### Minor Changes
+
+- e44f45ac4515: This change allows a new annotation of `backstage.io/techdocs-entity` this ref allows you to reference another entity for its TechDocs. This allows you have a single TechDoc for all items in a system, for example you might have a frontend and a backend in the same repo. This would allow you to have TechDocs build under a `System` entity while referencing the system e.g.: `backstage.io/techdocs-entity: system:default/example` that will show the systems docs in both the TechDocs button and the TechDocs tab without needing to do duplicate builds and filling the TechDocs page with garbage.
+
+### Patch Changes
+
+- 8cec7664e146: Removed `@types/node` dependency
+- Updated dependencies
+  - @backstage/integration-react@1.1.19-next.2
+  - @backstage/core-components@0.13.5-next.2
+  - @backstage/core-plugin-api@1.6.0-next.2
+  - @backstage/config@1.1.0-next.1
+  - @backstage/plugin-catalog-react@1.8.4-next.2
+  - @backstage/plugin-search-react@1.7.0-next.2
+  - @backstage/plugin-techdocs-react@1.1.10-next.2
+  - @backstage/integration@1.7.0-next.2
+  - @backstage/catalog-model@1.4.2-next.1
+  - @backstage/errors@1.2.1
+  - @backstage/theme@0.4.1
+  - @backstage/plugin-search-common@1.2.6-next.1
+
+## @backstage/app-defaults@1.4.3-next.2
+
+### Patch Changes
+
+- 8cec7664e146: Removed `@types/node` dependency
+- Updated dependencies
+  - @backstage/core-components@0.13.5-next.2
+  - @backstage/core-plugin-api@1.6.0-next.2
+  - @backstage/core-app-api@1.10.0-next.2
+  - @backstage/plugin-permission-react@0.4.15-next.2
+  - @backstage/theme@0.4.1
+
+## @backstage/backend-app-api@0.5.3-next.2
+
+### Patch Changes
+
+- 37a20c7f14aa: Adds include and exclude configuration to feature discovery of backend packages
+  Adds alpha modules to feature discovery
+- 3fc64b9e2f8f: Extension points are now tracked via their ID rather than reference, in order to support package duplication.
+- b219d097b3f4: Backend startup will now fail if any circular service dependencies are detected.
+- Updated dependencies
+  - @backstage/config-loader@1.5.0-next.2
+  - @backstage/config@1.1.0-next.1
+  - @backstage/backend-tasks@0.5.8-next.2
+  - @backstage/backend-common@0.19.5-next.2
+  - @backstage/plugin-auth-node@0.3.0-next.2
+  - @backstage/plugin-permission-node@0.7.14-next.2
+  - @backstage/backend-plugin-api@0.6.3-next.2
+  - @backstage/cli-common@0.1.12
+  - @backstage/cli-node@0.1.3
+  - @backstage/errors@1.2.1
+  - @backstage/types@1.1.0
+
+## @backstage/backend-common@0.19.5-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-app-api@0.5.3-next.2
+  - @backstage/config-loader@1.5.0-next.2
+  - @backstage/config@1.1.0-next.1
+  - @backstage/integration@1.7.0-next.2
+  - @backstage/integration-aws-node@0.1.6-next.1
+  - @backstage/backend-plugin-api@0.6.3-next.2
+  - @backstage/backend-dev-utils@0.1.1
+  - @backstage/cli-common@0.1.12
+  - @backstage/errors@1.2.1
+  - @backstage/types@1.1.0
+
+## @backstage/backend-defaults@0.2.3-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-app-api@0.5.3-next.2
+  - @backstage/backend-common@0.19.5-next.2
+  - @backstage/backend-plugin-api@0.6.3-next.2
+
+## @backstage/backend-plugin-api@0.6.3-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config@1.1.0-next.1
+  - @backstage/backend-tasks@0.5.8-next.2
+  - @backstage/plugin-auth-node@0.3.0-next.2
+  - @backstage/plugin-permission-common@0.7.8-next.1
+  - @backstage/types@1.1.0
+
+## @backstage/backend-tasks@0.5.8-next.2
+
+### Patch Changes
+
+- 814feeed7343: Update to handle invalid luxon values
+- Updated dependencies
+  - @backstage/config@1.1.0-next.1
+  - @backstage/backend-common@0.19.5-next.2
+  - @backstage/errors@1.2.1
+  - @backstage/types@1.1.0
+
+## @backstage/backend-test-utils@0.2.3-next.2
+
+### Patch Changes
+
+- 58cb5e5cea7b: Introduced a new utility for testing service factories, `ServiceFactoryTester`.
+- Updated dependencies
+  - @backstage/backend-app-api@0.5.3-next.2
+  - @backstage/config@1.1.0-next.1
+  - @backstage/backend-common@0.19.5-next.2
+  - @backstage/plugin-auth-node@0.3.0-next.2
+  - @backstage/backend-plugin-api@0.6.3-next.2
+  - @backstage/types@1.1.0
+
+## @backstage/catalog-client@1.4.4-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/catalog-model@1.4.2-next.1
+  - @backstage/errors@1.2.1
+
+## @backstage/catalog-model@1.4.2-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config@1.1.0-next.1
+  - @backstage/errors@1.2.1
+  - @backstage/types@1.1.0
+
+## @backstage/cli@0.22.13-next.2
+
+### Patch Changes
+
+- 8cec7664e146: Removed `@types/node` dependency
+- ea779492ad88: Updated dependency `run-script-webpack-plugin` to `^0.2.0`.
+- Updated dependencies
+  - @backstage/release-manifests@0.0.10-next.0
+  - @backstage/config-loader@1.5.0-next.2
+  - @backstage/config@1.1.0-next.1
+  - @backstage/integration@1.7.0-next.2
+  - @backstage/catalog-model@1.4.2-next.1
+  - @backstage/cli-common@0.1.12
+  - @backstage/cli-node@0.1.3
+  - @backstage/errors@1.2.1
+  - @backstage/eslint-plugin@0.1.3
+  - @backstage/types@1.1.0
+
+## @backstage/config@1.1.0-next.1
+
+### Patch Changes
+
+- 8cec7664e146: Removed `@types/node` dependency
+- Updated dependencies
+  - @backstage/errors@1.2.1
+  - @backstage/types@1.1.0
+
+## @backstage/config-loader@1.5.0-next.2
+
+### Patch Changes
+
+- 8cec7664e146: Removed `@types/node` dependency
+- Updated dependencies
+  - @backstage/config@1.1.0-next.1
+  - @backstage/cli-common@0.1.12
+  - @backstage/errors@1.2.1
+  - @backstage/types@1.1.0
+
+## @backstage/core-components@0.13.5-next.2
+
+### Patch Changes
+
+- 8cec7664e146: Removed `@types/node` dependency
+- db92d1244897: Updated dependency `rc-progress` to `3.5.1`.
+- Updated dependencies
+  - @backstage/core-plugin-api@1.6.0-next.2
+  - @backstage/config@1.1.0-next.1
+  - @backstage/errors@1.2.1
+  - @backstage/theme@0.4.1
+  - @backstage/version-bridge@1.0.4
+
+## @backstage/create-app@0.5.5-next.2
+
+### Patch Changes
+
+- 8db70ecbb325: Updated Dockerfile to include `apt-get update` when installing the SQLite dependency
+- 8cec7664e146: Removed `@types/node` dependency
+- Updated dependencies
+  - @backstage/cli-common@0.1.12
+
+## @backstage/dev-utils@1.0.21-next.2
+
+### Patch Changes
+
+- 8cec7664e146: Removed `@types/node` dependency
+- Updated dependencies
+  - @backstage/integration-react@1.1.19-next.2
+  - @backstage/core-components@0.13.5-next.2
+  - @backstage/core-plugin-api@1.6.0-next.2
+  - @backstage/app-defaults@1.4.3-next.2
+  - @backstage/core-app-api@1.10.0-next.2
+  - @backstage/test-utils@1.4.3-next.2
+  - @backstage/plugin-catalog-react@1.8.4-next.2
+  - @backstage/catalog-model@1.4.2-next.1
+  - @backstage/theme@0.4.1
+
+## @backstage/integration@1.7.0-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config@1.1.0-next.1
+  - @backstage/errors@1.2.1
+
+## @backstage/integration-aws-node@0.1.6-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config@1.1.0-next.1
+  - @backstage/errors@1.2.1
+
+## @backstage/integration-react@1.1.19-next.2
+
+### Patch Changes
+
+- 8cec7664e146: Removed `@types/node` dependency
+- Updated dependencies
+  - @backstage/core-components@0.13.5-next.2
+  - @backstage/core-plugin-api@1.6.0-next.2
+  - @backstage/config@1.1.0-next.1
+  - @backstage/integration@1.7.0-next.2
+  - @backstage/theme@0.4.1
+
+## @backstage/release-manifests@0.0.10-next.0
+
+### Patch Changes
+
+- 8cec7664e146: Removed `@types/node` dependency
+
+## @backstage/repo-tools@0.3.4-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/catalog-model@1.4.2-next.1
+  - @backstage/cli-common@0.1.12
+  - @backstage/cli-node@0.1.3
+  - @backstage/errors@1.2.1
+
+## @techdocs/cli@1.5.0-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config@1.1.0-next.1
+  - @backstage/backend-common@0.19.5-next.2
+  - @backstage/catalog-model@1.4.2-next.1
+  - @backstage/plugin-techdocs-node@1.8.0-next.2
+  - @backstage/cli-common@0.1.12
+
+## @backstage/test-utils@1.4.3-next.2
+
+### Patch Changes
+
+- 8cec7664e146: Removed `@types/node` dependency
+- Updated dependencies
+  - @backstage/core-plugin-api@1.6.0-next.2
+  - @backstage/core-app-api@1.10.0-next.2
+  - @backstage/config@1.1.0-next.1
+  - @backstage/plugin-permission-react@0.4.15-next.2
+  - @backstage/plugin-permission-common@0.7.8-next.1
+  - @backstage/theme@0.4.1
+  - @backstage/types@1.1.0
+
+## @backstage/plugin-adr@0.6.7-next.2
+
+### Patch Changes
+
+- 8cec7664e146: Removed `@types/node` dependency
+- Updated dependencies
+  - @backstage/integration-react@1.1.19-next.2
+  - @backstage/core-components@0.13.5-next.2
+  - @backstage/core-plugin-api@1.6.0-next.2
+  - @backstage/plugin-catalog-react@1.8.4-next.2
+  - @backstage/plugin-search-react@1.7.0-next.2
+  - @backstage/catalog-model@1.4.2-next.1
+  - @backstage/theme@0.4.1
+  - @backstage/plugin-adr-common@0.2.15-next.2
+  - @backstage/plugin-search-common@1.2.6-next.1
+
+## @backstage/plugin-adr-backend@0.3.9-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config@1.1.0-next.1
+  - @backstage/backend-common@0.19.5-next.2
+  - @backstage/integration@1.7.0-next.2
+  - @backstage/backend-plugin-api@0.6.3-next.2
+  - @backstage/catalog-model@1.4.2-next.1
+  - @backstage/catalog-client@1.4.4-next.1
+  - @backstage/errors@1.2.1
+  - @backstage/plugin-adr-common@0.2.15-next.2
+  - @backstage/plugin-search-common@1.2.6-next.1
+
+## @backstage/plugin-adr-common@0.2.15-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/integration@1.7.0-next.2
+  - @backstage/catalog-model@1.4.2-next.1
+  - @backstage/plugin-search-common@1.2.6-next.1
+
+## @backstage/plugin-airbrake@0.3.24-next.2
+
+### Patch Changes
+
+- 8cec7664e146: Removed `@types/node` dependency
+- Updated dependencies
+  - @backstage/core-components@0.13.5-next.2
+  - @backstage/core-plugin-api@1.6.0-next.2
+  - @backstage/test-utils@1.4.3-next.2
+  - @backstage/dev-utils@1.0.21-next.2
+  - @backstage/plugin-catalog-react@1.8.4-next.2
+  - @backstage/catalog-model@1.4.2-next.1
+  - @backstage/theme@0.4.1
+
+## @backstage/plugin-airbrake-backend@0.2.24-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config@1.1.0-next.1
+  - @backstage/backend-common@0.19.5-next.2
+  - @backstage/backend-plugin-api@0.6.3-next.2
+
+## @backstage/plugin-allure@0.1.40-next.2
+
+### Patch Changes
+
+- 8cec7664e146: Removed `@types/node` dependency
+- Updated dependencies
+  - @backstage/core-components@0.13.5-next.2
+  - @backstage/core-plugin-api@1.6.0-next.2
+  - @backstage/plugin-catalog-react@1.8.4-next.2
+  - @backstage/catalog-model@1.4.2-next.1
+  - @backstage/theme@0.4.1
+
+## @backstage/plugin-analytics-module-ga@0.1.33-next.2
+
+### Patch Changes
+
+- 8cec7664e146: Removed `@types/node` dependency
+- Updated dependencies
+  - @backstage/core-components@0.13.5-next.2
+  - @backstage/core-plugin-api@1.6.0-next.2
+  - @backstage/config@1.1.0-next.1
+  - @backstage/theme@0.4.1
+
+## @backstage/plugin-analytics-module-ga4@0.1.4-next.2
+
+### Patch Changes
+
+- 8cec7664e146: Removed `@types/node` dependency
+- Updated dependencies
+  - @backstage/core-components@0.13.5-next.2
+  - @backstage/core-plugin-api@1.6.0-next.2
+  - @backstage/config@1.1.0-next.1
+  - @backstage/theme@0.4.1
+
+## @backstage/plugin-analytics-module-newrelic-browser@0.0.2-next.2
+
+### Patch Changes
+
+- 8cec7664e146: Removed `@types/node` dependency
+- Updated dependencies
+  - @backstage/core-components@0.13.5-next.2
+  - @backstage/core-plugin-api@1.6.0-next.2
+  - @backstage/config@1.1.0-next.1
+
+## @backstage/plugin-apache-airflow@0.2.15-next.2
+
+### Patch Changes
+
+- 8cec7664e146: Removed `@types/node` dependency
+- Updated dependencies
+  - @backstage/core-components@0.13.5-next.2
+  - @backstage/core-plugin-api@1.6.0-next.2
+
+## @backstage/plugin-api-docs@0.9.11-next.2
+
+### Patch Changes
+
+- 8cec7664e146: Removed `@types/node` dependency
+- Updated dependencies
+  - @backstage/plugin-catalog@1.13.0-next.2
+  - @backstage/core-components@0.13.5-next.2
+  - @backstage/core-plugin-api@1.6.0-next.2
+  - @backstage/plugin-catalog-react@1.8.4-next.2
+  - @backstage/catalog-model@1.4.2-next.1
+  - @backstage/theme@0.4.1
+
+## @backstage/plugin-apollo-explorer@0.1.15-next.2
+
+### Patch Changes
+
+- 8cec7664e146: Removed `@types/node` dependency
+- Updated dependencies
+  - @backstage/core-components@0.13.5-next.2
+  - @backstage/core-plugin-api@1.6.0-next.2
+  - @backstage/theme@0.4.1
+
+## @backstage/plugin-app-backend@0.3.51-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config-loader@1.5.0-next.2
+  - @backstage/config@1.1.0-next.1
+  - @backstage/backend-common@0.19.5-next.2
+  - @backstage/backend-plugin-api@0.6.3-next.2
+  - @backstage/types@1.1.0
+  - @backstage/plugin-app-node@0.1.3-next.2
+
+## @backstage/plugin-app-node@0.1.3-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@0.6.3-next.2
+
+## @backstage/plugin-auth-backend@0.18.9-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config@1.1.0-next.1
+  - @backstage/backend-common@0.19.5-next.2
+  - @backstage/plugin-auth-backend-module-gcp-iap-provider@0.1.0-next.2
+  - @backstage/plugin-auth-backend-module-github-provider@0.1.0-next.2
+  - @backstage/plugin-auth-backend-module-gitlab-provider@0.1.0-next.1
+  - @backstage/plugin-auth-backend-module-google-provider@0.1.0-next.2
+  - @backstage/plugin-auth-node@0.3.0-next.2
+  - @backstage/plugin-catalog-node@1.4.4-next.2
+  - @backstage/backend-plugin-api@0.6.3-next.2
+  - @backstage/catalog-model@1.4.2-next.1
+  - @backstage/catalog-client@1.4.4-next.1
+  - @backstage/errors@1.2.1
+  - @backstage/types@1.1.0
+
+## @backstage/plugin-auth-backend-module-gcp-iap-provider@0.1.0-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-auth-node@0.3.0-next.2
+  - @backstage/backend-plugin-api@0.6.3-next.2
+  - @backstage/errors@1.2.1
+  - @backstage/types@1.1.0
+
+## @backstage/plugin-auth-backend-module-github-provider@0.1.0-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.19.5-next.2
+  - @backstage/plugin-auth-node@0.3.0-next.2
+  - @backstage/backend-plugin-api@0.6.3-next.2
+
+## @backstage/plugin-auth-backend-module-gitlab-provider@0.1.0-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.19.5-next.2
+  - @backstage/plugin-auth-node@0.3.0-next.2
+  - @backstage/backend-plugin-api@0.6.3-next.2
+
+## @backstage/plugin-auth-backend-module-google-provider@0.1.0-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-auth-node@0.3.0-next.2
+  - @backstage/backend-plugin-api@0.6.3-next.2
+
+## @backstage/plugin-auth-node@0.3.0-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config@1.1.0-next.1
+  - @backstage/backend-common@0.19.5-next.2
+  - @backstage/backend-plugin-api@0.6.3-next.2
+  - @backstage/catalog-model@1.4.2-next.1
+  - @backstage/catalog-client@1.4.4-next.1
+  - @backstage/errors@1.2.1
+  - @backstage/types@1.1.0
+
+## @backstage/plugin-azure-devops@0.3.6-next.2
+
+### Patch Changes
+
+- 8cec7664e146: Removed `@types/node` dependency
+- Updated dependencies
+  - @backstage/core-components@0.13.5-next.2
+  - @backstage/core-plugin-api@1.6.0-next.2
+  - @backstage/plugin-catalog-react@1.8.4-next.2
+  - @backstage/catalog-model@1.4.2-next.1
+  - @backstage/errors@1.2.1
+  - @backstage/theme@0.4.1
+  - @backstage/plugin-azure-devops-common@0.3.0
+
+## @backstage/plugin-azure-devops-backend@0.3.30-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config@1.1.0-next.1
+  - @backstage/backend-common@0.19.5-next.2
+  - @backstage/backend-plugin-api@0.6.3-next.2
+  - @backstage/plugin-azure-devops-common@0.3.0
+
+## @backstage/plugin-azure-sites@0.1.13-next.2
+
+### Patch Changes
+
+- 8cec7664e146: Removed `@types/node` dependency
+- Updated dependencies
+  - @backstage/core-components@0.13.5-next.2
+  - @backstage/core-plugin-api@1.6.0-next.2
+  - @backstage/plugin-catalog-react@1.8.4-next.2
+  - @backstage/catalog-model@1.4.2-next.1
+  - @backstage/theme@0.4.1
+  - @backstage/plugin-azure-sites-common@0.1.0
+
+## @backstage/plugin-azure-sites-backend@0.1.13-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config@1.1.0-next.1
+  - @backstage/backend-common@0.19.5-next.2
+  - @backstage/plugin-azure-sites-common@0.1.0
+
+## @backstage/plugin-badges@0.2.48-next.2
+
+### Patch Changes
+
+- 8cec7664e146: Removed `@types/node` dependency
+- Updated dependencies
+  - @backstage/core-components@0.13.5-next.2
+  - @backstage/core-plugin-api@1.6.0-next.2
+  - @backstage/plugin-catalog-react@1.8.4-next.2
+  - @backstage/catalog-model@1.4.2-next.1
+  - @backstage/errors@1.2.1
+  - @backstage/theme@0.4.1
+
+## @backstage/plugin-badges-backend@0.2.6-next.2
+
+### Patch Changes
+
+- 8cec7664e146: Removed `@types/node` dependency
+- Updated dependencies
+  - @backstage/config@1.1.0-next.1
+  - @backstage/backend-common@0.19.5-next.2
+  - @backstage/plugin-auth-node@0.3.0-next.2
+  - @backstage/backend-plugin-api@0.6.3-next.2
+  - @backstage/catalog-model@1.4.2-next.1
+  - @backstage/catalog-client@1.4.4-next.1
+  - @backstage/errors@1.2.1
+
+## @backstage/plugin-bazaar@0.2.16-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog@1.13.0-next.2
+  - @backstage/core-components@0.13.5-next.2
+  - @backstage/core-plugin-api@1.6.0-next.2
+  - @backstage/cli@0.22.13-next.2
+  - @backstage/plugin-catalog-react@1.8.4-next.2
+  - @backstage/catalog-model@1.4.2-next.1
+  - @backstage/catalog-client@1.4.4-next.1
+  - @backstage/errors@1.2.1
+  - @backstage/theme@0.4.1
+
+## @backstage/plugin-bazaar-backend@0.2.14-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config@1.1.0-next.1
+  - @backstage/backend-common@0.19.5-next.2
+  - @backstage/plugin-auth-node@0.3.0-next.2
+  - @backstage/backend-plugin-api@0.6.3-next.2
+  - @backstage/errors@1.2.1
+
+## @backstage/plugin-bitbucket-cloud-common@0.2.12-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/integration@1.7.0-next.2
+
+## @backstage/plugin-bitrise@0.1.51-next.2
+
+### Patch Changes
+
+- 8cec7664e146: Removed `@types/node` dependency
+- Updated dependencies
+  - @backstage/core-components@0.13.5-next.2
+  - @backstage/core-plugin-api@1.6.0-next.2
+  - @backstage/plugin-catalog-react@1.8.4-next.2
+  - @backstage/catalog-model@1.4.2-next.1
+  - @backstage/theme@0.4.1
+
+## @backstage/plugin-catalog-backend@1.13.0-next.2
+
+### Patch Changes
+
+- acffa17027b6: Added some examples to the catalog OpenAPI definition
+- 45947d3b2759: Fixes an issue where `order` was not a recognized parameter for the `/entities` endpoint.
+- 814feeed7343: Update to handle invalid luxon values
+- Updated dependencies
+  - @backstage/config@1.1.0-next.1
+  - @backstage/backend-tasks@0.5.8-next.2
+  - @backstage/backend-common@0.19.5-next.2
+  - @backstage/plugin-auth-node@0.3.0-next.2
+  - @backstage/plugin-catalog-node@1.4.4-next.2
+  - @backstage/plugin-permission-node@0.7.14-next.2
+  - @backstage/plugin-search-backend-module-catalog@0.1.7-next.2
+  - @backstage/integration@1.7.0-next.2
+  - @backstage/backend-plugin-api@0.6.3-next.2
+  - @backstage/catalog-model@1.4.2-next.1
+  - @backstage/plugin-permission-common@0.7.8-next.1
+  - @backstage/backend-openapi-utils@0.0.3
+  - @backstage/catalog-client@1.4.4-next.1
+  - @backstage/errors@1.2.1
+  - @backstage/types@1.1.0
+  - @backstage/plugin-catalog-common@1.0.16-next.1
+  - @backstage/plugin-events-node@0.2.12-next.2
+  - @backstage/plugin-scaffolder-common@1.4.1-next.1
+  - @backstage/plugin-search-common@1.2.6-next.1
+
+## @backstage/plugin-catalog-backend-module-aws@0.2.6-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config@1.1.0-next.1
+  - @backstage/backend-tasks@0.5.8-next.2
+  - @backstage/backend-common@0.19.5-next.2
+  - @backstage/plugin-catalog-node@1.4.4-next.2
+  - @backstage/integration@1.7.0-next.2
+  - @backstage/integration-aws-node@0.1.6-next.1
+  - @backstage/backend-plugin-api@0.6.3-next.2
+  - @backstage/catalog-model@1.4.2-next.1
+  - @backstage/errors@1.2.1
+  - @backstage/types@1.1.0
+  - @backstage/plugin-catalog-common@1.0.16-next.1
+  - @backstage/plugin-kubernetes-common@0.6.6-next.1
+
+## @backstage/plugin-catalog-backend-module-azure@0.1.22-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config@1.1.0-next.1
+  - @backstage/backend-tasks@0.5.8-next.2
+  - @backstage/backend-common@0.19.5-next.2
+  - @backstage/plugin-catalog-node@1.4.4-next.2
+  - @backstage/integration@1.7.0-next.2
+  - @backstage/backend-plugin-api@0.6.3-next.2
+  - @backstage/catalog-model@1.4.2-next.1
+  - @backstage/errors@1.2.1
+  - @backstage/types@1.1.0
+  - @backstage/plugin-catalog-common@1.0.16-next.1
+
+## @backstage/plugin-catalog-backend-module-bitbucket@0.2.18-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config@1.1.0-next.1
+  - @backstage/backend-common@0.19.5-next.2
+  - @backstage/plugin-catalog-node@1.4.4-next.2
+  - @backstage/integration@1.7.0-next.2
+  - @backstage/catalog-model@1.4.2-next.1
+  - @backstage/errors@1.2.1
+  - @backstage/types@1.1.0
+  - @backstage/plugin-bitbucket-cloud-common@0.2.12-next.2
+
+## @backstage/plugin-catalog-backend-module-bitbucket-cloud@0.1.18-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config@1.1.0-next.1
+  - @backstage/backend-tasks@0.5.8-next.2
+  - @backstage/backend-common@0.19.5-next.2
+  - @backstage/plugin-catalog-node@1.4.4-next.2
+  - @backstage/integration@1.7.0-next.2
+  - @backstage/backend-plugin-api@0.6.3-next.2
+  - @backstage/catalog-model@1.4.2-next.1
+  - @backstage/catalog-client@1.4.4-next.1
+  - @backstage/plugin-bitbucket-cloud-common@0.2.12-next.2
+  - @backstage/plugin-catalog-common@1.0.16-next.1
+  - @backstage/plugin-events-node@0.2.12-next.2
+
+## @backstage/plugin-catalog-backend-module-bitbucket-server@0.1.16-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config@1.1.0-next.1
+  - @backstage/backend-tasks@0.5.8-next.2
+  - @backstage/backend-common@0.19.5-next.2
+  - @backstage/plugin-catalog-node@1.4.4-next.2
+  - @backstage/integration@1.7.0-next.2
+  - @backstage/backend-plugin-api@0.6.3-next.2
+  - @backstage/catalog-model@1.4.2-next.1
+  - @backstage/errors@1.2.1
+
+## @backstage/plugin-catalog-backend-module-gcp@0.1.3-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config@1.1.0-next.1
+  - @backstage/backend-tasks@0.5.8-next.2
+  - @backstage/backend-common@0.19.5-next.2
+  - @backstage/plugin-catalog-node@1.4.4-next.2
+  - @backstage/backend-plugin-api@0.6.3-next.2
+  - @backstage/plugin-kubernetes-common@0.6.6-next.1
+
+## @backstage/plugin-catalog-backend-module-gerrit@0.1.19-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config@1.1.0-next.1
+  - @backstage/backend-tasks@0.5.8-next.2
+  - @backstage/backend-common@0.19.5-next.2
+  - @backstage/plugin-catalog-node@1.4.4-next.2
+  - @backstage/integration@1.7.0-next.2
+  - @backstage/backend-plugin-api@0.6.3-next.2
+  - @backstage/catalog-model@1.4.2-next.1
+  - @backstage/errors@1.2.1
+
+## @backstage/plugin-catalog-backend-module-github@0.3.8-next.2
+
+### Patch Changes
+
+- 96353bb7cb4a: Properly support custom `userTransformer` returning `undefined` in `GithubMultiOrgEntityProvider`
+- Updated dependencies
+  - @backstage/plugin-catalog-backend@1.13.0-next.2
+  - @backstage/config@1.1.0-next.1
+  - @backstage/backend-tasks@0.5.8-next.2
+  - @backstage/backend-common@0.19.5-next.2
+  - @backstage/plugin-catalog-node@1.4.4-next.2
+  - @backstage/integration@1.7.0-next.2
+  - @backstage/backend-plugin-api@0.6.3-next.2
+  - @backstage/catalog-model@1.4.2-next.1
+  - @backstage/catalog-client@1.4.4-next.1
+  - @backstage/errors@1.2.1
+  - @backstage/types@1.1.0
+  - @backstage/plugin-catalog-common@1.0.16-next.1
+  - @backstage/plugin-events-node@0.2.12-next.2
+
+## @backstage/plugin-catalog-backend-module-gitlab@0.2.7-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config@1.1.0-next.1
+  - @backstage/backend-tasks@0.5.8-next.2
+  - @backstage/backend-common@0.19.5-next.2
+  - @backstage/plugin-catalog-node@1.4.4-next.2
+  - @backstage/integration@1.7.0-next.2
+  - @backstage/backend-plugin-api@0.6.3-next.2
+  - @backstage/catalog-model@1.4.2-next.1
+  - @backstage/errors@1.2.1
+  - @backstage/types@1.1.0
+
+## @backstage/plugin-catalog-backend-module-incremental-ingestion@0.4.6-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-backend@1.13.0-next.2
+  - @backstage/config@1.1.0-next.1
+  - @backstage/backend-tasks@0.5.8-next.2
+  - @backstage/backend-common@0.19.5-next.2
+  - @backstage/plugin-catalog-node@1.4.4-next.2
+  - @backstage/backend-plugin-api@0.6.3-next.2
+  - @backstage/catalog-model@1.4.2-next.1
+  - @backstage/plugin-permission-common@0.7.8-next.1
+  - @backstage/errors@1.2.1
+  - @backstage/plugin-events-node@0.2.12-next.2
+
+## @backstage/plugin-catalog-backend-module-ldap@0.5.18-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config@1.1.0-next.1
+  - @backstage/backend-tasks@0.5.8-next.2
+  - @backstage/plugin-catalog-node@1.4.4-next.2
+  - @backstage/catalog-model@1.4.2-next.1
+  - @backstage/errors@1.2.1
+  - @backstage/types@1.1.0
+  - @backstage/plugin-catalog-common@1.0.16-next.1
+
+## @backstage/plugin-catalog-backend-module-msgraph@0.5.10-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config@1.1.0-next.1
+  - @backstage/backend-tasks@0.5.8-next.2
+  - @backstage/backend-common@0.19.5-next.2
+  - @backstage/plugin-catalog-node@1.4.4-next.2
+  - @backstage/backend-plugin-api@0.6.3-next.2
+  - @backstage/catalog-model@1.4.2-next.1
+  - @backstage/plugin-catalog-common@1.0.16-next.1
+
+## @backstage/plugin-catalog-backend-module-openapi@0.1.19-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-backend@1.13.0-next.2
+  - @backstage/config@1.1.0-next.1
+  - @backstage/backend-common@0.19.5-next.2
+  - @backstage/plugin-catalog-node@1.4.4-next.2
+  - @backstage/integration@1.7.0-next.2
+  - @backstage/catalog-model@1.4.2-next.1
+  - @backstage/types@1.1.0
+  - @backstage/plugin-catalog-common@1.0.16-next.1
+
+## @backstage/plugin-catalog-backend-module-puppetdb@0.1.8-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config@1.1.0-next.1
+  - @backstage/backend-tasks@0.5.8-next.2
+  - @backstage/backend-common@0.19.5-next.2
+  - @backstage/plugin-catalog-node@1.4.4-next.2
+  - @backstage/backend-plugin-api@0.6.3-next.2
+  - @backstage/catalog-model@1.4.2-next.1
+  - @backstage/errors@1.2.1
+  - @backstage/types@1.1.0
+
+## @backstage/plugin-catalog-backend-module-unprocessed@0.2.3-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-auth-node@0.3.0-next.2
+  - @backstage/backend-plugin-api@0.6.3-next.2
+  - @backstage/catalog-model@1.4.2-next.1
+
+## @backstage/plugin-catalog-common@1.0.16-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/catalog-model@1.4.2-next.1
+  - @backstage/plugin-permission-common@0.7.8-next.1
+  - @backstage/plugin-search-common@1.2.6-next.1
+
+## @backstage/plugin-catalog-graph@0.2.36-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.13.5-next.2
+  - @backstage/core-plugin-api@1.6.0-next.2
+  - @backstage/plugin-catalog-react@1.8.4-next.2
+  - @backstage/catalog-model@1.4.2-next.1
+  - @backstage/catalog-client@1.4.4-next.1
+  - @backstage/theme@0.4.1
+  - @backstage/types@1.1.0
+
+## @backstage/plugin-catalog-graphql@0.3.23-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config@1.1.0-next.1
+  - @backstage/catalog-model@1.4.2-next.1
+  - @backstage/types@1.1.0
+
+## @backstage/plugin-catalog-import@0.9.14-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/integration-react@1.1.19-next.2
+  - @backstage/core-components@0.13.5-next.2
+  - @backstage/core-plugin-api@1.6.0-next.2
+  - @backstage/config@1.1.0-next.1
+  - @backstage/plugin-catalog-react@1.8.4-next.2
+  - @backstage/integration@1.7.0-next.2
+  - @backstage/catalog-model@1.4.2-next.1
+  - @backstage/catalog-client@1.4.4-next.1
+  - @backstage/errors@1.2.1
+  - @backstage/plugin-catalog-common@1.0.16-next.1
+
+## @backstage/plugin-catalog-node@1.4.4-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@0.6.3-next.2
+  - @backstage/catalog-model@1.4.2-next.1
+  - @backstage/catalog-client@1.4.4-next.1
+  - @backstage/errors@1.2.1
+  - @backstage/types@1.1.0
+  - @backstage/plugin-catalog-common@1.0.16-next.1
+
+## @backstage/plugin-catalog-react@1.8.4-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.13.5-next.2
+  - @backstage/core-plugin-api@1.6.0-next.2
+  - @backstage/plugin-permission-react@0.4.15-next.2
+  - @backstage/integration@1.7.0-next.2
+  - @backstage/catalog-model@1.4.2-next.1
+  - @backstage/plugin-permission-common@0.7.8-next.1
+  - @backstage/catalog-client@1.4.4-next.1
+  - @backstage/errors@1.2.1
+  - @backstage/theme@0.4.1
+  - @backstage/types@1.1.0
+  - @backstage/version-bridge@1.0.4
+  - @backstage/plugin-catalog-common@1.0.16-next.1
+
+## @backstage/plugin-catalog-unprocessed-entities@0.1.3-next.2
+
+### Patch Changes
+
+- 8cec7664e146: Removed `@types/node` dependency
+- Updated dependencies
+  - @backstage/core-components@0.13.5-next.2
+  - @backstage/core-plugin-api@1.6.0-next.2
+  - @backstage/catalog-model@1.4.2-next.1
+  - @backstage/errors@1.2.1
+  - @backstage/theme@0.4.1
+
+## @backstage/plugin-cicd-statistics@0.1.26-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-plugin-api@1.6.0-next.2
+  - @backstage/plugin-catalog-react@1.8.4-next.2
+  - @backstage/catalog-model@1.4.2-next.1
+
+## @backstage/plugin-cicd-statistics-module-gitlab@0.1.20-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-plugin-api@1.6.0-next.2
+  - @backstage/plugin-cicd-statistics@0.1.26-next.2
+  - @backstage/catalog-model@1.4.2-next.1
+
+## @backstage/plugin-circleci@0.3.24-next.2
+
+### Patch Changes
+
+- 8cec7664e146: Removed `@types/node` dependency
+- Updated dependencies
+  - @backstage/core-components@0.13.5-next.2
+  - @backstage/core-plugin-api@1.6.0-next.2
+  - @backstage/plugin-catalog-react@1.8.4-next.2
+  - @backstage/catalog-model@1.4.2-next.1
+  - @backstage/theme@0.4.1
+
+## @backstage/plugin-cloudbuild@0.3.24-next.2
+
+### Patch Changes
+
+- 8cec7664e146: Removed `@types/node` dependency
+- 814feeed7343: Update to handle invalid luxon values
+- Updated dependencies
+  - @backstage/core-components@0.13.5-next.2
+  - @backstage/core-plugin-api@1.6.0-next.2
+  - @backstage/plugin-catalog-react@1.8.4-next.2
+  - @backstage/catalog-model@1.4.2-next.1
+  - @backstage/theme@0.4.1
+
+## @backstage/plugin-code-climate@0.1.24-next.2
+
+### Patch Changes
+
+- 8cec7664e146: Removed `@types/node` dependency
+- Updated dependencies
+  - @backstage/core-components@0.13.5-next.2
+  - @backstage/core-plugin-api@1.6.0-next.2
+  - @backstage/plugin-catalog-react@1.8.4-next.2
+  - @backstage/catalog-model@1.4.2-next.1
+  - @backstage/theme@0.4.1
+
+## @backstage/plugin-code-coverage@0.2.17-next.2
+
+### Patch Changes
+
+- 8cec7664e146: Removed `@types/node` dependency
+- Updated dependencies
+  - @backstage/core-components@0.13.5-next.2
+  - @backstage/core-plugin-api@1.6.0-next.2
+  - @backstage/config@1.1.0-next.1
+  - @backstage/plugin-catalog-react@1.8.4-next.2
+  - @backstage/catalog-model@1.4.2-next.1
+  - @backstage/errors@1.2.1
+  - @backstage/theme@0.4.1
+
+## @backstage/plugin-code-coverage-backend@0.2.17-next.2
+
+### Patch Changes
+
+- df005d9932fb: Add text body parser for LCOV reports
+
+- 91ccb56fb418: Replace `express-xml-bodyparser` with `body-parser-xml`.
+
+  `express-xml-bodyparser` was last updated 8 years ago
+  and currently depends on a version of `xml2js` which
+  contains a vulnerability.
+
+  This change will swap it out in favor of `body-parser-xml`
+  which is more maintained and depends on a more recent `xml2js`
+  version without the vulnerability.
+
+- 33e606a797ef: Include auth token when fetching entity
+
+- Updated dependencies
+  - @backstage/config@1.1.0-next.1
+  - @backstage/backend-common@0.19.5-next.2
+  - @backstage/plugin-auth-node@0.3.0-next.2
+  - @backstage/integration@1.7.0-next.2
+  - @backstage/catalog-model@1.4.2-next.1
+  - @backstage/catalog-client@1.4.4-next.1
+  - @backstage/errors@1.2.1
+
+## @backstage/plugin-codescene@0.1.17-next.2
+
+### Patch Changes
+
+- 8cec7664e146: Removed `@types/node` dependency
+- db92d1244897: Updated dependency `rc-progress` to `3.5.1`.
+- Updated dependencies
+  - @backstage/core-components@0.13.5-next.2
+  - @backstage/core-plugin-api@1.6.0-next.2
+  - @backstage/config@1.1.0-next.1
+  - @backstage/errors@1.2.1
+  - @backstage/theme@0.4.1
+
+## @backstage/plugin-config-schema@0.1.45-next.2
+
+### Patch Changes
+
+- 8cec7664e146: Removed `@types/node` dependency
+- Updated dependencies
+  - @backstage/core-components@0.13.5-next.2
+  - @backstage/core-plugin-api@1.6.0-next.2
+  - @backstage/config@1.1.0-next.1
+  - @backstage/errors@1.2.1
+  - @backstage/theme@0.4.1
+  - @backstage/types@1.1.0
+
+## @backstage/plugin-cost-insights@0.12.13-next.2
+
+### Patch Changes
+
+- 8cec7664e146: Removed `@types/node` dependency
+- Updated dependencies
+  - @backstage/core-components@0.13.5-next.2
+  - @backstage/core-plugin-api@1.6.0-next.2
+  - @backstage/config@1.1.0-next.1
+  - @backstage/plugin-catalog-react@1.8.4-next.2
+  - @backstage/catalog-model@1.4.2-next.1
+  - @backstage/theme@0.4.1
+  - @backstage/plugin-cost-insights-common@0.1.1
+
+## @backstage/plugin-devtools@0.1.4-next.2
+
+### Patch Changes
+
+- 8cec7664e146: Removed `@types/node` dependency
+- Updated dependencies
+  - @backstage/core-components@0.13.5-next.2
+  - @backstage/core-plugin-api@1.6.0-next.2
+  - @backstage/plugin-permission-react@0.4.15-next.2
+  - @backstage/errors@1.2.1
+  - @backstage/theme@0.4.1
+  - @backstage/types@1.1.0
+  - @backstage/plugin-devtools-common@0.1.4-next.1
+
+## @backstage/plugin-devtools-backend@0.1.6-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config-loader@1.5.0-next.2
+  - @backstage/config@1.1.0-next.1
+  - @backstage/backend-common@0.19.5-next.2
+  - @backstage/plugin-auth-node@0.3.0-next.2
+  - @backstage/plugin-permission-node@0.7.14-next.2
+  - @backstage/backend-plugin-api@0.6.3-next.2
+  - @backstage/plugin-permission-common@0.7.8-next.1
+  - @backstage/cli-common@0.1.12
+  - @backstage/errors@1.2.1
+  - @backstage/types@1.1.0
+  - @backstage/plugin-devtools-common@0.1.4-next.1
+
+## @backstage/plugin-devtools-common@0.1.4-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-permission-common@0.7.8-next.1
+  - @backstage/types@1.1.0
+
+## @backstage/plugin-dynatrace@7.0.4-next.2
+
+### Patch Changes
+
+- 8cec7664e146: Removed `@types/node` dependency
+- Updated dependencies
+  - @backstage/core-components@0.13.5-next.2
+  - @backstage/core-plugin-api@1.6.0-next.2
+  - @backstage/plugin-catalog-react@1.8.4-next.2
+  - @backstage/catalog-model@1.4.2-next.1
+  - @backstage/theme@0.4.1
+
+## @backstage/plugin-entity-feedback@0.2.7-next.2
+
+### Patch Changes
+
+- 8cec7664e146: Removed `@types/node` dependency
+- Updated dependencies
+  - @backstage/core-components@0.13.5-next.2
+  - @backstage/core-plugin-api@1.6.0-next.2
+  - @backstage/plugin-catalog-react@1.8.4-next.2
+  - @backstage/catalog-model@1.4.2-next.1
+  - @backstage/errors@1.2.1
+  - @backstage/theme@0.4.1
+  - @backstage/plugin-entity-feedback-common@0.1.2
+
+## @backstage/plugin-entity-feedback-backend@0.1.9-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config@1.1.0-next.1
+  - @backstage/backend-common@0.19.5-next.2
+  - @backstage/plugin-auth-node@0.3.0-next.2
+  - @backstage/backend-plugin-api@0.6.3-next.2
+  - @backstage/catalog-model@1.4.2-next.1
+  - @backstage/catalog-client@1.4.4-next.1
+  - @backstage/plugin-entity-feedback-common@0.1.2
+
+## @backstage/plugin-entity-validation@0.1.9-next.2
+
+### Patch Changes
+
+- 8cec7664e146: Removed `@types/node` dependency
+- Updated dependencies
+  - @backstage/core-components@0.13.5-next.2
+  - @backstage/core-plugin-api@1.6.0-next.2
+  - @backstage/plugin-catalog-react@1.8.4-next.2
+  - @backstage/catalog-model@1.4.2-next.1
+  - @backstage/catalog-client@1.4.4-next.1
+  - @backstage/errors@1.2.1
+  - @backstage/theme@0.4.1
+  - @backstage/plugin-catalog-common@1.0.16-next.1
+
+## @backstage/plugin-events-backend@0.2.12-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config@1.1.0-next.1
+  - @backstage/backend-common@0.19.5-next.2
+  - @backstage/backend-plugin-api@0.6.3-next.2
+  - @backstage/plugin-events-node@0.2.12-next.2
+
+## @backstage/plugin-events-backend-module-aws-sqs@0.2.6-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config@1.1.0-next.1
+  - @backstage/backend-tasks@0.5.8-next.2
+  - @backstage/backend-common@0.19.5-next.2
+  - @backstage/backend-plugin-api@0.6.3-next.2
+  - @backstage/types@1.1.0
+  - @backstage/plugin-events-node@0.2.12-next.2
+
+## @backstage/plugin-events-backend-module-azure@0.1.13-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@0.6.3-next.2
+  - @backstage/plugin-events-node@0.2.12-next.2
+
+## @backstage/plugin-events-backend-module-bitbucket-cloud@0.1.13-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@0.6.3-next.2
+  - @backstage/plugin-events-node@0.2.12-next.2
+
+## @backstage/plugin-events-backend-module-gerrit@0.1.13-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@0.6.3-next.2
+  - @backstage/plugin-events-node@0.2.12-next.2
+
+## @backstage/plugin-events-backend-module-github@0.1.13-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config@1.1.0-next.1
+  - @backstage/backend-plugin-api@0.6.3-next.2
+  - @backstage/plugin-events-node@0.2.12-next.2
+
+## @backstage/plugin-events-backend-module-gitlab@0.1.13-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config@1.1.0-next.1
+  - @backstage/backend-plugin-api@0.6.3-next.2
+  - @backstage/plugin-events-node@0.2.12-next.2
+
+## @backstage/plugin-events-backend-test-utils@0.1.13-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-events-node@0.2.12-next.2
+
+## @backstage/plugin-events-node@0.2.12-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@0.6.3-next.2
+
+## @backstage/plugin-explore@0.4.10-next.2
+
+### Patch Changes
+
+- 8cec7664e146: Removed `@types/node` dependency
+- Updated dependencies
+  - @backstage/core-components@0.13.5-next.2
+  - @backstage/core-plugin-api@1.6.0-next.2
+  - @backstage/plugin-explore-react@0.0.31-next.2
+  - @backstage/plugin-catalog-react@1.8.4-next.2
+  - @backstage/plugin-search-react@1.7.0-next.2
+  - @backstage/catalog-model@1.4.2-next.1
+  - @backstage/errors@1.2.1
+  - @backstage/theme@0.4.1
+  - @backstage/plugin-explore-common@0.0.1
+  - @backstage/plugin-search-common@1.2.6-next.1
+
+## @backstage/plugin-explore-backend@0.0.13-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config@1.1.0-next.1
+  - @backstage/backend-common@0.19.5-next.2
+  - @backstage/plugin-search-backend-module-explore@0.1.7-next.2
+  - @backstage/types@1.1.0
+  - @backstage/plugin-explore-common@0.0.1
+  - @backstage/plugin-search-common@1.2.6-next.1
+
+## @backstage/plugin-explore-react@0.0.31-next.2
+
+### Patch Changes
+
+- 8cec7664e146: Removed `@types/node` dependency
+- Updated dependencies
+  - @backstage/core-plugin-api@1.6.0-next.2
+  - @backstage/plugin-explore-common@0.0.1
+
+## @backstage/plugin-firehydrant@0.2.8-next.2
+
+### Patch Changes
+
+- 8cec7664e146: Removed `@types/node` dependency
+- Updated dependencies
+  - @backstage/core-components@0.13.5-next.2
+  - @backstage/core-plugin-api@1.6.0-next.2
+  - @backstage/plugin-catalog-react@1.8.4-next.2
+  - @backstage/catalog-model@1.4.2-next.1
+  - @backstage/theme@0.4.1
+
+## @backstage/plugin-fossa@0.2.56-next.2
+
+### Patch Changes
+
+- 8cec7664e146: Removed `@types/node` dependency
+- Updated dependencies
+  - @backstage/core-components@0.13.5-next.2
+  - @backstage/core-plugin-api@1.6.0-next.2
+  - @backstage/plugin-catalog-react@1.8.4-next.2
+  - @backstage/catalog-model@1.4.2-next.1
+  - @backstage/errors@1.2.1
+  - @backstage/theme@0.4.1
+
+## @backstage/plugin-gcalendar@0.3.18-next.2
+
+### Patch Changes
+
+- 8cec7664e146: Removed `@types/node` dependency
+- 814feeed7343: Update to handle invalid luxon values
+- Updated dependencies
+  - @backstage/core-components@0.13.5-next.2
+  - @backstage/core-plugin-api@1.6.0-next.2
+  - @backstage/errors@1.2.1
+  - @backstage/theme@0.4.1
+
+## @backstage/plugin-gcp-projects@0.3.41-next.2
+
+### Patch Changes
+
+- 8cec7664e146: Removed `@types/node` dependency
+- Updated dependencies
+  - @backstage/core-components@0.13.5-next.2
+  - @backstage/core-plugin-api@1.6.0-next.2
+  - @backstage/theme@0.4.1
+
+## @backstage/plugin-git-release-manager@0.3.37-next.2
+
+### Patch Changes
+
+- 8cec7664e146: Removed `@types/node` dependency
+- Updated dependencies
+  - @backstage/core-components@0.13.5-next.2
+  - @backstage/core-plugin-api@1.6.0-next.2
+  - @backstage/integration@1.7.0-next.2
+  - @backstage/theme@0.4.1
+
+## @backstage/plugin-github-actions@0.6.5-next.2
+
+### Patch Changes
+
+- 8cec7664e146: Removed `@types/node` dependency
+- Updated dependencies
+  - @backstage/integration-react@1.1.19-next.2
+  - @backstage/core-components@0.13.5-next.2
+  - @backstage/core-plugin-api@1.6.0-next.2
+  - @backstage/plugin-catalog-react@1.8.4-next.2
+  - @backstage/integration@1.7.0-next.2
+  - @backstage/catalog-model@1.4.2-next.1
+  - @backstage/theme@0.4.1
+
+## @backstage/plugin-github-deployments@0.1.55-next.2
+
+### Patch Changes
+
+- 8cec7664e146: Removed `@types/node` dependency
+- Updated dependencies
+  - @backstage/integration-react@1.1.19-next.2
+  - @backstage/core-components@0.13.5-next.2
+  - @backstage/core-plugin-api@1.6.0-next.2
+  - @backstage/plugin-catalog-react@1.8.4-next.2
+  - @backstage/integration@1.7.0-next.2
+  - @backstage/catalog-model@1.4.2-next.1
+  - @backstage/errors@1.2.1
+  - @backstage/theme@0.4.1
+
+## @backstage/plugin-github-issues@0.2.13-next.2
+
+### Patch Changes
+
+- 8cec7664e146: Removed `@types/node` dependency
+- Updated dependencies
+  - @backstage/core-components@0.13.5-next.2
+  - @backstage/core-plugin-api@1.6.0-next.2
+  - @backstage/plugin-catalog-react@1.8.4-next.2
+  - @backstage/integration@1.7.0-next.2
+  - @backstage/catalog-model@1.4.2-next.1
+  - @backstage/errors@1.2.1
+  - @backstage/theme@0.4.1
+
+## @backstage/plugin-github-pull-requests-board@0.1.18-next.2
+
+### Patch Changes
+
+- 8cec7664e146: Removed `@types/node` dependency
+- Updated dependencies
+  - @backstage/core-components@0.13.5-next.2
+  - @backstage/core-plugin-api@1.6.0-next.2
+  - @backstage/plugin-catalog-react@1.8.4-next.2
+  - @backstage/integration@1.7.0-next.2
+  - @backstage/catalog-model@1.4.2-next.1
+  - @backstage/theme@0.4.1
+
+## @backstage/plugin-gitops-profiles@0.3.40-next.2
+
+### Patch Changes
+
+- 8cec7664e146: Removed `@types/node` dependency
+- Updated dependencies
+  - @backstage/core-components@0.13.5-next.2
+  - @backstage/core-plugin-api@1.6.0-next.2
+  - @backstage/config@1.1.0-next.1
+  - @backstage/theme@0.4.1
+
+## @backstage/plugin-gocd@0.1.30-next.2
+
+### Patch Changes
+
+- 8cec7664e146: Removed `@types/node` dependency
+- Updated dependencies
+  - @backstage/core-components@0.13.5-next.2
+  - @backstage/core-plugin-api@1.6.0-next.2
+  - @backstage/plugin-catalog-react@1.8.4-next.2
+  - @backstage/catalog-model@1.4.2-next.1
+  - @backstage/errors@1.2.1
+  - @backstage/theme@0.4.1
+
+## @backstage/plugin-graphiql@0.2.54-next.2
+
+### Patch Changes
+
+- 8cec7664e146: Removed `@types/node` dependency
+- Updated dependencies
+  - @backstage/core-components@0.13.5-next.2
+  - @backstage/core-plugin-api@1.6.0-next.2
+  - @backstage/theme@0.4.1
+
+## @backstage/plugin-graphql-backend@0.1.41-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config@1.1.0-next.1
+  - @backstage/backend-common@0.19.5-next.2
+  - @backstage/plugin-catalog-graphql@0.3.23-next.1
+
+## @backstage/plugin-graphql-voyager@0.1.7-next.2
+
+### Patch Changes
+
+- 8cec7664e146: Removed `@types/node` dependency
+- Updated dependencies
+  - @backstage/core-components@0.13.5-next.2
+  - @backstage/core-plugin-api@1.6.0-next.2
+  - @backstage/theme@0.4.1
+
+## @backstage/plugin-home@0.5.8-next.2
+
+### Patch Changes
+
+- 8cec7664e146: Removed `@types/node` dependency
+- Updated dependencies
+  - @backstage/core-components@0.13.5-next.2
+  - @backstage/core-plugin-api@1.6.0-next.2
+  - @backstage/plugin-home-react@0.1.3-next.2
+  - @backstage/config@1.1.0-next.1
+  - @backstage/plugin-catalog-react@1.8.4-next.2
+  - @backstage/catalog-model@1.4.2-next.1
+  - @backstage/theme@0.4.1
+
+## @backstage/plugin-home-react@0.1.3-next.2
+
+### Patch Changes
+
+- 8cec7664e146: Removed `@types/node` dependency
+- Updated dependencies
+  - @backstage/core-components@0.13.5-next.2
+  - @backstage/core-plugin-api@1.6.0-next.2
+
+## @backstage/plugin-ilert@0.2.13-next.2
+
+### Patch Changes
+
+- 8cec7664e146: Removed `@types/node` dependency
+- 814feeed7343: Update to handle invalid luxon values
+- Updated dependencies
+  - @backstage/core-components@0.13.5-next.2
+  - @backstage/core-plugin-api@1.6.0-next.2
+  - @backstage/plugin-catalog-react@1.8.4-next.2
+  - @backstage/catalog-model@1.4.2-next.1
+  - @backstage/errors@1.2.1
+  - @backstage/theme@0.4.1
+
+## @backstage/plugin-jenkins@0.8.6-next.2
+
+### Patch Changes
+
+- 8cec7664e146: Removed `@types/node` dependency
+- Updated dependencies
+  - @backstage/core-components@0.13.5-next.2
+  - @backstage/core-plugin-api@1.6.0-next.2
+  - @backstage/plugin-catalog-react@1.8.4-next.2
+  - @backstage/catalog-model@1.4.2-next.1
+  - @backstage/errors@1.2.1
+  - @backstage/theme@0.4.1
+  - @backstage/plugin-jenkins-common@0.1.19-next.1
+
+## @backstage/plugin-jenkins-backend@0.2.6-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config@1.1.0-next.1
+  - @backstage/backend-common@0.19.5-next.2
+  - @backstage/plugin-auth-node@0.3.0-next.2
+  - @backstage/plugin-permission-node@0.7.14-next.2
+  - @backstage/catalog-model@1.4.2-next.1
+  - @backstage/plugin-permission-common@0.7.8-next.1
+  - @backstage/catalog-client@1.4.4-next.1
+  - @backstage/errors@1.2.1
+  - @backstage/plugin-jenkins-common@0.1.19-next.1
+
+## @backstage/plugin-jenkins-common@0.1.19-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-permission-common@0.7.8-next.1
+  - @backstage/plugin-catalog-common@1.0.16-next.1
+
+## @backstage/plugin-kafka@0.3.24-next.2
+
+### Patch Changes
+
+- 8cec7664e146: Removed `@types/node` dependency
+- Updated dependencies
+  - @backstage/core-components@0.13.5-next.2
+  - @backstage/core-plugin-api@1.6.0-next.2
+  - @backstage/config@1.1.0-next.1
+  - @backstage/plugin-catalog-react@1.8.4-next.2
+  - @backstage/catalog-model@1.4.2-next.1
+  - @backstage/theme@0.4.1
+
+## @backstage/plugin-kafka-backend@0.2.44-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config@1.1.0-next.1
+  - @backstage/backend-common@0.19.5-next.2
+  - @backstage/backend-plugin-api@0.6.3-next.2
+  - @backstage/catalog-model@1.4.2-next.1
+  - @backstage/errors@1.2.1
+
+## @backstage/plugin-kubernetes@0.10.3-next.2
+
+### Patch Changes
+
+- 8cec7664e146: Removed `@types/node` dependency
+- Updated dependencies
+  - @backstage/core-components@0.13.5-next.2
+  - @backstage/core-plugin-api@1.6.0-next.2
+  - @backstage/config@1.1.0-next.1
+  - @backstage/plugin-catalog-react@1.8.4-next.2
+  - @backstage/catalog-model@1.4.2-next.1
+  - @backstage/errors@1.2.1
+  - @backstage/theme@0.4.1
+  - @backstage/plugin-kubernetes-common@0.6.6-next.1
+
+## @backstage/plugin-kubernetes-backend@0.11.6-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config@1.1.0-next.1
+  - @backstage/backend-common@0.19.5-next.2
+  - @backstage/plugin-auth-node@0.3.0-next.2
+  - @backstage/plugin-catalog-node@1.4.4-next.2
+  - @backstage/plugin-permission-node@0.7.14-next.2
+  - @backstage/integration-aws-node@0.1.6-next.1
+  - @backstage/backend-plugin-api@0.6.3-next.2
+  - @backstage/catalog-model@1.4.2-next.1
+  - @backstage/plugin-permission-common@0.7.8-next.1
+  - @backstage/catalog-client@1.4.4-next.1
+  - @backstage/errors@1.2.1
+  - @backstage/types@1.1.0
+  - @backstage/plugin-kubernetes-common@0.6.6-next.1
+
+## @backstage/plugin-kubernetes-common@0.6.6-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/catalog-model@1.4.2-next.1
+  - @backstage/plugin-permission-common@0.7.8-next.1
+
+## @backstage/plugin-lighthouse@0.4.9-next.2
+
+### Patch Changes
+
+- 8cec7664e146: Removed `@types/node` dependency
+- Updated dependencies
+  - @backstage/core-components@0.13.5-next.2
+  - @backstage/core-plugin-api@1.6.0-next.2
+  - @backstage/config@1.1.0-next.1
+  - @backstage/plugin-catalog-react@1.8.4-next.2
+  - @backstage/catalog-model@1.4.2-next.1
+  - @backstage/plugin-lighthouse-common@0.1.3-next.1
+  - @backstage/theme@0.4.1
+
+## @backstage/plugin-lighthouse-backend@0.2.7-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config@1.1.0-next.1
+  - @backstage/backend-tasks@0.5.8-next.2
+  - @backstage/backend-common@0.19.5-next.2
+  - @backstage/plugin-catalog-node@1.4.4-next.2
+  - @backstage/backend-plugin-api@0.6.3-next.2
+  - @backstage/catalog-model@1.4.2-next.1
+  - @backstage/plugin-lighthouse-common@0.1.3-next.1
+  - @backstage/catalog-client@1.4.4-next.1
+  - @backstage/types@1.1.0
+
+## @backstage/plugin-lighthouse-common@0.1.3-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config@1.1.0-next.1
+
+## @backstage/plugin-linguist@0.1.9-next.2
+
+### Patch Changes
+
+- 8cec7664e146: Removed `@types/node` dependency
+- Updated dependencies
+  - @backstage/core-components@0.13.5-next.2
+  - @backstage/core-plugin-api@1.6.0-next.2
+  - @backstage/plugin-catalog-react@1.8.4-next.2
+  - @backstage/catalog-model@1.4.2-next.1
+  - @backstage/errors@1.2.1
+  - @backstage/theme@0.4.1
+  - @backstage/plugin-linguist-common@0.1.1
+
+## @backstage/plugin-linguist-backend@0.4.3-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config@1.1.0-next.1
+  - @backstage/backend-tasks@0.5.8-next.2
+  - @backstage/backend-common@0.19.5-next.2
+  - @backstage/plugin-auth-node@0.3.0-next.2
+  - @backstage/plugin-catalog-node@1.4.4-next.2
+  - @backstage/backend-plugin-api@0.6.3-next.2
+  - @backstage/catalog-model@1.4.2-next.1
+  - @backstage/catalog-client@1.4.4-next.1
+  - @backstage/errors@1.2.1
+  - @backstage/types@1.1.0
+  - @backstage/plugin-linguist-common@0.1.1
+
+## @backstage/plugin-microsoft-calendar@0.1.7-next.2
+
+### Patch Changes
+
+- 8cec7664e146: Removed `@types/node` dependency
+- 814feeed7343: Update to handle invalid luxon values
+- Updated dependencies
+  - @backstage/core-components@0.13.5-next.2
+  - @backstage/core-plugin-api@1.6.0-next.2
+  - @backstage/errors@1.2.1
+  - @backstage/theme@0.4.1
+
+## @backstage/plugin-newrelic@0.3.40-next.2
+
+### Patch Changes
+
+- 8cec7664e146: Removed `@types/node` dependency
+- Updated dependencies
+  - @backstage/core-components@0.13.5-next.2
+  - @backstage/core-plugin-api@1.6.0-next.2
+  - @backstage/theme@0.4.1
+
+## @backstage/plugin-newrelic-dashboard@0.2.17-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.13.5-next.2
+  - @backstage/core-plugin-api@1.6.0-next.2
+  - @backstage/plugin-catalog-react@1.8.4-next.2
+  - @backstage/catalog-model@1.4.2-next.1
+  - @backstage/errors@1.2.1
+
+## @backstage/plugin-nomad@0.1.5-next.2
+
+### Patch Changes
+
+- 8cec7664e146: Removed `@types/node` dependency
+- Updated dependencies
+  - @backstage/core-components@0.13.5-next.2
+  - @backstage/core-plugin-api@1.6.0-next.2
+  - @backstage/config@1.1.0-next.1
+  - @backstage/plugin-catalog-react@1.8.4-next.2
+  - @backstage/catalog-model@1.4.2-next.1
+  - @backstage/theme@0.4.1
+
+## @backstage/plugin-nomad-backend@0.1.5-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config@1.1.0-next.1
+  - @backstage/backend-common@0.19.5-next.2
+  - @backstage/errors@1.2.1
+
+## @backstage/plugin-octopus-deploy@0.2.6-next.2
+
+### Patch Changes
+
+- 8cec7664e146: Removed `@types/node` dependency
+- Updated dependencies
+  - @backstage/core-components@0.13.5-next.2
+  - @backstage/core-plugin-api@1.6.0-next.2
+  - @backstage/plugin-catalog-react@1.8.4-next.2
+  - @backstage/catalog-model@1.4.2-next.1
+  - @backstage/theme@0.4.1
+
+## @backstage/plugin-opencost@0.2.0-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.13.5-next.2
+  - @backstage/core-plugin-api@1.6.0-next.2
+  - @backstage/theme@0.4.1
+
+## @backstage/plugin-org@0.6.14-next.2
+
+### Patch Changes
+
+- dd9329caea1c: Entity relations toggle should by default be aggregated for User entities
+- 8cec7664e146: Removed `@types/node` dependency
+- Updated dependencies
+  - @backstage/core-components@0.13.5-next.2
+  - @backstage/core-plugin-api@1.6.0-next.2
+  - @backstage/plugin-catalog-react@1.8.4-next.2
+  - @backstage/catalog-model@1.4.2-next.1
+  - @backstage/theme@0.4.1
+
+## @backstage/plugin-org-react@0.1.13-next.2
+
+### Patch Changes
+
+- 8cec7664e146: Removed `@types/node` dependency
+- Updated dependencies
+  - @backstage/core-components@0.13.5-next.2
+  - @backstage/core-plugin-api@1.6.0-next.2
+  - @backstage/plugin-catalog-react@1.8.4-next.2
+  - @backstage/catalog-model@1.4.2-next.1
+  - @backstage/catalog-client@1.4.4-next.1
+  - @backstage/theme@0.4.1
+
+## @backstage/plugin-pagerduty@0.6.5-next.2
+
+### Patch Changes
+
+- 8cec7664e146: Removed `@types/node` dependency
+- Updated dependencies
+  - @backstage/core-components@0.13.5-next.2
+  - @backstage/core-plugin-api@1.6.0-next.2
+  - @backstage/plugin-home-react@0.1.3-next.2
+  - @backstage/plugin-catalog-react@1.8.4-next.2
+  - @backstage/catalog-model@1.4.2-next.1
+  - @backstage/errors@1.2.1
+  - @backstage/theme@0.4.1
+
+## @backstage/plugin-periskop@0.1.22-next.2
+
+### Patch Changes
+
+- 8cec7664e146: Removed `@types/node` dependency
+- Updated dependencies
+  - @backstage/core-components@0.13.5-next.2
+  - @backstage/core-plugin-api@1.6.0-next.2
+  - @backstage/plugin-catalog-react@1.8.4-next.2
+  - @backstage/catalog-model@1.4.2-next.1
+  - @backstage/errors@1.2.1
+  - @backstage/theme@0.4.1
+
+## @backstage/plugin-periskop-backend@0.1.22-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config@1.1.0-next.1
+  - @backstage/backend-common@0.19.5-next.2
+  - @backstage/backend-plugin-api@0.6.3-next.2
+
+## @backstage/plugin-permission-backend@0.5.26-next.2
+
+### Patch Changes
+
+- 84ad6fccd4d5: Moved `permissionModuleAllowAllPolicy` to `@backstage/plugin-permission-backend-module-allow-all-policy`
+- Updated dependencies
+  - @backstage/config@1.1.0-next.1
+  - @backstage/backend-common@0.19.5-next.2
+  - @backstage/plugin-auth-node@0.3.0-next.2
+  - @backstage/plugin-permission-node@0.7.14-next.2
+  - @backstage/backend-plugin-api@0.6.3-next.2
+  - @backstage/plugin-permission-common@0.7.8-next.1
+  - @backstage/errors@1.2.1
+
+## @backstage/plugin-permission-common@0.7.8-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config@1.1.0-next.1
+  - @backstage/errors@1.2.1
+  - @backstage/types@1.1.0
+
+## @backstage/plugin-permission-node@0.7.14-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config@1.1.0-next.1
+  - @backstage/backend-common@0.19.5-next.2
+  - @backstage/plugin-auth-node@0.3.0-next.2
+  - @backstage/backend-plugin-api@0.6.3-next.2
+  - @backstage/plugin-permission-common@0.7.8-next.1
+  - @backstage/errors@1.2.1
+
+## @backstage/plugin-permission-react@0.4.15-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-plugin-api@1.6.0-next.2
+  - @backstage/config@1.1.0-next.1
+  - @backstage/plugin-permission-common@0.7.8-next.1
+
+## @backstage/plugin-playlist@0.1.16-next.2
+
+### Patch Changes
+
+- 79847cb73ed7: Updated latest playlist screen in readme document
+- 8cec7664e146: Removed `@types/node` dependency
+- Updated dependencies
+  - @backstage/core-components@0.13.5-next.2
+  - @backstage/core-plugin-api@1.6.0-next.2
+  - @backstage/plugin-catalog-react@1.8.4-next.2
+  - @backstage/plugin-search-react@1.7.0-next.2
+  - @backstage/plugin-permission-react@0.4.15-next.2
+  - @backstage/catalog-model@1.4.2-next.1
+  - @backstage/plugin-permission-common@0.7.8-next.1
+  - @backstage/errors@1.2.1
+  - @backstage/theme@0.4.1
+  - @backstage/plugin-catalog-common@1.0.16-next.1
+  - @backstage/plugin-playlist-common@0.1.10-next.1
+
+## @backstage/plugin-playlist-backend@0.3.7-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config@1.1.0-next.1
+  - @backstage/backend-common@0.19.5-next.2
+  - @backstage/plugin-auth-node@0.3.0-next.2
+  - @backstage/plugin-permission-node@0.7.14-next.2
+  - @backstage/catalog-model@1.4.2-next.1
+  - @backstage/plugin-permission-common@0.7.8-next.1
+  - @backstage/catalog-client@1.4.4-next.1
+  - @backstage/errors@1.2.1
+  - @backstage/plugin-playlist-common@0.1.10-next.1
+
+## @backstage/plugin-playlist-common@0.1.10-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-permission-common@0.7.8-next.1
+
+## @backstage/plugin-proxy-backend@0.3.3-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config@1.1.0-next.1
+  - @backstage/backend-common@0.19.5-next.2
+  - @backstage/backend-plugin-api@0.6.3-next.2
+
+## @backstage/plugin-puppetdb@0.1.7-next.2
+
+### Patch Changes
+
+- 8cec7664e146: Removed `@types/node` dependency
+- Updated dependencies
+  - @backstage/core-components@0.13.5-next.2
+  - @backstage/core-plugin-api@1.6.0-next.2
+  - @backstage/plugin-catalog-react@1.8.4-next.2
+  - @backstage/catalog-model@1.4.2-next.1
+  - @backstage/errors@1.2.1
+  - @backstage/theme@0.4.1
+
+## @backstage/plugin-rollbar@0.4.24-next.2
+
+### Patch Changes
+
+- 8cec7664e146: Removed `@types/node` dependency
+- Updated dependencies
+  - @backstage/core-components@0.13.5-next.2
+  - @backstage/core-plugin-api@1.6.0-next.2
+  - @backstage/plugin-catalog-react@1.8.4-next.2
+  - @backstage/catalog-model@1.4.2-next.1
+  - @backstage/theme@0.4.1
+
+## @backstage/plugin-rollbar-backend@0.1.48-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config@1.1.0-next.1
+  - @backstage/backend-common@0.19.5-next.2
+
+## @backstage/plugin-scaffolder@1.14.5-next.2
+
+### Patch Changes
+
+- 8cec7664e146: Removed `@types/node` dependency
+- Updated dependencies
+  - @backstage/integration-react@1.1.19-next.2
+  - @backstage/core-components@0.13.5-next.2
+  - @backstage/core-plugin-api@1.6.0-next.2
+  - @backstage/config@1.1.0-next.1
+  - @backstage/plugin-scaffolder-react@1.5.5-next.2
+  - @backstage/plugin-catalog-react@1.8.4-next.2
+  - @backstage/plugin-permission-react@0.4.15-next.2
+  - @backstage/integration@1.7.0-next.2
+  - @backstage/catalog-model@1.4.2-next.1
+  - @backstage/catalog-client@1.4.4-next.1
+  - @backstage/errors@1.2.1
+  - @backstage/theme@0.4.1
+  - @backstage/types@1.1.0
+  - @backstage/plugin-catalog-common@1.0.16-next.1
+  - @backstage/plugin-scaffolder-common@1.4.1-next.1
+
+## @backstage/plugin-scaffolder-backend@1.16.6-next.2
+
+### Patch Changes
+
+- ded27b83ead2: Add examples for `publish:bitbucket` scaffolder actions.
+- 814feeed7343: Update to handle invalid luxon values
+- Updated dependencies
+  - @backstage/plugin-catalog-backend@1.13.0-next.2
+  - @backstage/config@1.1.0-next.1
+  - @backstage/backend-tasks@0.5.8-next.2
+  - @backstage/backend-common@0.19.5-next.2
+  - @backstage/plugin-auth-node@0.3.0-next.2
+  - @backstage/plugin-catalog-node@1.4.4-next.2
+  - @backstage/plugin-permission-node@0.7.14-next.2
+  - @backstage/integration@1.7.0-next.2
+  - @backstage/backend-plugin-api@0.6.3-next.2
+  - @backstage/catalog-model@1.4.2-next.1
+  - @backstage/plugin-permission-common@0.7.8-next.1
+  - @backstage/plugin-scaffolder-node@0.2.3-next.2
+  - @backstage/catalog-client@1.4.4-next.1
+  - @backstage/errors@1.2.1
+  - @backstage/types@1.1.0
+  - @backstage/plugin-catalog-common@1.0.16-next.1
+  - @backstage/plugin-scaffolder-common@1.4.1-next.1
+
+## @backstage/plugin-scaffolder-backend-module-confluence-to-markdown@0.2.4-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config@1.1.0-next.1
+  - @backstage/backend-common@0.19.5-next.2
+  - @backstage/integration@1.7.0-next.2
+  - @backstage/plugin-scaffolder-node@0.2.3-next.2
+  - @backstage/errors@1.2.1
+  - @backstage/types@1.1.0
+
+## @backstage/plugin-scaffolder-backend-module-cookiecutter@0.2.27-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config@1.1.0-next.1
+  - @backstage/backend-common@0.19.5-next.2
+  - @backstage/integration@1.7.0-next.2
+  - @backstage/plugin-scaffolder-node@0.2.3-next.2
+  - @backstage/errors@1.2.1
+  - @backstage/types@1.1.0
+
+## @backstage/plugin-scaffolder-backend-module-gitlab@0.2.6-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config@1.1.0-next.1
+  - @backstage/integration@1.7.0-next.2
+  - @backstage/plugin-scaffolder-node@0.2.3-next.2
+  - @backstage/errors@1.2.1
+
+## @backstage/plugin-scaffolder-backend-module-rails@0.4.20-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config@1.1.0-next.1
+  - @backstage/backend-common@0.19.5-next.2
+  - @backstage/integration@1.7.0-next.2
+  - @backstage/plugin-scaffolder-node@0.2.3-next.2
+  - @backstage/errors@1.2.1
+  - @backstage/types@1.1.0
+
+## @backstage/plugin-scaffolder-backend-module-sentry@0.1.11-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config@1.1.0-next.1
+  - @backstage/plugin-scaffolder-node@0.2.3-next.2
+  - @backstage/errors@1.2.1
+
+## @backstage/plugin-scaffolder-backend-module-yeoman@0.2.24-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config@1.1.0-next.1
+  - @backstage/plugin-scaffolder-node@0.2.3-next.2
+  - @backstage/types@1.1.0
+
+## @backstage/plugin-scaffolder-common@1.4.1-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/catalog-model@1.4.2-next.1
+  - @backstage/plugin-permission-common@0.7.8-next.1
+  - @backstage/types@1.1.0
+
+## @backstage/plugin-scaffolder-node@0.2.3-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.19.5-next.2
+  - @backstage/integration@1.7.0-next.2
+  - @backstage/backend-plugin-api@0.6.3-next.2
+  - @backstage/catalog-model@1.4.2-next.1
+  - @backstage/errors@1.2.1
+  - @backstage/types@1.1.0
+  - @backstage/plugin-scaffolder-common@1.4.1-next.1
+
+## @backstage/plugin-scaffolder-react@1.5.5-next.2
+
+### Patch Changes
+
+- 27fef07f9229: Updated dependency `use-immer` to `^0.9.0`.
+- Updated dependencies
+  - @backstage/core-components@0.13.5-next.2
+  - @backstage/core-plugin-api@1.6.0-next.2
+  - @backstage/plugin-catalog-react@1.8.4-next.2
+  - @backstage/catalog-model@1.4.2-next.1
+  - @backstage/catalog-client@1.4.4-next.1
+  - @backstage/errors@1.2.1
+  - @backstage/theme@0.4.1
+  - @backstage/types@1.1.0
+  - @backstage/version-bridge@1.0.4
+  - @backstage/plugin-scaffolder-common@1.4.1-next.1
+
+## @backstage/plugin-search@1.4.0-next.2
+
+### Patch Changes
+
+- 8cec7664e146: Removed `@types/node` dependency
+- Updated dependencies
+  - @backstage/core-components@0.13.5-next.2
+  - @backstage/core-plugin-api@1.6.0-next.2
+  - @backstage/config@1.1.0-next.1
+  - @backstage/plugin-catalog-react@1.8.4-next.2
+  - @backstage/plugin-search-react@1.7.0-next.2
+  - @backstage/catalog-model@1.4.2-next.1
+  - @backstage/errors@1.2.1
+  - @backstage/theme@0.4.1
+  - @backstage/types@1.1.0
+  - @backstage/version-bridge@1.0.4
+  - @backstage/plugin-search-common@1.2.6-next.1
+
+## @backstage/plugin-search-backend@1.4.3-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config@1.1.0-next.1
+  - @backstage/backend-common@0.19.5-next.2
+  - @backstage/plugin-auth-node@0.3.0-next.2
+  - @backstage/plugin-permission-node@0.7.14-next.2
+  - @backstage/backend-plugin-api@0.6.3-next.2
+  - @backstage/plugin-permission-common@0.7.8-next.1
+  - @backstage/plugin-search-backend-node@1.2.7-next.2
+  - @backstage/backend-openapi-utils@0.0.3
+  - @backstage/errors@1.2.1
+  - @backstage/types@1.1.0
+  - @backstage/plugin-search-common@1.2.6-next.1
+
+## @backstage/plugin-search-backend-module-catalog@0.1.7-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config@1.1.0-next.1
+  - @backstage/backend-tasks@0.5.8-next.2
+  - @backstage/backend-common@0.19.5-next.2
+  - @backstage/plugin-catalog-node@1.4.4-next.2
+  - @backstage/backend-plugin-api@0.6.3-next.2
+  - @backstage/catalog-model@1.4.2-next.1
+  - @backstage/plugin-permission-common@0.7.8-next.1
+  - @backstage/plugin-search-backend-node@1.2.7-next.2
+  - @backstage/catalog-client@1.4.4-next.1
+  - @backstage/errors@1.2.1
+  - @backstage/plugin-catalog-common@1.0.16-next.1
+  - @backstage/plugin-search-common@1.2.6-next.1
+
+## @backstage/plugin-search-backend-module-elasticsearch@1.3.6-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config@1.1.0-next.1
+  - @backstage/backend-common@0.19.5-next.2
+  - @backstage/integration-aws-node@0.1.6-next.1
+  - @backstage/backend-plugin-api@0.6.3-next.2
+  - @backstage/plugin-search-backend-node@1.2.7-next.2
+  - @backstage/plugin-search-common@1.2.6-next.1
+
+## @backstage/plugin-search-backend-module-explore@0.1.7-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config@1.1.0-next.1
+  - @backstage/backend-tasks@0.5.8-next.2
+  - @backstage/backend-common@0.19.5-next.2
+  - @backstage/backend-plugin-api@0.6.3-next.2
+  - @backstage/plugin-search-backend-node@1.2.7-next.2
+  - @backstage/plugin-explore-common@0.0.1
+  - @backstage/plugin-search-common@1.2.6-next.1
+
+## @backstage/plugin-search-backend-module-pg@0.5.12-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config@1.1.0-next.1
+  - @backstage/backend-common@0.19.5-next.2
+  - @backstage/backend-plugin-api@0.6.3-next.2
+  - @backstage/plugin-search-backend-node@1.2.7-next.2
+  - @backstage/plugin-search-common@1.2.6-next.1
+
+## @backstage/plugin-search-backend-module-techdocs@0.1.7-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config@1.1.0-next.1
+  - @backstage/backend-tasks@0.5.8-next.2
+  - @backstage/backend-common@0.19.5-next.2
+  - @backstage/plugin-catalog-node@1.4.4-next.2
+  - @backstage/backend-plugin-api@0.6.3-next.2
+  - @backstage/catalog-model@1.4.2-next.1
+  - @backstage/plugin-permission-common@0.7.8-next.1
+  - @backstage/plugin-search-backend-node@1.2.7-next.2
+  - @backstage/plugin-techdocs-node@1.8.0-next.2
+  - @backstage/catalog-client@1.4.4-next.1
+  - @backstage/plugin-catalog-common@1.0.16-next.1
+  - @backstage/plugin-search-common@1.2.6-next.1
+
+## @backstage/plugin-search-backend-node@1.2.7-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config@1.1.0-next.1
+  - @backstage/backend-tasks@0.5.8-next.2
+  - @backstage/backend-common@0.19.5-next.2
+  - @backstage/backend-plugin-api@0.6.3-next.2
+  - @backstage/plugin-permission-common@0.7.8-next.1
+  - @backstage/errors@1.2.1
+  - @backstage/plugin-search-common@1.2.6-next.1
+
+## @backstage/plugin-search-common@1.2.6-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-permission-common@0.7.8-next.1
+  - @backstage/types@1.1.0
+
+## @backstage/plugin-search-react@1.7.0-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.13.5-next.2
+  - @backstage/core-plugin-api@1.6.0-next.2
+  - @backstage/theme@0.4.1
+  - @backstage/types@1.1.0
+  - @backstage/version-bridge@1.0.4
+  - @backstage/plugin-search-common@1.2.6-next.1
+
+## @backstage/plugin-sentry@0.5.9-next.2
+
+### Patch Changes
+
+- 8cec7664e146: Removed `@types/node` dependency
+- Updated dependencies
+  - @backstage/core-components@0.13.5-next.2
+  - @backstage/core-plugin-api@1.6.0-next.2
+  - @backstage/plugin-catalog-react@1.8.4-next.2
+  - @backstage/catalog-model@1.4.2-next.1
+  - @backstage/theme@0.4.1
+
+## @backstage/plugin-shortcuts@0.3.14-next.2
+
+### Patch Changes
+
+- 8cec7664e146: Removed `@types/node` dependency
+- Updated dependencies
+  - @backstage/core-components@0.13.5-next.2
+  - @backstage/core-plugin-api@1.6.0-next.2
+  - @backstage/theme@0.4.1
+  - @backstage/types@1.1.0
+
+## @backstage/plugin-sonarqube@0.7.5-next.2
+
+### Patch Changes
+
+- 8cec7664e146: Removed `@types/node` dependency
+- db92d1244897: Updated dependency `rc-progress` to `3.5.1`.
+- Updated dependencies
+  - @backstage/core-components@0.13.5-next.2
+  - @backstage/core-plugin-api@1.6.0-next.2
+  - @backstage/plugin-catalog-react@1.8.4-next.2
+  - @backstage/plugin-sonarqube-react@0.1.8-next.2
+  - @backstage/catalog-model@1.4.2-next.1
+  - @backstage/theme@0.4.1
+
+## @backstage/plugin-sonarqube-backend@0.2.5-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config@1.1.0-next.1
+  - @backstage/backend-common@0.19.5-next.2
+  - @backstage/errors@1.2.1
+
+## @backstage/plugin-sonarqube-react@0.1.8-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-plugin-api@1.6.0-next.2
+  - @backstage/catalog-model@1.4.2-next.1
+
+## @backstage/plugin-splunk-on-call@0.4.13-next.2
+
+### Patch Changes
+
+- 8cec7664e146: Removed `@types/node` dependency
+- Updated dependencies
+  - @backstage/core-components@0.13.5-next.2
+  - @backstage/core-plugin-api@1.6.0-next.2
+  - @backstage/plugin-catalog-react@1.8.4-next.2
+  - @backstage/catalog-model@1.4.2-next.1
+  - @backstage/theme@0.4.1
+
+## @backstage/plugin-stack-overflow@0.1.20-next.2
+
+### Patch Changes
+
+- 8cec7664e146: Removed `@types/node` dependency
+- Updated dependencies
+  - @backstage/core-components@0.13.5-next.2
+  - @backstage/core-plugin-api@1.6.0-next.2
+  - @backstage/plugin-home-react@0.1.3-next.2
+  - @backstage/config@1.1.0-next.1
+  - @backstage/plugin-search-react@1.7.0-next.2
+  - @backstage/theme@0.4.1
+  - @backstage/plugin-search-common@1.2.6-next.1
+
+## @backstage/plugin-stack-overflow-backend@0.2.7-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config@1.1.0-next.1
+  - @backstage/backend-common@0.19.5-next.2
+  - @backstage/plugin-search-common@1.2.6-next.1
+
+## @backstage/plugin-stackstorm@0.1.6-next.2
+
+### Patch Changes
+
+- 8cec7664e146: Removed `@types/node` dependency
+- Updated dependencies
+  - @backstage/core-components@0.13.5-next.2
+  - @backstage/core-plugin-api@1.6.0-next.2
+  - @backstage/errors@1.2.1
+  - @backstage/theme@0.4.1
+
+## @backstage/plugin-tech-insights@0.3.16-next.2
+
+### Patch Changes
+
+- 8cec7664e146: Removed `@types/node` dependency
+- Updated dependencies
+  - @backstage/core-components@0.13.5-next.2
+  - @backstage/core-plugin-api@1.6.0-next.2
+  - @backstage/plugin-catalog-react@1.8.4-next.2
+  - @backstage/catalog-model@1.4.2-next.1
+  - @backstage/errors@1.2.1
+  - @backstage/theme@0.4.1
+  - @backstage/types@1.1.0
+  - @backstage/plugin-tech-insights-common@0.2.11
+
+## @backstage/plugin-tech-insights-backend@0.5.17-next.2
+
+### Patch Changes
+
+- 814feeed7343: Update to handle invalid luxon values
+- Updated dependencies
+  - @backstage/config@1.1.0-next.1
+  - @backstage/backend-tasks@0.5.8-next.2
+  - @backstage/backend-common@0.19.5-next.2
+  - @backstage/catalog-model@1.4.2-next.1
+  - @backstage/plugin-tech-insights-node@0.4.9-next.2
+  - @backstage/catalog-client@1.4.4-next.1
+  - @backstage/errors@1.2.1
+  - @backstage/types@1.1.0
+  - @backstage/plugin-tech-insights-common@0.2.11
+
+## @backstage/plugin-tech-insights-backend-module-jsonfc@0.1.35-next.2
+
+### Patch Changes
+
+- 51b801f743b2: Handle extracting facts from 'not' conditions too
+- Updated dependencies
+  - @backstage/config@1.1.0-next.1
+  - @backstage/backend-common@0.19.5-next.2
+  - @backstage/plugin-tech-insights-node@0.4.9-next.2
+  - @backstage/errors@1.2.1
+  - @backstage/plugin-tech-insights-common@0.2.11
+
+## @backstage/plugin-tech-insights-node@0.4.9-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config@1.1.0-next.1
+  - @backstage/backend-tasks@0.5.8-next.2
+  - @backstage/backend-common@0.19.5-next.2
+  - @backstage/types@1.1.0
+  - @backstage/plugin-tech-insights-common@0.2.11
+
+## @backstage/plugin-tech-radar@0.6.8-next.2
+
+### Patch Changes
+
+- b45d0ac68191: Add names to blip entry links in the radar to improve accessibility
+- 6d35e9ea2afa: Add description property for Rings which will be shown in the footer.
+- 8cec7664e146: Removed `@types/node` dependency
+- Updated dependencies
+  - @backstage/core-components@0.13.5-next.2
+  - @backstage/core-plugin-api@1.6.0-next.2
+  - @backstage/theme@0.4.1
+
+## @backstage/plugin-techdocs-addons-test-utils@1.0.21-next.2
+
+### Patch Changes
+
+- 8cec7664e146: Removed `@types/node` dependency
+- Updated dependencies
+  - @backstage/plugin-techdocs@1.7.0-next.2
+  - @backstage/plugin-catalog@1.13.0-next.2
+  - @backstage/integration-react@1.1.19-next.2
+  - @backstage/core-components@0.13.5-next.2
+  - @backstage/core-plugin-api@1.6.0-next.2
+  - @backstage/core-app-api@1.10.0-next.2
+  - @backstage/test-utils@1.4.3-next.2
+  - @backstage/plugin-search-react@1.7.0-next.2
+  - @backstage/plugin-techdocs-react@1.1.10-next.2
+  - @backstage/theme@0.4.1
+
+## @backstage/plugin-techdocs-backend@1.7.0-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config@1.1.0-next.1
+  - @backstage/backend-common@0.19.5-next.2
+  - @backstage/plugin-search-backend-module-techdocs@0.1.7-next.2
+  - @backstage/integration@1.7.0-next.2
+  - @backstage/backend-plugin-api@0.6.3-next.2
+  - @backstage/catalog-model@1.4.2-next.1
+  - @backstage/plugin-permission-common@0.7.8-next.1
+  - @backstage/plugin-techdocs-node@1.8.0-next.2
+  - @backstage/catalog-client@1.4.4-next.1
+  - @backstage/errors@1.2.1
+  - @backstage/plugin-catalog-common@1.0.16-next.1
+  - @backstage/plugin-search-common@1.2.6-next.1
+
+## @backstage/plugin-techdocs-module-addons-contrib@1.1.0-next.2
+
+### Patch Changes
+
+- 8cec7664e146: Removed `@types/node` dependency
+- Updated dependencies
+  - @backstage/integration-react@1.1.19-next.2
+  - @backstage/core-components@0.13.5-next.2
+  - @backstage/core-plugin-api@1.6.0-next.2
+  - @backstage/plugin-techdocs-react@1.1.10-next.2
+  - @backstage/integration@1.7.0-next.2
+  - @backstage/theme@0.4.1
+
+## @backstage/plugin-techdocs-node@1.8.0-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config@1.1.0-next.1
+  - @backstage/backend-common@0.19.5-next.2
+  - @backstage/integration@1.7.0-next.2
+  - @backstage/integration-aws-node@0.1.6-next.1
+  - @backstage/catalog-model@1.4.2-next.1
+  - @backstage/errors@1.2.1
+  - @backstage/plugin-search-common@1.2.6-next.1
+
+## @backstage/plugin-techdocs-react@1.1.10-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.13.5-next.2
+  - @backstage/core-plugin-api@1.6.0-next.2
+  - @backstage/config@1.1.0-next.1
+  - @backstage/catalog-model@1.4.2-next.1
+  - @backstage/version-bridge@1.0.4
+
+## @backstage/plugin-todo@0.2.26-next.2
+
+### Patch Changes
+
+- 8cec7664e146: Removed `@types/node` dependency
+- Updated dependencies
+  - @backstage/core-components@0.13.5-next.2
+  - @backstage/core-plugin-api@1.6.0-next.2
+  - @backstage/plugin-catalog-react@1.8.4-next.2
+  - @backstage/catalog-model@1.4.2-next.1
+  - @backstage/errors@1.2.1
+  - @backstage/theme@0.4.1
+
+## @backstage/plugin-todo-backend@0.2.3-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config@1.1.0-next.1
+  - @backstage/backend-common@0.19.5-next.2
+  - @backstage/plugin-catalog-node@1.4.4-next.2
+  - @backstage/integration@1.7.0-next.2
+  - @backstage/backend-plugin-api@0.6.3-next.2
+  - @backstage/catalog-model@1.4.2-next.1
+  - @backstage/backend-openapi-utils@0.0.3
+  - @backstage/catalog-client@1.4.4-next.1
+  - @backstage/errors@1.2.1
+
+## @backstage/plugin-user-settings@0.7.9-next.2
+
+### Patch Changes
+
+- e03f3ee2be94: changed auto theme tooltip title to camel case
+- 8cec7664e146: Removed `@types/node` dependency
+- 6e30769cc627: Introduced experimental support for internationalization.
+- Updated dependencies
+  - @backstage/core-components@0.13.5-next.2
+  - @backstage/core-plugin-api@1.6.0-next.2
+  - @backstage/core-app-api@1.10.0-next.2
+  - @backstage/plugin-catalog-react@1.8.4-next.2
+  - @backstage/errors@1.2.1
+  - @backstage/theme@0.4.1
+  - @backstage/types@1.1.0
+
+## @backstage/plugin-user-settings-backend@0.1.15-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.19.5-next.2
+  - @backstage/plugin-auth-node@0.3.0-next.2
+  - @backstage/backend-plugin-api@0.6.3-next.2
+  - @backstage/catalog-model@1.4.2-next.1
+  - @backstage/errors@1.2.1
+  - @backstage/types@1.1.0
+
+## @backstage/plugin-vault@0.1.18-next.2
+
+### Patch Changes
+
+- 8cec7664e146: Removed `@types/node` dependency
+- Updated dependencies
+  - @backstage/core-components@0.13.5-next.2
+  - @backstage/core-plugin-api@1.6.0-next.2
+  - @backstage/plugin-catalog-react@1.8.4-next.2
+  - @backstage/catalog-model@1.4.2-next.1
+  - @backstage/errors@1.2.1
+  - @backstage/theme@0.4.1
+
+## @backstage/plugin-vault-backend@0.3.7-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config@1.1.0-next.1
+  - @backstage/backend-tasks@0.5.8-next.2
+  - @backstage/backend-common@0.19.5-next.2
+  - @backstage/errors@1.2.1
+
+## @backstage/plugin-xcmetrics@0.2.42-next.2
+
+### Patch Changes
+
+- 8cec7664e146: Removed `@types/node` dependency
+- 814feeed7343: Update to handle invalid luxon values
+- Updated dependencies
+  - @backstage/core-components@0.13.5-next.2
+  - @backstage/core-plugin-api@1.6.0-next.2
+  - @backstage/errors@1.2.1
+  - @backstage/theme@0.4.1
+
+## example-app@0.2.87-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-playlist@0.1.16-next.2
+  - @backstage/plugin-tech-radar@0.6.8-next.2
+  - @backstage/plugin-user-settings@0.7.9-next.2
+  - @backstage/plugin-org@0.6.14-next.2
+  - @backstage/plugin-techdocs@1.7.0-next.2
+  - @backstage/plugin-techdocs-module-addons-contrib@1.1.0-next.2
+  - @backstage/plugin-catalog-unprocessed-entities@0.1.3-next.2
+  - @backstage/integration-react@1.1.19-next.2
+  - @backstage/plugin-microsoft-calendar@0.1.7-next.2
+  - @backstage/core-components@0.13.5-next.2
+  - @backstage/core-plugin-api@1.6.0-next.2
+  - @backstage/plugin-entity-feedback@0.2.7-next.2
+  - @backstage/plugin-apache-airflow@0.2.15-next.2
+  - @backstage/plugin-github-actions@0.6.5-next.2
+  - @backstage/plugin-octopus-deploy@0.2.6-next.2
+  - @backstage/plugin-stack-overflow@0.1.20-next.2
+  - @backstage/app-defaults@1.4.3-next.2
+  - @backstage/core-app-api@1.10.0-next.2
+  - @backstage/plugin-code-coverage@0.2.17-next.2
+  - @backstage/plugin-cost-insights@0.12.13-next.2
+  - @backstage/plugin-tech-insights@0.3.16-next.2
+  - @backstage/plugin-azure-devops@0.3.6-next.2
+  - @backstage/plugin-gcp-projects@0.3.41-next.2
+  - @backstage/plugin-azure-sites@0.1.13-next.2
+  - @backstage/plugin-cloudbuild@0.3.24-next.2
+  - @backstage/plugin-kubernetes@0.10.3-next.2
+  - @backstage/plugin-lighthouse@0.4.9-next.2
+  - @backstage/plugin-scaffolder@1.14.5-next.2
+  - @backstage/plugin-stackstorm@0.1.6-next.2
+  - @backstage/plugin-dynatrace@7.0.4-next.2
+  - @backstage/plugin-gcalendar@0.3.18-next.2
+  - @backstage/plugin-pagerduty@0.6.5-next.2
+  - @backstage/plugin-shortcuts@0.3.14-next.2
+  - @backstage/plugin-airbrake@0.3.24-next.2
+  - @backstage/plugin-api-docs@0.9.11-next.2
+  - @backstage/plugin-circleci@0.3.24-next.2
+  - @backstage/plugin-devtools@0.1.4-next.2
+  - @backstage/plugin-graphiql@0.2.54-next.2
+  - @backstage/plugin-linguist@0.1.9-next.2
+  - @backstage/plugin-newrelic@0.3.40-next.2
+  - @backstage/plugin-puppetdb@0.1.7-next.2
+  - @backstage/config@1.1.0-next.1
+  - @backstage/plugin-explore@0.4.10-next.2
+  - @backstage/plugin-jenkins@0.8.6-next.2
+  - @backstage/plugin-rollbar@0.4.24-next.2
+  - @backstage/plugin-badges@0.2.48-next.2
+  - @backstage/plugin-search@1.4.0-next.2
+  - @backstage/plugin-sentry@0.5.9-next.2
+  - @backstage/plugin-kafka@0.3.24-next.2
+  - @backstage/plugin-nomad@0.1.5-next.2
+  - @backstage/cli@0.22.13-next.2
+  - @backstage/plugin-gocd@0.1.30-next.2
+  - @backstage/plugin-home@0.5.8-next.2
+  - @backstage/plugin-todo@0.2.26-next.2
+  - @backstage/plugin-adr@0.6.7-next.2
+  - @backstage/plugin-scaffolder-react@1.5.5-next.2
+  - @internal/plugin-catalog-customized@0.0.14-next.2
+  - @backstage/plugin-catalog-graph@0.2.36-next.2
+  - @backstage/plugin-catalog-import@0.9.14-next.2
+  - @backstage/plugin-catalog-react@1.8.4-next.2
+  - @backstage/plugin-newrelic-dashboard@0.2.17-next.2
+  - @backstage/plugin-search-react@1.7.0-next.2
+  - @backstage/plugin-techdocs-react@1.1.10-next.2
+  - @backstage/plugin-permission-react@0.4.15-next.2
+  - @backstage/catalog-model@1.4.2-next.1
+  - @backstage/theme@0.4.1
+  - @backstage/plugin-catalog-common@1.0.16-next.1
+  - @backstage/plugin-linguist-common@0.1.1
+  - @backstage/plugin-search-common@1.2.6-next.1
+
+## example-app-next@0.0.1-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-playlist@0.1.16-next.2
+  - @backstage/plugin-tech-radar@0.6.8-next.2
+  - @backstage/plugin-user-settings@0.7.9-next.2
+  - @backstage/plugin-org@0.6.14-next.2
+  - @backstage/plugin-techdocs@1.7.0-next.2
+  - @backstage/plugin-techdocs-module-addons-contrib@1.1.0-next.2
+  - @backstage/plugin-catalog-unprocessed-entities@0.1.3-next.2
+  - @backstage/integration-react@1.1.19-next.2
+  - @backstage/plugin-microsoft-calendar@0.1.7-next.2
+  - @backstage/core-components@0.13.5-next.2
+  - @backstage/core-plugin-api@1.6.0-next.2
+  - @backstage/plugin-entity-feedback@0.2.7-next.2
+  - @backstage/plugin-apache-airflow@0.2.15-next.2
+  - @backstage/plugin-github-actions@0.6.5-next.2
+  - @backstage/plugin-octopus-deploy@0.2.6-next.2
+  - @backstage/plugin-stack-overflow@0.1.20-next.2
+  - @backstage/app-defaults@1.4.3-next.2
+  - @backstage/core-app-api@1.10.0-next.2
+  - @backstage/plugin-code-coverage@0.2.17-next.2
+  - @backstage/plugin-cost-insights@0.12.13-next.2
+  - @backstage/plugin-tech-insights@0.3.16-next.2
+  - @backstage/plugin-azure-devops@0.3.6-next.2
+  - @backstage/plugin-gcp-projects@0.3.41-next.2
+  - @backstage/plugin-azure-sites@0.1.13-next.2
+  - @backstage/plugin-cloudbuild@0.3.24-next.2
+  - @backstage/plugin-kubernetes@0.10.3-next.2
+  - @backstage/plugin-lighthouse@0.4.9-next.2
+  - @backstage/plugin-scaffolder@1.14.5-next.2
+  - @backstage/plugin-stackstorm@0.1.6-next.2
+  - @backstage/plugin-dynatrace@7.0.4-next.2
+  - @backstage/plugin-gcalendar@0.3.18-next.2
+  - @backstage/plugin-pagerduty@0.6.5-next.2
+  - @backstage/plugin-shortcuts@0.3.14-next.2
+  - @backstage/plugin-airbrake@0.3.24-next.2
+  - @backstage/plugin-api-docs@0.9.11-next.2
+  - @backstage/plugin-circleci@0.3.24-next.2
+  - @backstage/plugin-devtools@0.1.4-next.2
+  - @backstage/plugin-graphiql@0.2.54-next.2
+  - @backstage/plugin-linguist@0.1.9-next.2
+  - @backstage/plugin-newrelic@0.3.40-next.2
+  - @backstage/plugin-puppetdb@0.1.7-next.2
+  - @backstage/config@1.1.0-next.1
+  - @backstage/plugin-explore@0.4.10-next.2
+  - @backstage/plugin-jenkins@0.8.6-next.2
+  - @backstage/plugin-rollbar@0.4.24-next.2
+  - @backstage/plugin-badges@0.2.48-next.2
+  - @backstage/plugin-search@1.4.0-next.2
+  - @backstage/plugin-sentry@0.5.9-next.2
+  - @backstage/plugin-kafka@0.3.24-next.2
+  - @backstage/cli@0.22.13-next.2
+  - @backstage/plugin-gocd@0.1.30-next.2
+  - @backstage/plugin-home@0.5.8-next.2
+  - @backstage/plugin-todo@0.2.26-next.2
+  - @backstage/plugin-adr@0.6.7-next.2
+  - @backstage/plugin-scaffolder-react@1.5.5-next.2
+  - @internal/plugin-catalog-customized@0.0.14-next.2
+  - @backstage/plugin-catalog-graph@0.2.36-next.2
+  - @backstage/plugin-catalog-import@0.9.14-next.2
+  - @backstage/plugin-catalog-react@1.8.4-next.2
+  - @backstage/plugin-newrelic-dashboard@0.2.17-next.2
+  - @backstage/plugin-search-react@1.7.0-next.2
+  - @backstage/plugin-techdocs-react@1.1.10-next.2
+  - @backstage/frontend-app-api@0.0.1-next.1
+  - @backstage/frontend-plugin-api@0.0.1-next.0
+  - @backstage/plugin-permission-react@0.4.15-next.2
+  - @backstage/catalog-model@1.4.2-next.1
+  - @backstage/theme@0.4.1
+  - @backstage/plugin-catalog-common@1.0.16-next.1
+  - @backstage/plugin-linguist-common@0.1.1
+  - @backstage/plugin-search-common@1.2.6-next.1
+
+## example-backend@0.2.87-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-scaffolder-backend@1.16.6-next.2
+  - @backstage/plugin-code-coverage-backend@0.2.17-next.2
+  - @backstage/plugin-permission-backend@0.5.26-next.2
+  - @backstage/plugin-catalog-backend@1.13.0-next.2
+  - @backstage/plugin-badges-backend@0.2.6-next.2
+  - @backstage/config@1.1.0-next.1
+  - @backstage/plugin-tech-insights-backend-module-jsonfc@0.1.35-next.2
+  - @backstage/plugin-tech-insights-backend@0.5.17-next.2
+  - @backstage/backend-tasks@0.5.8-next.2
+  - example-app@0.2.87-next.2
+  - @backstage/backend-common@0.19.5-next.2
+  - @backstage/plugin-app-backend@0.3.51-next.2
+  - @backstage/plugin-auth-backend@0.18.9-next.2
+  - @backstage/plugin-auth-node@0.3.0-next.2
+  - @backstage/plugin-catalog-node@1.4.4-next.2
+  - @backstage/plugin-entity-feedback-backend@0.1.9-next.2
+  - @backstage/plugin-events-backend@0.2.12-next.2
+  - @backstage/plugin-kubernetes-backend@0.11.6-next.2
+  - @backstage/plugin-linguist-backend@0.4.3-next.2
+  - @backstage/plugin-permission-node@0.7.14-next.2
+  - @backstage/plugin-playlist-backend@0.3.7-next.2
+  - @backstage/plugin-proxy-backend@0.3.3-next.2
+  - @backstage/plugin-rollbar-backend@0.1.48-next.2
+  - @backstage/plugin-scaffolder-backend-module-confluence-to-markdown@0.2.4-next.2
+  - @backstage/plugin-search-backend@1.4.3-next.2
+  - @backstage/plugin-search-backend-module-catalog@0.1.7-next.2
+  - @backstage/plugin-search-backend-module-explore@0.1.7-next.2
+  - @backstage/plugin-search-backend-module-pg@0.5.12-next.2
+  - @backstage/plugin-search-backend-module-techdocs@0.1.7-next.2
+  - @backstage/plugin-techdocs-backend@1.7.0-next.2
+  - @backstage/integration@1.7.0-next.2
+  - @backstage/plugin-devtools-backend@0.1.6-next.2
+  - @backstage/catalog-model@1.4.2-next.1
+  - @backstage/plugin-adr-backend@0.3.9-next.2
+  - @backstage/plugin-azure-devops-backend@0.3.30-next.2
+  - @backstage/plugin-azure-sites-backend@0.1.13-next.2
+  - @backstage/plugin-explore-backend@0.0.13-next.2
+  - @backstage/plugin-graphql-backend@0.1.41-next.2
+  - @backstage/plugin-jenkins-backend@0.2.6-next.2
+  - @backstage/plugin-kafka-backend@0.2.44-next.2
+  - @backstage/plugin-lighthouse-backend@0.2.7-next.2
+  - @backstage/plugin-nomad-backend@0.1.5-next.2
+  - @backstage/plugin-permission-common@0.7.8-next.1
+  - @backstage/plugin-scaffolder-backend-module-rails@0.4.20-next.2
+  - @backstage/plugin-search-backend-module-elasticsearch@1.3.6-next.2
+  - @backstage/plugin-search-backend-node@1.2.7-next.2
+  - @backstage/plugin-tech-insights-node@0.4.9-next.2
+  - @backstage/plugin-todo-backend@0.2.3-next.2
+  - @backstage/catalog-client@1.4.4-next.1
+  - @backstage/plugin-catalog-backend-module-unprocessed@0.2.3-next.2
+  - @backstage/plugin-events-node@0.2.12-next.2
+  - @backstage/plugin-search-common@1.2.6-next.1
+
+## example-backend-next@0.0.15-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-scaffolder-backend@1.16.6-next.2
+  - @backstage/plugin-permission-backend@0.5.26-next.2
+  - @backstage/plugin-catalog-backend@1.13.0-next.2
+  - @backstage/plugin-badges-backend@0.2.6-next.2
+  - @backstage/plugin-permission-backend-module-allow-all-policy@0.1.0-next.0
+  - @backstage/backend-tasks@0.5.8-next.2
+  - @backstage/backend-defaults@0.2.3-next.2
+  - @backstage/plugin-app-backend@0.3.51-next.2
+  - @backstage/plugin-auth-node@0.3.0-next.2
+  - @backstage/plugin-entity-feedback-backend@0.1.9-next.2
+  - @backstage/plugin-kubernetes-backend@0.11.6-next.2
+  - @backstage/plugin-linguist-backend@0.4.3-next.2
+  - @backstage/plugin-permission-node@0.7.14-next.2
+  - @backstage/plugin-proxy-backend@0.3.3-next.2
+  - @backstage/plugin-search-backend@1.4.3-next.2
+  - @backstage/plugin-search-backend-module-catalog@0.1.7-next.2
+  - @backstage/plugin-search-backend-module-explore@0.1.7-next.2
+  - @backstage/plugin-search-backend-module-techdocs@0.1.7-next.2
+  - @backstage/plugin-techdocs-backend@1.7.0-next.2
+  - @backstage/plugin-devtools-backend@0.1.6-next.2
+  - @backstage/backend-plugin-api@0.6.3-next.2
+  - @backstage/plugin-adr-backend@0.3.9-next.2
+  - @backstage/plugin-azure-devops-backend@0.3.30-next.2
+  - @backstage/plugin-lighthouse-backend@0.2.7-next.2
+  - @backstage/plugin-permission-common@0.7.8-next.1
+  - @backstage/plugin-search-backend-node@1.2.7-next.2
+  - @backstage/plugin-todo-backend@0.2.3-next.2
+  - @backstage/plugin-catalog-backend-module-unprocessed@0.2.3-next.2
+
+## @backstage/backend-plugin-manager@0.0.1-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-backend@1.13.0-next.2
+  - @backstage/config@1.1.0-next.1
+  - @backstage/backend-tasks@0.5.8-next.2
+  - @backstage/backend-common@0.19.5-next.2
+  - @backstage/plugin-auth-node@0.3.0-next.2
+  - @backstage/plugin-events-backend@0.2.12-next.2
+  - @backstage/plugin-permission-node@0.7.14-next.2
+  - @backstage/backend-plugin-api@0.6.3-next.2
+  - @backstage/plugin-permission-common@0.7.8-next.1
+  - @backstage/plugin-scaffolder-node@0.2.3-next.2
+  - @backstage/plugin-search-backend-node@1.2.7-next.2
+  - @backstage/cli-common@0.1.12
+  - @backstage/cli-node@0.1.3
+  - @backstage/errors@1.2.1
+  - @backstage/types@1.1.0
+  - @backstage/plugin-events-node@0.2.12-next.2
+  - @backstage/plugin-search-common@1.2.6-next.1
+
+## e2e-test@0.2.7-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/create-app@0.5.5-next.2
+  - @backstage/cli-common@0.1.12
+  - @backstage/errors@1.2.1
+
+## @backstage/frontend-app-api@0.0.1-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-plugin-api@1.6.0-next.2
+  - @backstage/plugin-graphiql@0.2.54-next.2
+  - @backstage/config@1.1.0-next.1
+  - @backstage/frontend-plugin-api@0.0.1-next.0
+  - @backstage/types@1.1.0
+
+## @backstage/frontend-plugin-api@0.0.1-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-plugin-api@1.6.0-next.2
+  - @backstage/types@1.1.0
+
+## techdocs-cli-embedded-app@0.2.86-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-techdocs@1.7.0-next.2
+  - @backstage/plugin-catalog@1.13.0-next.2
+  - @backstage/integration-react@1.1.19-next.2
+  - @backstage/core-components@0.13.5-next.2
+  - @backstage/core-plugin-api@1.6.0-next.2
+  - @backstage/app-defaults@1.4.3-next.2
+  - @backstage/core-app-api@1.10.0-next.2
+  - @backstage/test-utils@1.4.3-next.2
+  - @backstage/config@1.1.0-next.1
+  - @backstage/cli@0.22.13-next.2
+  - @backstage/plugin-techdocs-react@1.1.10-next.2
+  - @backstage/catalog-model@1.4.2-next.1
+  - @backstage/theme@0.4.1
+
+## @internal/plugin-catalog-customized@0.0.14-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog@1.13.0-next.2
+  - @backstage/plugin-catalog-react@1.8.4-next.2
+
+## @internal/plugin-todo-list@1.0.17-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.13.5-next.2
+  - @backstage/core-plugin-api@1.6.0-next.2
+  - @backstage/theme@0.4.1
+
+## @internal/plugin-todo-list-backend@1.0.17-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config@1.1.0-next.1
+  - @backstage/backend-common@0.19.5-next.2
+  - @backstage/plugin-auth-node@0.3.0-next.2
+  - @backstage/backend-plugin-api@0.6.3-next.2
+  - @backstage/errors@1.2.1
+
+## @internal/plugin-todo-list-common@1.0.13-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-permission-common@0.7.8-next.1
diff --git a/lighthouserc.js b/lighthouserc.js
index 90a15abbd3..70136ee158 100644
--- a/lighthouserc.js
+++ b/lighthouserc.js
@@ -32,6 +32,17 @@ module.exports = {
         'http://localhost:3000/create/templates/default/react-ssr-template',
         /** Search */
         'http://localhost:3000/search',
+        /** Miscellaneous */
+        'http://localhost:3000/settings',
+        /** plugin-devtools */
+        'http://localhost:3000/devtools',
+        'http://localhost:3000/devtools/config',
+        /** plugin-explore */
+        'http://localhost:3000/explore',
+        'http://localhost:3000/explore/groups',
+        'http://localhost:3000/explore/tools',
+        /** plugin-tech-radar */
+        'http://localhost:3000/tech-radar',
       ],
       settings: {
         onlyCategories: ['accessibility'],
diff --git a/microsite/blog/2023-08-17-expedia-proof-of-value-metrics-2.mdx b/microsite/blog/2023-08-17-expedia-proof-of-value-metrics-2.mdx
new file mode 100644
index 0000000000..9c6e67fcf1
--- /dev/null
+++ b/microsite/blog/2023-08-17-expedia-proof-of-value-metrics-2.mdx
@@ -0,0 +1,206 @@
+---
+# prettier-ignore
+title: "Expedia Group shares Backstage proof of value metrics 2.0"
+author: Guillermo Manzo, Expedia Group
+authorURL: https://www.linkedin.com/in/guillermomanzo
+---
+
+![backstage header](assets/2023-08-17/header.png)
+
+_Editor's Note: In this post, Expedia Group provides a follow-up to their initial Q4 2021 [post on how they measure Backstage proof of value](https://backstage.spotify.com/blog/measuring-backstage-proof-of-value-at-expedia/).
+We're grateful to the Expedia Group team for sharing their processes, revised proof of value metrics, and adaptations to their approach over time in hopes of providing a successful framework for the rest of the Backstage community._
+
+[Expedia Group's](https://expediagroup.com) mission is to power global travel for everyone, everywhere.
+This vision is made possible through Expedia Group's massive platform, which connects 168 million loyalty members, 50 thousand B2B partners, 3 million properties and 500 airlines, car rentals and cruise lines across the globe. In short, the scale of our platform is enormous, which means that we need to scale our engineering capabilities as well so we can continue to provide seamless experiences to our travelers and partners.
+
+{/* truncate */}
+
+In August 2020, we adopted Backstage to enhance our foundational platform capabilities and reduce developer friction in the process. Its framework proved scalable for us and as EG's platform evolved, so did our application of Backstage. Since our [initial share about our Backstage deployment](https://backstage.spotify.com/blog/measuring-backstage-proof-of-value-at-expedia/), we've continued to follow our process of:
+
+- Syncing Expedia Group's internal Developer Journey phases by key DevOps processes and Software Delivery Life Cycle (SDLC) milestones (POC, Alpha, Beta, etc).
+- Identifying Developer Jobs to be Done (JTBD) by our Internal Developer Journey phases
+- Aligning developer JTBD's to proof of value (PoV) metrics.
+
+In the diagram below, you can see how we distilled these processes into Backstage PoV metrics.
+
+![backstage pov metrics](assets/2023-08-17/table.png)
+
+To ground ourselves in the evolving developer and Backstage landscape at Expedia Group, we constantly ask ourselves, "How can we continue to show the value of Backstage to our customers and the Developer Community?" To fully answer this question, we adapted our initial proof of value metrics to reinforce our alignment to the current landscape of the Expedia Group developer journey.
+
+## Expedia Group proof of value metrics 2.0
+
+We are excited to share our PoV metrics because it affirms our investment in Backstage for Expedia Group's Backstage users and provides a compelling metrics-based answer on why more organizations should consider adopting it.
+
+As our Backstage application matured, we updated our PoV metrics and aligned our 2023 roadmap to reflect these changes. Below, we highlight key wins from 2022 and outline our long-term vision for each metric.
+
+<table>
+  <thead>
+    <tr>
+      <th>PoV Metric</th>
+      <th>Description</th>
+      <th>2022 Key Win(s)</th>
+      <th>Long-Term Vision</th>
+    </tr>
+  </thead>
+  <tbody>
+    <tr>
+      <td>"Ship on Day One" / onboarding metrics</td>
+      <td>
+        <p>
+          A metric used to determine an engineer's readiness to develop at EG
+          during their onboarding process.
+        </p>
+        <p>
+          It measures the time from first commit to deploying code in
+          production, using a "Hello World Template"
+        </p>
+      </td>
+      <td>
+        <ul>
+          <li>
+            850+ engineers went through the “Ship on Day One” Bootcamp when
+            first joining Expedia Group
+          </li>
+          <li>
+            We had a success rate of ~95% of engineers completing bootcamp on
+            first try
+          </li>
+          <li>7,000+ components created or onboarded</li>
+          <li>4-min average per app creation/onboarding</li>
+        </ul>
+      </td>
+      <td>
+        <ul>
+          <li>
+            Develop full onboarding curriculum coverage for all critical
+            capabilities offered within EG - Example: performance and quality
+            management, pipeline management, etc.
+          </li>
+          <li>
+            Create an end-to-end guided tour of the EG Developer Journey w/
+            functional training
+          </li>
+        </ul>
+      </td>
+    </tr>
+    <tr>
+      <td>
+        Reduce context switching through integration with core EG capabilities
+      </td>
+      <td>
+        Through plugins, tool integration, reduces context-switching as
+        engineers will not need to toggle between multiple tools
+      </td>
+      <td>
+        <ul>
+          <li>
+            15%+ of internal developer tools are integrated within Backstage,
+            reducing the amount of context-switching needed
+          </li>
+          <li>
+            4000+ unique users using Backstage for ~20 min on average a day.
+          </li>
+        </ul>
+      </td>
+      <td>
+        <ul>
+          <li>
+            End-to-end integration with EG paved road tools and Backstage to
+            support increased developer productivity
+          </li>
+          <li>
+            Drive broader adoption to have all EG employees using Backstage to
+            manage their SDLC and to build internal UIs using plugins
+          </li>
+        </ul>
+      </td>
+    </tr>
+    <tr>
+      <td>Improve search results relevance</td>
+      <td>
+        Intuitive search capabilities to surface relevant Backstage content like
+        TechDocs, entities, tools, etc.
+      </td>
+      <td>
+        <ul>
+          <li>Enabled global search functionality throughout Backstage</li>
+          <li>
+            <p>Contributed to the open source Backstage Search platform</p>
+          </li>
+        </ul>
+      </td>
+      <td>
+        <ul>
+          <li>Engine optimization/ranking improvement</li>
+          <li>Visualize key search metrics to support improvements</li>
+          <li>Chat + AI integration with chat-based interfaces</li>
+        </ul>
+      </td>
+    </tr>
+    <tr>
+      <td>Technical documentation reach</td>
+      <td>
+        Number of developers leveraging TechDocs for all services within EG
+      </td>
+      <td>
+        <ul>
+          <li>500+ services tied with TechDocs</li>
+          <li>50,000+ average monthly TechDoc views</li>
+        </ul>
+      </td>
+      <td>
+        <ul>
+          <li>
+            All Backstage entities leveraging TechDocs to enable a centralized
+            documentation portal integrated with the Software Catalog
+          </li>
+          <li>
+            Quality/governance and gamification to support users and
+            contributors
+          </li>
+          <li>
+            More TechDocs and mkdocs add-ons to compliment the core capabilities
+            and drive usability of documentation on Backstage
+          </li>
+        </ul>
+      </td>
+    </tr>
+    <tr>
+      <td>Developer Experience community engagement</td>
+      <td>Enhance Backstage through community engagement</td>
+      <td>
+        <ul>
+          <li>
+            Diverse contributions to Backstage open source focused on search and
+            discovery - 10+
+          </li>
+          <li>Community engagement through internal case studies, and blogs</li>
+        </ul>
+      </td>
+      <td>
+        <ul>
+          <li>
+            Continuous contributions to open-source Backstage, focused on plugin
+            administration, driving documentation adoption, and improved UX
+            around core capabilities
+          </li>
+          <li>
+            Strategic community engagements to enhance the platform's usability
+            and long-term confidence in adopting Backstage
+          </li>
+          <li>
+            Event participation and storytelling around EG's Backstage journey
+          </li>
+        </ul>
+      </td>
+    </tr>
+  </tbody>
+</table>
+
+## YMMV: Your Metrics May Vary!
+
+Measuring the value of Backstage will vary depending on your organization's needs and priorities. As an early adopter of Backstage, we hope the Expedia Group PoV metrics provide a helpful framework for understanding how Backstage can be used to improve developer productivity, collaboration, and knowledge sharing.
+
+We look forward to sharing future updates with the community as we continue to embrace a continuous improvement approach to Backstage. If you missed it, you can read about where we started in our [initial proof of value metrics](https://backstage.spotify.com/blog/measuring-backstage-proof-of-value-at-expedia/) back in 2021.
+
+_Read more about Expedia's tech journey on [their Medium Blog](https://medium.com/expedia-group-tech)_
diff --git a/microsite/blog/assets/2023-08-17/header.png b/microsite/blog/assets/2023-08-17/header.png
new file mode 100644
index 0000000000..bd75529f72
Binary files /dev/null and b/microsite/blog/assets/2023-08-17/header.png differ
diff --git a/microsite/blog/assets/2023-08-17/table.png b/microsite/blog/assets/2023-08-17/table.png
new file mode 100644
index 0000000000..c832740634
Binary files /dev/null and b/microsite/blog/assets/2023-08-17/table.png differ
diff --git a/microsite/data/plugins/api-sdk-generator.yaml b/microsite/data/plugins/api-sdk-generator.yaml
new file mode 100644
index 0000000000..5553089807
--- /dev/null
+++ b/microsite/data/plugins/api-sdk-generator.yaml
@@ -0,0 +1,10 @@
+---
+title: API SDK Generator
+author: Konfig
+authorUrl: https://konfigthis.com/
+category: Development
+description: Generate SDKs for your REST API to accelerate integration
+documentation: https://github.com/konfig-dev/backstage-plugin-konfig/tree/main/plugins/backstage-plugin-konfig
+iconUrl: https://raw.githubusercontent.com/konfig-dev/backstage-plugin-konfig/main/plugins/backstage-plugin-konfig/docs/logo.png
+npmPackageName: 'backstage-plugin-konfig'
+addedDate: '2023-08-07'
diff --git a/microsite/data/plugins/artifactory.yaml b/microsite/data/plugins/artifactory.yaml
new file mode 100644
index 0000000000..119e09eb8e
--- /dev/null
+++ b/microsite/data/plugins/artifactory.yaml
@@ -0,0 +1,12 @@
+---
+title: Artifacts Plugin for JFrog Artifactory
+author: StageCentral
+authorUrl: https://stagecentral.io
+category: Artifacts
+description: |
+  Connect Backstage entities to software artifacts stored in JFrog Artifactory.
+  Display information about artifacts, such as their version, size, and download links.
+documentation: https://github.com/StageCentral/backstage-artifactory-plugin/tree/main#readme
+iconUrl: https://raw.githubusercontent.com/StageCentral/backstage-artifactory-plugin/main/logo/logo.png
+npmPackageName: '@stagecentral/plugin-artifactory'
+addedDate: '2023-08-23'
diff --git a/microsite/data/plugins/blockchain-radar.yaml b/microsite/data/plugins/blockchain-radar.yaml
new file mode 100644
index 0000000000..0aacd19ab6
--- /dev/null
+++ b/microsite/data/plugins/blockchain-radar.yaml
@@ -0,0 +1,15 @@
+---
+title: Blockchain Radar
+author: '@aurora-is-near'
+authorUrl: https://github.com/aurora-is-near
+category: Discovery
+description: Discover and manage contracts, multisigs and their access control policies on various blockchains.
+documentation: https://github.com/aurora-is-near/backstage-plugin-blockchainradar
+iconUrl: https://raw.githubusercontent.com/aurora-is-near/backstage-plugin-blockchainradar/main/docs/imgs/signs/sign-green.svg
+npmPackageName: '@aurora-is-near/backstage-plugin-blockchainradar-backend'
+tags:
+  - security
+  - monitoring
+  - blockchain
+  - alerting
+addedDate: '2023-08-31'
diff --git a/microsite/data/plugins/flux.yaml b/microsite/data/plugins/flux.yaml
new file mode 100644
index 0000000000..91156f7ed3
--- /dev/null
+++ b/microsite/data/plugins/flux.yaml
@@ -0,0 +1,10 @@
+---
+title: Flux Plugins
+author: Weaveworks
+authorUrl: https://weave.works
+category: GitOps
+description: View the status of fluxcd.io resources
+documentation: https://github.com/weaveworks/weaveworks-backstage/tree/main/plugins/backstage-plugin-flux#readme
+iconUrl: https://raw.githubusercontent.com/fluxcd/website/main/assets/icons/logo.svg
+npmPackageName: '@weaveworksoss/backstage-plugin-flux'
+addedDate: '2023-08-23'
diff --git a/microsite/data/plugins/jfrog-artifactory-libs.yaml b/microsite/data/plugins/jfrog-artifactory-libs.yaml
new file mode 100644
index 0000000000..22583cbfbd
--- /dev/null
+++ b/microsite/data/plugins/jfrog-artifactory-libs.yaml
@@ -0,0 +1,13 @@
+---
+title: JFrog Artifactory Libs plugin
+author: Vity
+authorUrl: https://github.com/Vity01
+category: Discovery
+description:
+  frontend plugin provides a simple way to display generated artifact (library) details like
+  - group, artifact, repository, what is the latest version, and it simply
+  allows to copy library definition for the package managers.
+documentation: https://github.com/Vity01/backstage-jfrog-artifactory-libs
+iconUrl: https://raw.githubusercontent.com/Vity01/backstage-jfrog-artifactory-libs/main/doc/artifactory.svg
+npmPackageName: 'backstage-plugin-jfrog-artifactory-libs'
+addedDate: '2023-08-14'
diff --git a/microsite/data/plugins/kiali.yaml b/microsite/data/plugins/kiali.yaml
new file mode 100644
index 0000000000..a85aa6444a
--- /dev/null
+++ b/microsite/data/plugins/kiali.yaml
@@ -0,0 +1,10 @@
+---
+title: Kiali Service Mesh
+author: Red Hat
+authorUrl: https://redhat.com
+category: Istio
+description: Configure, visualize, validate and troubleshoot your mesh with Istio
+documentation: https://janus-idp.io/plugins/kiali
+iconUrl: https://janus-idp.io/images/plugins/kiali.svg
+npmPackageName: '@janus-idp/backstage-plugin-kiali'
+addedDate: '2023-07-25'
diff --git a/microsite/data/plugins/rafay.yaml b/microsite/data/plugins/rafay.yaml
new file mode 100644
index 0000000000..7aaf0d7681
--- /dev/null
+++ b/microsite/data/plugins/rafay.yaml
@@ -0,0 +1,10 @@
+---
+title: Rafay Kubernetes Operations Platform
+author: Rafay Systems
+authorUrl: https://rafay.co/
+category: Deployment
+description: Deploy and view clusters, namespaces, workloads and more using Rafay plugin
+documentation: https://docs.rafay.co/backstage/setup/
+iconUrl: https://avatars.githubusercontent.com/u/33210764?s=200&v=4
+npmPackageName: '@rafaysystems/backstage-plugin-rafay'
+addedDate: '2023-08-24'
diff --git a/microsite/data/plugins/scaffolder-backend-ms-teams.yaml b/microsite/data/plugins/scaffolder-backend-ms-teams.yaml
new file mode 100644
index 0000000000..6d16b1300b
--- /dev/null
+++ b/microsite/data/plugins/scaffolder-backend-ms-teams.yaml
@@ -0,0 +1,9 @@
+---
+title: Microsoft Teams Scaffolder Actions
+author: Gaurav Pandey
+authorUrl: https://github.com/grvpandey11
+category: Scaffolder
+description: Interact with Microsoft Teams from Scaffolder templates
+documentation: https://github.com/grvpandey11/backstage-plugin-scaffolder-backend-module-ms-teams/tree/main#readme
+npmPackageName: '@grvpandey11/backstage-plugin-scaffolder-backend-module-ms-teams'
+addedDate: '2023-08-11'
diff --git a/microsite/data/plugins/scaffolder-backend-slack.yaml b/microsite/data/plugins/scaffolder-backend-slack.yaml
new file mode 100644
index 0000000000..dce7b60eb7
--- /dev/null
+++ b/microsite/data/plugins/scaffolder-backend-slack.yaml
@@ -0,0 +1,10 @@
+---
+title: Slack Scaffolder Actions
+author: Drew Hill
+authorUrl: https://github.com/arhill05
+category: Scaffolder
+description: Interact with Slack from scaffolder templates
+documentation: https://github.com/arhill05/backstage-plugin-scaffolder-backend-module-slack#readme
+iconUrl: img/Slack-mark-RGB.png
+npmPackageName: '@mdude2314/backstage-plugin-scaffolder-backend-module-slack'
+addedDate: '2023-08-04'
diff --git a/microsite/data/plugins/solo-io-gloo-platform-portal.yaml b/microsite/data/plugins/solo-io-gloo-platform-portal.yaml
index fe7f4d78da..2f17b84f17 100644
--- a/microsite/data/plugins/solo-io-gloo-platform-portal.yaml
+++ b/microsite/data/plugins/solo-io-gloo-platform-portal.yaml
@@ -4,7 +4,7 @@ author: Solo.io
 authorUrl: https://solo.io
 category: Infrastructure
 description: View, test, and manage your Gloo Platform Portal APIs through our Backstage plugin.
-documentation: https://github.com/solo-io/dev-portal-backstage-public#readme
+documentation: https://github.com/solo-io/backstage-plugins-overview#readme
 iconUrl: /img/solo-io-glooy-circle.png.webp
 npmPackageName: '@solo.io/dev-portal-backstage-plugin'
 addedDate: '2023-05-19'
diff --git a/microsite/docusaurus.config.js b/microsite/docusaurus.config.js
index 23438762cc..a55ad01a35 100644
--- a/microsite/docusaurus.config.js
+++ b/microsite/docusaurus.config.js
@@ -177,7 +177,7 @@ module.exports = {
             position: 'left',
           },
           {
-            to: 'docs/releases/v1.16.0',
+            to: 'docs/releases/v1.17.0',
             label: 'Releases',
             position: 'left',
           },
diff --git a/microsite/sidebars.json b/microsite/sidebars.json
index d9178396e8..0e73bd94f2 100644
--- a/microsite/sidebars.json
+++ b/microsite/sidebars.json
@@ -1,6 +1,7 @@
 {
   "releases": {
     "Release Notes": [
+      "releases/v1.17.0",
       "releases/v1.16.0",
       "releases/v1.15.0",
       "releases/v1.14.0",
@@ -331,6 +332,7 @@
       "deployment/k8s",
       "deployment/heroku",
       "deployment/koyeb",
+      "deployment/flightcontrol",
       {
         "type": "category",
         "label": "Using Backstage Deploy (alpha)",
diff --git a/microsite/src/pages/home/_home.tsx b/microsite/src/pages/home/_home.tsx
index 07e05068c6..ddcfed7d03 100644
--- a/microsite/src/pages/home/_home.tsx
+++ b/microsite/src/pages/home/_home.tsx
@@ -32,27 +32,6 @@ const HomePage = () => {
           <BannerSectionGrid
             header={
               <>
-                <div
-                  className={clsx(
-                    'card',
-                    'padding--md',
-                    homeStyles.newsletterBanner,
-                  )}
-                >
-                  <div className="text--left bannerContent">
-                    CFP is now open for BackstageCon 2023 🚀
-                  </div>
-                  <div>
-                    <a
-                      className="button button--outline button--secondary"
-                      href="https://bit.ly/BackstageConCFP"
-                      rel="noopener noreferrer"
-                      target="_blank"
-                    >
-                      Submit a talk
-                    </a>
-                  </div>
-                </div>
                 {!hiddenNewsletterBanner && (
                   <div
                     className={clsx(
diff --git a/microsite/static/img/Slack-mark-RGB.png b/microsite/static/img/Slack-mark-RGB.png
new file mode 100644
index 0000000000..8ac1d296c8
Binary files /dev/null and b/microsite/static/img/Slack-mark-RGB.png differ
diff --git a/microsite/yarn.lock b/microsite/yarn.lock
index 34bc7e6e12..b6c948fb6c 100644
--- a/microsite/yarn.lock
+++ b/microsite/yarn.lock
@@ -2604,90 +2604,91 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@swc/core-darwin-arm64@npm:1.3.68":
-  version: 1.3.68
-  resolution: "@swc/core-darwin-arm64@npm:1.3.68"
+"@swc/core-darwin-arm64@npm:1.3.82":
+  version: 1.3.82
+  resolution: "@swc/core-darwin-arm64@npm:1.3.82"
   conditions: os=darwin & cpu=arm64
   languageName: node
   linkType: hard
 
-"@swc/core-darwin-x64@npm:1.3.68":
-  version: 1.3.68
-  resolution: "@swc/core-darwin-x64@npm:1.3.68"
+"@swc/core-darwin-x64@npm:1.3.82":
+  version: 1.3.82
+  resolution: "@swc/core-darwin-x64@npm:1.3.82"
   conditions: os=darwin & cpu=x64
   languageName: node
   linkType: hard
 
-"@swc/core-linux-arm-gnueabihf@npm:1.3.68":
-  version: 1.3.68
-  resolution: "@swc/core-linux-arm-gnueabihf@npm:1.3.68"
+"@swc/core-linux-arm-gnueabihf@npm:1.3.82":
+  version: 1.3.82
+  resolution: "@swc/core-linux-arm-gnueabihf@npm:1.3.82"
   conditions: os=linux & cpu=arm
   languageName: node
   linkType: hard
 
-"@swc/core-linux-arm64-gnu@npm:1.3.68":
-  version: 1.3.68
-  resolution: "@swc/core-linux-arm64-gnu@npm:1.3.68"
+"@swc/core-linux-arm64-gnu@npm:1.3.82":
+  version: 1.3.82
+  resolution: "@swc/core-linux-arm64-gnu@npm:1.3.82"
   conditions: os=linux & cpu=arm64 & libc=glibc
   languageName: node
   linkType: hard
 
-"@swc/core-linux-arm64-musl@npm:1.3.68":
-  version: 1.3.68
-  resolution: "@swc/core-linux-arm64-musl@npm:1.3.68"
+"@swc/core-linux-arm64-musl@npm:1.3.82":
+  version: 1.3.82
+  resolution: "@swc/core-linux-arm64-musl@npm:1.3.82"
   conditions: os=linux & cpu=arm64 & libc=musl
   languageName: node
   linkType: hard
 
-"@swc/core-linux-x64-gnu@npm:1.3.68":
-  version: 1.3.68
-  resolution: "@swc/core-linux-x64-gnu@npm:1.3.68"
+"@swc/core-linux-x64-gnu@npm:1.3.82":
+  version: 1.3.82
+  resolution: "@swc/core-linux-x64-gnu@npm:1.3.82"
   conditions: os=linux & cpu=x64 & libc=glibc
   languageName: node
   linkType: hard
 
-"@swc/core-linux-x64-musl@npm:1.3.68":
-  version: 1.3.68
-  resolution: "@swc/core-linux-x64-musl@npm:1.3.68"
+"@swc/core-linux-x64-musl@npm:1.3.82":
+  version: 1.3.82
+  resolution: "@swc/core-linux-x64-musl@npm:1.3.82"
   conditions: os=linux & cpu=x64 & libc=musl
   languageName: node
   linkType: hard
 
-"@swc/core-win32-arm64-msvc@npm:1.3.68":
-  version: 1.3.68
-  resolution: "@swc/core-win32-arm64-msvc@npm:1.3.68"
+"@swc/core-win32-arm64-msvc@npm:1.3.82":
+  version: 1.3.82
+  resolution: "@swc/core-win32-arm64-msvc@npm:1.3.82"
   conditions: os=win32 & cpu=arm64
   languageName: node
   linkType: hard
 
-"@swc/core-win32-ia32-msvc@npm:1.3.68":
-  version: 1.3.68
-  resolution: "@swc/core-win32-ia32-msvc@npm:1.3.68"
+"@swc/core-win32-ia32-msvc@npm:1.3.82":
+  version: 1.3.82
+  resolution: "@swc/core-win32-ia32-msvc@npm:1.3.82"
   conditions: os=win32 & cpu=ia32
   languageName: node
   linkType: hard
 
-"@swc/core-win32-x64-msvc@npm:1.3.68":
-  version: 1.3.68
-  resolution: "@swc/core-win32-x64-msvc@npm:1.3.68"
+"@swc/core-win32-x64-msvc@npm:1.3.82":
+  version: 1.3.82
+  resolution: "@swc/core-win32-x64-msvc@npm:1.3.82"
   conditions: os=win32 & cpu=x64
   languageName: node
   linkType: hard
 
 "@swc/core@npm:^1.3.46":
-  version: 1.3.68
-  resolution: "@swc/core@npm:1.3.68"
+  version: 1.3.82
+  resolution: "@swc/core@npm:1.3.82"
   dependencies:
-    "@swc/core-darwin-arm64": 1.3.68
-    "@swc/core-darwin-x64": 1.3.68
-    "@swc/core-linux-arm-gnueabihf": 1.3.68
-    "@swc/core-linux-arm64-gnu": 1.3.68
-    "@swc/core-linux-arm64-musl": 1.3.68
-    "@swc/core-linux-x64-gnu": 1.3.68
-    "@swc/core-linux-x64-musl": 1.3.68
-    "@swc/core-win32-arm64-msvc": 1.3.68
-    "@swc/core-win32-ia32-msvc": 1.3.68
-    "@swc/core-win32-x64-msvc": 1.3.68
+    "@swc/core-darwin-arm64": 1.3.82
+    "@swc/core-darwin-x64": 1.3.82
+    "@swc/core-linux-arm-gnueabihf": 1.3.82
+    "@swc/core-linux-arm64-gnu": 1.3.82
+    "@swc/core-linux-arm64-musl": 1.3.82
+    "@swc/core-linux-x64-gnu": 1.3.82
+    "@swc/core-linux-x64-musl": 1.3.82
+    "@swc/core-win32-arm64-msvc": 1.3.82
+    "@swc/core-win32-ia32-msvc": 1.3.82
+    "@swc/core-win32-x64-msvc": 1.3.82
+    "@swc/types": ^0.1.4
   peerDependencies:
     "@swc/helpers": ^0.5.0
   dependenciesMeta:
@@ -2714,7 +2715,14 @@ __metadata:
   peerDependenciesMeta:
     "@swc/helpers":
       optional: true
-  checksum: f56ad1d4cb91f7cc1cb5d4b9894bbb528da0b2eabc98984581f5b3f3187cf2c0d512003880f6ff7a3f6d215b7a3dcbf5a9c45e8a428ac2d711941027c0151d89
+  checksum: 4c4adbed22071c0af935129a6fe7cc35d1688a5c1a069efdd8c97740930fa7eaf324e75dc88634a4ea0520330f6c88101d5aa5cf7ed6e02d336cc46ee7131ea3
+  languageName: node
+  linkType: hard
+
+"@swc/types@npm:^0.1.4":
+  version: 0.1.4
+  resolution: "@swc/types@npm:0.1.4"
+  checksum: 9b09de7dca8e4b19bfb43f9e332c771855158cb761d26000807fe858447ecbc5342a6c257b26d9aa5497f7138fc58913693e2bee222e5042e0e8f57c2979ae66
   languageName: node
   linkType: hard
 
@@ -2942,9 +2950,9 @@ __metadata:
   linkType: hard
 
 "@types/luxon@npm:^3.0.0":
-  version: 3.3.0
-  resolution: "@types/luxon@npm:3.3.0"
-  checksum: f7e3a89fc3ca404fbc3ea538653ed6860bc28f570a8c4d6d24449b89b9b553b7d6ad6cc94a9e129c5b8c9a2b97f0c365b3017f811e59c4a859a9c219a1c918e0
+  version: 3.3.2
+  resolution: "@types/luxon@npm:3.3.2"
+  checksum: b9111132720eae0269538872a5a496b29587ecfc8edc3b0ff7d269aa93a5ff00a131b23d1e9d1f12ec39f2c779ad21bd8d9f90b122c85a182771aabde7f676b8
   languageName: node
   linkType: hard
 
@@ -5028,14 +5036,14 @@ __metadata:
   linkType: hard
 
 "docusaurus-plugin-sass@npm:^0.2.3":
-  version: 0.2.4
-  resolution: "docusaurus-plugin-sass@npm:0.2.4"
+  version: 0.2.5
+  resolution: "docusaurus-plugin-sass@npm:0.2.5"
   dependencies:
     sass-loader: ^10.1.1
   peerDependencies:
-    "@docusaurus/core": ^2.0.0-beta
+    "@docusaurus/core": ^2.0.0-beta || ^3.0.0-alpha
     sass: ^1.30.0
-  checksum: 10e0c9f519dd7ef4666b1fb82d120738feab03ea451c18bab7f785627887f65b8cb72457065a9b2a2664af1490c20b38df9adf525c1b58ce3e324d2b50412734
+  checksum: db17a8c87a344330717962fe195c94089e32281dc7f79b66bf99587254ebad71353b8588c5b74feb1c2841c6183e59b20259f5fb1a5c74026903557cbb113a68
   languageName: node
   linkType: hard
 
@@ -7358,9 +7366,9 @@ __metadata:
   linkType: hard
 
 "luxon@npm:^3.0.0":
-  version: 3.3.0
-  resolution: "luxon@npm:3.3.0"
-  checksum: 50cf17a0dc155c3dcacbeae8c0b7e80db425e0ba97b9cbdf12a7fc142d841ff1ab1560919f033af46240ed44e2f70c49f76e3422524c7fc8bb8d81ca47c66187
+  version: 3.4.3
+  resolution: "luxon@npm:3.4.3"
+  checksum: 3eade81506224d038ed24035a0cd0dd4887848d7eba9361dce9ad8ef81380596a68153240be3988721f9690c624fb449fcf8fd8c3fc0681a6a8496faf48e92a3
   languageName: node
   linkType: hard
 
@@ -10301,15 +10309,15 @@ __metadata:
   linkType: hard
 
 "sass@npm:^1.57.1":
-  version: 1.60.0
-  resolution: "sass@npm:1.60.0"
+  version: 1.66.1
+  resolution: "sass@npm:1.66.1"
   dependencies:
     chokidar: ">=3.0.0 <4.0.0"
     immutable: ^4.0.0
     source-map-js: ">=0.6.2 <2.0.0"
   bin:
     sass: sass.js
-  checksum: 06e163c37af466ec194cf2ed8dab616372afeb19322d356947d48ea664fc38398ae77c4d91bea9cb0ace954ce289d5518d0f8555ecc49f6bf2539a8ef52fc580
+  checksum: 74fc11d0fcd5e16c5331b57dd59865705a299c64e89f2b99646869caeb011dc8d0b6144a6c74a90c264e9ef70654207dbf44fc9b7e3393f8bd14809b904c8a52
   languageName: node
   linkType: hard
 
diff --git a/package.json b/package.json
index abaaec252c..6711d06f40 100644
--- a/package.json
+++ b/package.json
@@ -18,6 +18,7 @@
     "clean": "backstage-cli repo clean",
     "test": "backstage-cli repo test",
     "test:all": "backstage-cli repo test --coverage",
+    "fix": "backstage-cli repo fix",
     "lint": "backstage-cli repo lint --since origin/master",
     "lint:docs": "node ./scripts/check-docs-quality",
     "lint:all": "backstage-cli repo lint",
@@ -47,7 +48,7 @@
     "@types/react": "^17",
     "@types/react-dom": "^17"
   },
-  "version": "1.17.0-next.1",
+  "version": "1.18.0-next.2",
   "dependencies": {
     "@backstage/errors": "workspace:^",
     "@manypkg/get-packages": "^1.1.3"
@@ -65,7 +66,7 @@
     "@types/node": "^16.11.26",
     "@types/webpack": "^5.28.0",
     "command-exists": "^1.2.9",
-    "concurrently": "^7.0.0",
+    "concurrently": "^8.0.0",
     "cross-env": "^7.0.0",
     "e2e-test": "workspace:*",
     "eslint": "^8.6.0",
diff --git a/packages/app-defaults/CHANGELOG.md b/packages/app-defaults/CHANGELOG.md
index 342ee7dde3..5b267a3105 100644
--- a/packages/app-defaults/CHANGELOG.md
+++ b/packages/app-defaults/CHANGELOG.md
@@ -1,5 +1,50 @@
 # @backstage/app-defaults
 
+## 1.4.3-next.2
+
+### Patch Changes
+
+- 8cec7664e146: Removed `@types/node` dependency
+- Updated dependencies
+  - @backstage/core-components@0.13.5-next.2
+  - @backstage/core-plugin-api@1.6.0-next.2
+  - @backstage/core-app-api@1.10.0-next.2
+  - @backstage/plugin-permission-react@0.4.15-next.2
+  - @backstage/theme@0.4.1
+
+## 1.4.3-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.13.5-next.1
+  - @backstage/core-app-api@1.10.0-next.1
+  - @backstage/core-plugin-api@1.6.0-next.1
+  - @backstage/plugin-permission-react@0.4.15-next.1
+  - @backstage/theme@0.4.1
+
+## 1.4.3-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-app-api@1.10.0-next.0
+  - @backstage/core-plugin-api@1.6.0-next.0
+  - @backstage/core-components@0.13.5-next.0
+  - @backstage/theme@0.4.1
+  - @backstage/plugin-permission-react@0.4.15-next.0
+
+## 1.4.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-app-api@1.9.1
+  - @backstage/core-components@0.13.4
+  - @backstage/core-plugin-api@1.5.3
+  - @backstage/theme@0.4.1
+  - @backstage/plugin-permission-react@0.4.14
+
 ## 1.4.2-next.0
 
 ### Patch Changes
diff --git a/packages/app-defaults/catalog-info.yaml b/packages/app-defaults/catalog-info.yaml
new file mode 100644
index 0000000000..e8450be1ec
--- /dev/null
+++ b/packages/app-defaults/catalog-info.yaml
@@ -0,0 +1,10 @@
+apiVersion: backstage.io/v1alpha1
+kind: Component
+metadata:
+  name: backstage-app-defaults
+  title: '@backstage/app-defaults'
+  description: Provides the default wiring of a Backstage App
+spec:
+  lifecycle: production
+  type: backstage-web-library
+  owner: maintainers
diff --git a/packages/app-defaults/package.json b/packages/app-defaults/package.json
index a5e31372af..12cc333e9f 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.4.2-next.0",
+  "version": "1.4.3-next.2",
   "publishConfig": {
     "access": "public",
     "main": "dist/index.esm.js",
@@ -22,6 +22,7 @@
   "license": "Apache-2.0",
   "main": "src/index.ts",
   "types": "src/index.ts",
+  "sideEffects": false,
   "scripts": {
     "build": "backstage-cli package build",
     "lint": "backstage-cli package lint",
@@ -50,7 +51,6 @@
     "@backstage/test-utils": "workspace:^",
     "@testing-library/jest-dom": "^5.10.1",
     "@testing-library/react": "^12.1.3",
-    "@types/node": "^16.11.26",
     "@types/react": "^16.13.1 || ^17.0.0"
   },
   "files": [
diff --git a/packages/app-next-example-plugin/.eslintrc.js b/packages/app-next-example-plugin/.eslintrc.js
new file mode 100644
index 0000000000..e2a53a6ad2
--- /dev/null
+++ b/packages/app-next-example-plugin/.eslintrc.js
@@ -0,0 +1 @@
+module.exports = require('@backstage/cli/config/eslint-factory')(__dirname);
diff --git a/packages/app-next-example-plugin/api-report.md b/packages/app-next-example-plugin/api-report.md
new file mode 100644
index 0000000000..68a0471b6b
--- /dev/null
+++ b/packages/app-next-example-plugin/api-report.md
@@ -0,0 +1,17 @@
+## API Report File for "app-next-example-plugin"
+
+> Do not edit this file. It is a report generated by [API Extractor](https://api-extractor.com/).
+
+```ts
+import { BackstagePlugin } from '@backstage/frontend-plugin-api';
+import { default as React_2 } from 'react';
+
+// @public (undocumented)
+const examplePlugin: BackstagePlugin;
+export default examplePlugin;
+
+// @public (undocumented)
+export const ExampleSidebarItem: () => React_2.JSX.Element;
+
+// (No @packageDocumentation comment for this package)
+```
diff --git a/packages/app-next-example-plugin/package.json b/packages/app-next-example-plugin/package.json
new file mode 100644
index 0000000000..9e5a0d0ee6
--- /dev/null
+++ b/packages/app-next-example-plugin/package.json
@@ -0,0 +1,54 @@
+{
+  "name": "app-next-example-plugin",
+  "description": "Backstage internal example plugin",
+  "version": "0.0.0",
+  "publishConfig": {
+    "access": "public",
+    "main": "dist/index.esm.js",
+    "types": "dist/index.d.ts"
+  },
+  "private": true,
+  "backstage": {
+    "role": "frontend-plugin"
+  },
+  "homepage": "https://backstage.io",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/backstage/backstage",
+    "directory": "packages/app-next-example-plugin"
+  },
+  "keywords": [
+    "backstage"
+  ],
+  "license": "Apache-2.0",
+  "main": "src/index.ts",
+  "types": "src/index.ts",
+  "sideEffects": false,
+  "scripts": {
+    "build": "backstage-cli package build",
+    "start": "backstage-cli package start",
+    "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"
+  },
+  "dependencies": {
+    "@backstage/core-components": "workspace:^",
+    "@backstage/frontend-plugin-api": "workspace:^",
+    "@material-ui/icons": "^4.9.1"
+  },
+  "peerDependencies": {
+    "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"
+  },
+  "devDependencies": {
+    "@backstage/cli": "workspace:^",
+    "cross-fetch": "^3.1.5",
+    "msw": "^1.0.0"
+  },
+  "files": [
+    "dist"
+  ]
+}
diff --git a/packages/app-next-example-plugin/src/Component.tsx b/packages/app-next-example-plugin/src/Component.tsx
new file mode 100644
index 0000000000..e90be162ed
--- /dev/null
+++ b/packages/app-next-example-plugin/src/Component.tsx
@@ -0,0 +1,23 @@
+/*
+ * 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';
+
+export const Component = () => (
+  <div>
+    <h1>SHIP IT!</h1>
+  </div>
+);
diff --git a/packages/app-next-example-plugin/src/ExampleSidebarItem.tsx b/packages/app-next-example-plugin/src/ExampleSidebarItem.tsx
new file mode 100644
index 0000000000..20e84f1933
--- /dev/null
+++ b/packages/app-next-example-plugin/src/ExampleSidebarItem.tsx
@@ -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.
+ */
+
+import React from 'react';
+import { SidebarItem } from '@backstage/core-components';
+import SaveIcon from '@material-ui/icons/Save';
+
+/** @public */
+export const ExampleSidebarItem = () => (
+  <SidebarItem text="Example" to="/example" icon={SaveIcon} />
+);
diff --git a/packages/app-next-example-plugin/src/index.ts b/packages/app-next-example-plugin/src/index.ts
new file mode 100644
index 0000000000..89ce4180fd
--- /dev/null
+++ b/packages/app-next-example-plugin/src/index.ts
@@ -0,0 +1,20 @@
+/*
+ * 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 { examplePlugin as default } from './plugin';
+
+// TODO: This should be an extension created & exported in the `plugin.tsx`
+export { ExampleSidebarItem } from './ExampleSidebarItem';
diff --git a/packages/app-next-example-plugin/src/plugin.tsx b/packages/app-next-example-plugin/src/plugin.tsx
new file mode 100644
index 0000000000..5b5adeab2f
--- /dev/null
+++ b/packages/app-next-example-plugin/src/plugin.tsx
@@ -0,0 +1,33 @@
+/*
+ * 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 {
+  createPageExtension,
+  createPlugin,
+} from '@backstage/frontend-plugin-api';
+
+export const ExamplePage = createPageExtension({
+  id: 'example.page',
+  defaultPath: '/example',
+  component: () => import('./Component').then(m => <m.Component />),
+});
+
+/** @public */
+export const examplePlugin = createPlugin({
+  id: 'example',
+  extensions: [ExamplePage],
+});
diff --git a/packages/app-next/.eslintrc.js b/packages/app-next/.eslintrc.js
new file mode 100644
index 0000000000..e2a53a6ad2
--- /dev/null
+++ b/packages/app-next/.eslintrc.js
@@ -0,0 +1 @@
+module.exports = require('@backstage/cli/config/eslint-factory')(__dirname);
diff --git a/packages/app-next/CHANGELOG.md b/packages/app-next/CHANGELOG.md
new file mode 100644
index 0000000000..8845db91f2
--- /dev/null
+++ b/packages/app-next/CHANGELOG.md
@@ -0,0 +1,153 @@
+# example-app-next
+
+## 0.0.1-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-playlist@0.1.16-next.2
+  - @backstage/plugin-tech-radar@0.6.8-next.2
+  - @backstage/plugin-user-settings@0.7.9-next.2
+  - @backstage/plugin-org@0.6.14-next.2
+  - @backstage/plugin-techdocs@1.7.0-next.2
+  - @backstage/plugin-techdocs-module-addons-contrib@1.1.0-next.2
+  - @backstage/plugin-catalog-unprocessed-entities@0.1.3-next.2
+  - @backstage/integration-react@1.1.19-next.2
+  - @backstage/plugin-microsoft-calendar@0.1.7-next.2
+  - @backstage/core-components@0.13.5-next.2
+  - @backstage/core-plugin-api@1.6.0-next.2
+  - @backstage/plugin-entity-feedback@0.2.7-next.2
+  - @backstage/plugin-apache-airflow@0.2.15-next.2
+  - @backstage/plugin-github-actions@0.6.5-next.2
+  - @backstage/plugin-octopus-deploy@0.2.6-next.2
+  - @backstage/plugin-stack-overflow@0.1.20-next.2
+  - @backstage/app-defaults@1.4.3-next.2
+  - @backstage/core-app-api@1.10.0-next.2
+  - @backstage/plugin-code-coverage@0.2.17-next.2
+  - @backstage/plugin-cost-insights@0.12.13-next.2
+  - @backstage/plugin-tech-insights@0.3.16-next.2
+  - @backstage/plugin-azure-devops@0.3.6-next.2
+  - @backstage/plugin-gcp-projects@0.3.41-next.2
+  - @backstage/plugin-azure-sites@0.1.13-next.2
+  - @backstage/plugin-cloudbuild@0.3.24-next.2
+  - @backstage/plugin-kubernetes@0.10.3-next.2
+  - @backstage/plugin-lighthouse@0.4.9-next.2
+  - @backstage/plugin-scaffolder@1.14.5-next.2
+  - @backstage/plugin-stackstorm@0.1.6-next.2
+  - @backstage/plugin-dynatrace@7.0.4-next.2
+  - @backstage/plugin-gcalendar@0.3.18-next.2
+  - @backstage/plugin-pagerduty@0.6.5-next.2
+  - @backstage/plugin-shortcuts@0.3.14-next.2
+  - @backstage/plugin-airbrake@0.3.24-next.2
+  - @backstage/plugin-api-docs@0.9.11-next.2
+  - @backstage/plugin-circleci@0.3.24-next.2
+  - @backstage/plugin-devtools@0.1.4-next.2
+  - @backstage/plugin-graphiql@0.2.54-next.2
+  - @backstage/plugin-linguist@0.1.9-next.2
+  - @backstage/plugin-newrelic@0.3.40-next.2
+  - @backstage/plugin-puppetdb@0.1.7-next.2
+  - @backstage/config@1.1.0-next.1
+  - @backstage/plugin-explore@0.4.10-next.2
+  - @backstage/plugin-jenkins@0.8.6-next.2
+  - @backstage/plugin-rollbar@0.4.24-next.2
+  - @backstage/plugin-badges@0.2.48-next.2
+  - @backstage/plugin-search@1.4.0-next.2
+  - @backstage/plugin-sentry@0.5.9-next.2
+  - @backstage/plugin-kafka@0.3.24-next.2
+  - @backstage/cli@0.22.13-next.2
+  - @backstage/plugin-gocd@0.1.30-next.2
+  - @backstage/plugin-home@0.5.8-next.2
+  - @backstage/plugin-todo@0.2.26-next.2
+  - @backstage/plugin-adr@0.6.7-next.2
+  - @backstage/plugin-scaffolder-react@1.5.5-next.2
+  - @internal/plugin-catalog-customized@0.0.14-next.2
+  - @backstage/plugin-catalog-graph@0.2.36-next.2
+  - @backstage/plugin-catalog-import@0.9.14-next.2
+  - @backstage/plugin-catalog-react@1.8.4-next.2
+  - @backstage/plugin-newrelic-dashboard@0.2.17-next.2
+  - @backstage/plugin-search-react@1.7.0-next.2
+  - @backstage/plugin-techdocs-react@1.1.10-next.2
+  - @backstage/frontend-app-api@0.0.1-next.1
+  - @backstage/frontend-plugin-api@0.0.1-next.0
+  - @backstage/plugin-permission-react@0.4.15-next.2
+  - @backstage/catalog-model@1.4.2-next.1
+  - @backstage/theme@0.4.1
+  - @backstage/plugin-catalog-common@1.0.16-next.1
+  - @backstage/plugin-linguist-common@0.1.1
+  - @backstage/plugin-search-common@1.2.6-next.1
+
+## 0.0.1-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-playlist@0.1.16-next.1
+  - @backstage/plugin-tech-radar@0.6.8-next.1
+  - @backstage/plugin-catalog-react@1.8.4-next.1
+  - @backstage/core-components@0.13.5-next.1
+  - @backstage/config@1.1.0-next.0
+  - @backstage/plugin-org@0.6.14-next.1
+  - @backstage/plugin-home@0.5.8-next.1
+  - @backstage/plugin-devtools@0.1.4-next.1
+  - @backstage/plugin-user-settings@0.7.9-next.1
+  - @backstage/plugin-search-react@1.7.0-next.1
+  - @backstage/plugin-search@1.4.0-next.1
+  - @backstage/plugin-kubernetes@0.10.3-next.1
+  - @backstage/plugin-techdocs-module-addons-contrib@1.1.0-next.1
+  - @backstage/plugin-adr@0.6.7-next.1
+  - @backstage/plugin-airbrake@0.3.24-next.1
+  - @backstage/plugin-api-docs@0.9.11-next.1
+  - @backstage/plugin-azure-devops@0.3.6-next.1
+  - @backstage/plugin-azure-sites@0.1.13-next.1
+  - @backstage/plugin-badges@0.2.48-next.1
+  - @internal/plugin-catalog-customized@0.0.14-next.1
+  - @backstage/plugin-catalog-graph@0.2.36-next.1
+  - @backstage/plugin-catalog-import@0.9.14-next.1
+  - @backstage/plugin-circleci@0.3.24-next.1
+  - @backstage/plugin-cloudbuild@0.3.24-next.1
+  - @backstage/plugin-code-coverage@0.2.17-next.1
+  - @backstage/plugin-cost-insights@0.12.13-next.1
+  - @backstage/plugin-dynatrace@7.0.4-next.1
+  - @backstage/plugin-entity-feedback@0.2.7-next.1
+  - @backstage/plugin-explore@0.4.10-next.1
+  - @backstage/plugin-github-actions@0.6.5-next.1
+  - @backstage/plugin-gocd@0.1.30-next.1
+  - @backstage/plugin-jenkins@0.8.6-next.1
+  - @backstage/plugin-kafka@0.3.24-next.1
+  - @backstage/plugin-lighthouse@0.4.9-next.1
+  - @backstage/plugin-linguist@0.1.9-next.1
+  - @backstage/plugin-newrelic-dashboard@0.2.17-next.1
+  - @backstage/plugin-octopus-deploy@0.2.6-next.1
+  - @backstage/plugin-pagerduty@0.6.5-next.1
+  - @backstage/plugin-puppetdb@0.1.7-next.1
+  - @backstage/plugin-rollbar@0.4.24-next.1
+  - @backstage/plugin-scaffolder@1.14.5-next.1
+  - @backstage/plugin-scaffolder-react@1.5.5-next.1
+  - @backstage/plugin-sentry@0.5.9-next.1
+  - @backstage/plugin-tech-insights@0.3.16-next.1
+  - @backstage/plugin-techdocs@1.6.9-next.1
+  - @backstage/plugin-todo@0.2.26-next.1
+  - @backstage/app-defaults@1.4.3-next.1
+  - @backstage/cli@0.22.13-next.1
+  - @backstage/integration-react@1.1.19-next.1
+  - @backstage/plugin-apache-airflow@0.2.15-next.1
+  - @backstage/plugin-catalog-unprocessed-entities@0.1.3-next.1
+  - @backstage/plugin-gcalendar@0.3.18-next.1
+  - @backstage/plugin-gcp-projects@0.3.41-next.1
+  - @backstage/plugin-graphiql@0.2.54-next.1
+  - @backstage/plugin-microsoft-calendar@0.1.7-next.1
+  - @backstage/plugin-newrelic@0.3.40-next.1
+  - @backstage/plugin-shortcuts@0.3.14-next.1
+  - @backstage/plugin-stack-overflow@0.1.20-next.1
+  - @backstage/plugin-stackstorm@0.1.6-next.1
+  - @backstage/plugin-techdocs-react@1.1.10-next.1
+  - @backstage/catalog-model@1.4.2-next.0
+  - @backstage/core-app-api@1.10.0-next.1
+  - @backstage/core-plugin-api@1.6.0-next.1
+  - @backstage/frontend-app-api@0.0.1-next.0
+  - @backstage/plugin-permission-react@0.4.15-next.1
+  - @backstage/plugin-catalog-common@1.0.16-next.0
+  - @backstage/frontend-plugin-api@0.0.0
+  - @backstage/theme@0.4.1
+  - @backstage/plugin-linguist-common@0.1.1
+  - @backstage/plugin-search-common@1.2.6-next.0
diff --git a/packages/app-next/README.md b/packages/app-next/README.md
new file mode 100644
index 0000000000..21645609a9
--- /dev/null
+++ b/packages/app-next/README.md
@@ -0,0 +1,3 @@
+# example-app-next
+
+This package is an example of a Backstage application.
diff --git a/packages/app-next/app-config.yaml b/packages/app-next/app-config.yaml
new file mode 100644
index 0000000000..c94d900b21
--- /dev/null
+++ b/packages/app-next/app-config.yaml
@@ -0,0 +1,147 @@
+app:
+  experimental:
+    packages: 'all' # ✨
+
+
+  # scmAuthExtension: >-
+  #   createScmAuthExtension({
+  #     id: 'apis.scmAuth.addons.ghe',
+  #     factory({ bind }) {
+  #       bind.scmAuthAddon({
+  #         baseUrl: 'https://github.spotify.net',
+  #         api: githubAuthApiRef,
+  #       })
+  #     }
+  #   })
+
+  # externalRouteRefs:
+  # bind(catalogPlugin.externalRoutes, {
+  #   createComponent: scaffolderPlugin.routes.root,
+  #   viewTechDoc: techdocsPlugin.routes.docRoot,
+  #   createFromTemplate: scaffolderPlugin.routes.selectedTemplate,
+  # });
+  # bind(apiDocsPlugin.externalRoutes, {
+  #   registerApi: catalogImportPlugin.routes.importPage,
+  # });
+  # bind(scaffolderPlugin.externalRoutes, {
+  #   registerComponent: catalogImportPlugin.routes.importPage,
+  #   viewTechDoc: techdocsPlugin.routes.docRoot,
+  # });
+  # bind(orgPlugin.externalRoutes, {
+  #   catalogIndex: catalogPlugin.routes.catalogIndex,
+  # });
+
+  # extensions:
+  # - plugin.catalog:
+  #     config:
+  #       externalRoutes:
+  #         createComponent: plugin.scaffolder.page
+  #         viewTechDoc: plugin.techdocs.docRootPage
+  #         createFromTemplate: plugin.scaffolder.templatePage
+  # - graphiql.page:
+  #     config:
+  #       path: /
+  # - apis.auth.providers.github:
+  #     config:
+  #       provider: ghe
+
+  # - core.signInPage:
+  #     props:
+  #       provider:
+  #         id: google
+  #         title: Google
+  #         message: Sign In using Google
+  #         apiRef: googleAuthApiRef # ???
+
+  # - core.nav:
+  #     config:
+  #       logo: assets/logo.png
+  #       layout:
+  #       - label: Search
+  #         icon: search
+  #         to: /search
+  #         items:
+  #         - point: search
+  #       - type: divider
+  #       - label: Menu
+  #         icon: menu
+  #         items:
+  #         - label: Home
+  #           icon: home
+  #           to: /catalog
+  #         - label: Create...
+  #           icon: create
+  #           to: /create
+  #         - type: divider
+  #         - type: scroll-wrapper
+  #           items:
+  #           - label: Tech Radar
+  #             icon: map
+  #             to: /tech-radar
+  #           - label: GraphiQL
+  #             icon: graphiql
+  #             to: /graphiql
+  #         - type: divider
+  #         - point: shortcuts
+  #       - type: space
+  #       - type: divider
+  #       - label: Settings
+  #         icon: avatar
+  #         to: /settings
+  #         items:
+  #         - point: settings
+  # - core.nav/search: '@backstage/plugin-search#SidebarSearchModal'
+  # - core.nav/shortcuts:
+  #     use: '@backstage/plugin-shortcuts#Shortcuts'
+  #     config:
+  #       allowExternalLinks: true
+  # - core.nav/settings: '@backstage/plugin-user-settings#SidebarSettings'
+
+  # - core.pages.index:
+  #     at:
+  #       point: core.routes
+  #       config:
+  #         path: /
+  #     use: 'react-router-dom#Navigate'
+  #     config:
+  #       to: /catalog
+
+  # - scaffolder.page:
+  #     config:
+  #       groups:
+  #       - title: Recommended
+  #         filter:
+  #           entity.metadata.tags: recommended
+  # - scaffolder.page/fields: '@backstage/plugin-scaffolder#LowerCaseValuePickerFieldExtension'
+  # - scaffolder.page/layout: '@backstage/plugin-scaffolder#TwoColumnLayout'
+
+  # - search.page/content: 'app#customSearchPage' # custom search page from somewhere
+
+  # - user-settings.page.routes.advanced:
+  #     at:
+  #       point: user-settings.page/routes
+  #       config:
+  #         title: Advanced
+  #         path: /advanced
+  #       use: '@backstage/plugin-user-settings#AdvancedSettings'
+
+  # - entity.card.orphanWarning
+  # - entity.card.processingErrors
+  # - entity.card.about
+  # - entity.card.catalogGraph
+  # - entity.card.pagerDuty
+  # - entity.card.links
+  # - entity.card.labels
+  # - entity.card.githubInsightsLanguages
+  # - entity.card.githubInsightsReleases
+  # - entity.card.githubInsightsReadme:
+  #     config:
+  #       maxHeight: 350 # Throwing this config in to have an example, but in practice rely on default
+  # - entity.card.subcomponentsCard
+  # - entity.card.userProfile
+  # - entity.card.ownership
+  # - entity.card.likeDislikeRatings
+  # - entity.content.dependsOnComponents
+  # - entity.content.codeInsights
+  # - entity.content.todo
+  # - entity.content.feedbackResponse
diff --git a/packages/app-next/architecture.drawio.svg b/packages/app-next/architecture.drawio.svg
new file mode 100644
index 0000000000..b5ed4de71a
--- /dev/null
+++ b/packages/app-next/architecture.drawio.svg
@@ -0,0 +1,614 @@
+<svg host="65bd71144e" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" width="1012px" height="442px" viewBox="-0.5 -0.5 1012 442" content="&lt;mxfile&gt;&lt;diagram id=&quot;W2IAjyMExVh-jXkT93Bg&quot; name=&quot;Page-1&quot;&gt;7V1tc6NGEv41/rhbDG+Cj157k0tVUtnKpu4uH7GEJCpIKAh57fv1B4KRYWYkRmJoRtCbraxBgHD3Mz393g/W0+bt5zTYrX9LFmH8YBqLtwfr+cE0bd/L/1+ceC9POMQqT6zSaFGeIh8nvkf/C6uTRnX2EC3CfePCLEniLNo1T86T7TacZ41zQZomP5qXLZO4+a27YBVyJ77Pg5g/+59oka3Ls5ZtfJz/Vxit1vSbveqDTUCvrU7s18Ei+VE7ZX19sJ7SJMnKnzZvT2FckI6SpbzvpzOfnt4rDbeZzA2WNStveQ3iQ/XLVW+WvdPfNtwuHgui5UfbZJuf/LII9uuweATJD9bZJq5+XCbbrOJWzirrS7jIyVY9KEmzdbJKtkH89ePsl/w90/f/5h8bnx16+Ff1tOPBc4EZ43T0To/eoqx2W370V+2Tj5uKA3pP+YsV73SWWtWpfXJI59VVplFhMwvSVVhdZ7reiVs5yMNkE+Zvl1/04wMOTsXjdQ0J9FwaxkEWvTZfJKhQuTo97vQN35Iof0XTqBbQbOaUt7w3H0ufUL5/dVOd/S3PsZnnlL8y95z8h9ov/XHqCK5zQPMGBtoNgLkVnLcBzTJs/YDmNQHi3gHQfARaC9CIhhLNbwJkpj3QTCrR6rhqRUcNWg3I1XFmHvnMIjQ/81NUvE0nxMwP6evpSwE3UdsUQM7wxZDriCWHMr0jlmzSfA4r/NRhibgSaliaHLaLI+8KPvxYR1n4fRccKfwj17IZuZVD5SmJk/R4r7V0iv8qnNXOl3/y8/ssTf4Oa5+4xz8nhr+GaRa+XWY5z0h6g9kkJKEMqskWVyBb2MVbZ32D2hdJ646atGRI0joXJWAluGqkOwkcKXFD6NG3MI3ytwvT6opOklNWgCkXS5anRiyxzzGd3sSSZdzK4MaOQi7uKGr2wdPG91f9E6V608zn9zBinVGbuoLFNT4bpLm0WcAoZDRx74bRRv+M9gT6MSk9JeoZ7c8+G37tDxjP3Y766wcETHn1URYDL3Ey//vPdbRtAIGwGuxt/KWae0MZ7chd2U1T4Af5+paF232UbPPTv2z3WbDNX7SbilIQtrrXUKBlWIxG7fFKhteTkmETjhTqJZMqnYExeniUWUAosy+vbQHVZJZezeg07IYY/uzNWj22xRGrySkjLDGcXsQz8ZvIZz2tCv0Jl+RCF2GgYP2brcuf9GVkWBxZfj9ku0PWUUDqZMPNGH0ezoKz7dvFhEJBafeydB3GMjZ7W7o2h9FftkeIGvzmdb8wHdCJYzschbUAbuVcUr/r2Ldh9+NB9MJkudyHnbem8wAflS/NGA7hpkR4tIWWwX5X5joso7eC/ixxF0HoLedCIs698GXZkYgV0SwiUA4ERCMqiMaH+v4Ig3mBy6dks8vX+ZbXE/JfLWsSrkmPSjzUiVedCuJolSvFz3G4LJ5QkCmaB/FjdXoTLRZHG1nEp+aqYKOK6qWzmA098YG6CXsE73K5NOdC8C7cF9fpKgEo1Sw48FqEB29yyHLL3/hWpAlNFLdCDvTFAt7mUi50ndBb2CLceuaL1XnnolRzAHHLW2TP0X4XB8X7/BllMe+7mgh0hUzoiQvOqAPGFmMSz3jKmj0R1uXF8ogJK/A19EZYHrFPyXYZrQ5pbioJnFz7dbArfoyTZPdrtImydlqf0mkLvuz/DrP5mh4cqUqTdclRPGTl91rPfnHFJnkNXuLw1+AlpEZhXPz8LdlH1XXznMqF6/Ikh35lLjjJIyq3uDs4ybVO0uh/ORQC+qV7tULKZkxJl+e4LeC4p4DjM149H9NSOudfAlhLHr8Hj4myXjtlrZ4oSwyetN/KN+9GYNUROcGWKFrHrOPoNprw/h+U1ry0TsP8qHir6rPjO9eOVUhz1kUFuTJETlg3Lhi93wXbBhzcfw5FCcuXxk+r4l9mzze+z9fhJqAPyl+ifFZ5MYeyVlae51wDd0eobt5WRXXS55dgH80/75L4fVU87Evx01OSpIsjtZwv+V/jc86XJ+PByV/i6XjsN46PnxZ5EM0TM4e5g9SOSfOYu6H2yPxv+VpxtKVoumb1nF0aHPJFSzaI4+THIy2bOuZglHVVFbYVBRlJu24qNKeUpDIKvDG/PKOQ44XcMo52/1bHdIvJX/UBtzVLIjMYOd66ralGBKtXA25xgmrI3w5xFj0UiVllwOsxy4L5epP/MnsOLPnTot3+nD+qBpGm6tgAzCoO9ns58LAurauRkiU7GZi8JFmWbB6Y5D0WBvMCP/n2lJ72iDgOdvuofsUmmlMQhfNDuo9ewz/CCmuKNCTOeBAlq/gCALGZlrcAyOd3kad1FC/AbYdzyaqUSIznkieRqNRLhdD1TZS5YKZECwpmrSjoS9D6EvkcWvsvrltfAk1WtL6UUFbgZdVRArF1S5AiSCLVAkUQjAgizmAyiBj3Hum5cokBSiFiocdwGNOqDRPDLTdLYs9HSMBDwh8MElJJj+fofjJKWTKXRm1Hdy/jqnWOvljnwpmmM/fSUXlv0/FLzjl5JR0Fdcv6CqeByW9aEkmi4SKqe36rRUSXWAt8F2Ec1u++1ZPcJufYZHXApFRBViqielhUS2SP3gWqreFQLZPji6iGldXtuaV3gWq22AUS1RI2IKIaNZDrUT0kqCV87AhqVECuB3V7aLY/UEukPCKoUf+4HtTuYKAmgmYw36PtqiihESQccHjHfIPh8w04+IjyDURpayryDYig2e1A4b4zbdCkEw56y/KiD0a/M0S47zIM3FYY9BZ+sO+9ZOK6FSYI9olWmBLSOhJGNK6wPiI7lyExXLDPlIn/oraOfpXrQT2kX0Uigo2gRr/K9aAezq9CPOVFuoorHWeM0iiwr3pTGn20HTQpfJx5A6IAM5c0rBOatfck7g8ROicuGY29+twRaTm6qE9opQP03NfuTPdLAdxE3R5UuLBMmUxlVDxHCDrJvkdqQHbvDrKrtEgBZXtzhsi0z8Dlq9vy1cJuvIxppoBP0NqpN1+IMe7eTkxSPGBrJ6tl4MUVY1mumX+RCacJnj47M9Ph7DSX8tKWiT7xy/FDKtlOrLt6HASle2PSBuk6mEmeYzz0kWM3cKxMnIfg2AzXmBKOnZsZq5xjp68f537DaqeCLji9aadEZ+MSfRmcXsqqmqwq2gMcT/lLEJolMRGP2uBRIr4GgUe2pw8oHnW23qeGRz3kI9djCnBshEl0zkKYGh71kI+suwIWjxJdFBGPUPKxvSQDAI9cl2JQPEpMxkA8Tmu/ZvOrQPGIuQL64FGT/Zq1ryHxSAMXWuIRo5F3G41kRwtBRiPp2yKmtcH0vWRmX2Xog2Ja54L3qekNmuix7b36+oMjup00gqOWZj4oHNHrpBEc9ZCO7f3s+4MjOp30gaMmRr43HBwFPS9+z9ZhymFy0Mo+h+lZADj7ybQlLEas6YKo7HMGzH2imZvjzCpj15egZKmvniCmTLsVXF/QNZNO+7S9/taaznk00/TRjcLv7DB1wILKrv70LJ2dIhPF9J00pbyMaWdATOtsyk4T0xIGrQLQneZFQVQb25gVMTV8STRK7Q9uOs9kmRrcYHonEDYJERJvdP9GvGmAN6Dtkx3OA4o3nRNgpoY3CRNEBd6G3E8di4NXewH1/JC+niqZO1ZTn62KLvjRVhVdvvvVJdCOKWaIdLVzdeu3JCqa+VNGegxDygrr6iKGJ6dvlWQT79/+/ZCVcwWec7OWY2IOx4xZ8w0MV+SsA746Je8QFbl4+12jiiIVzIL7ZPMLzuttwdmTXXDNngOVf0L5KmSnJX9inSnlm3HLknsQW4vV4+rmvY90aAgu7msXN+NxM0EXt9vL4jbrq9vQb3U7/OquOmv2vrq5ZSm7ulkt/xQv62N9zxAWdDUCwcK+ERZ2C7xUosLrBRWze0RF14ZRZ1DB9Ho97Q3XooLdU9jNQiUqfERFg1vqUcFKfvdGVLhwOwj9KkRF5SFTjwpW8rNj3WRRMWvZiVSigncW/pEk/HhBPcY+tOQmKVHAXd5PwlEDs9WGmPMgiEn3lqHmYs6ihjmL7JwHUERIZCncb34w2+ZP0OW4P8piQF6jgJUW9VtsO3PAghlLZsLGoOqQ157L35d2ZBmoHWmiHXnOTShQs0RQO9JQO/LIgIiQqOi4X+2IlbiAE2MsA+sK7lBH0r+uwGNsKcB+Npb6Dv6KVSzfGE7FkmnCj5srhIrlm8NtqDKt7xEF4CrWcKNnLTLqoXysxIVUsbRu648q1t2qWD4ZUMWSMBv0COpRX74DueIlWobh7jpIkA8UBhL1zQiDwaN8oJCYVJiPCFKbeyOtd0u24qQnLVqkCo02Jy12TWqT59gtmYTIMY5jng3FMR85poRjnWsP5DccieyHEW04kql8SjYcrcdbYGKJFuNMAdspWVqPppgaHvXoDMwmOsHiUSLGgH5P3aSk/n5PTshCpu9pPStlmqAexfwfzlEJCmqdk4CmpjnoMXGFwyOo5iARP9EqR1rWh6wkg0dmAgiGFYZIkgYNJZgSoQSEwdBZ0rCQGLWzjxO6kNElC/V+7RSlMRizHKgh9X4LM9N0A/UojFk2+R8U1DLzgLTK/gdVEWRm46DWOET6PywMJDw+CIOh8/9hIaHc6aKT8cAJXUjjAQfdaKdnjcJ44EANqmfpPFdnmqAehfHA6UWgoFbuQVNtPLAZHZAqgsysGdQaQYwHtvc7KAywhFxD48EfMhglGP8xJuOBFbqQxoODkQfd9KxxGA8sqCH1LAcjD7qBehzGA6sXgYLa4TCM1VGXG6hTujeqo0pPZIfqqOpWtu+55zSxcetkFs9hHsRObVDXQd26aWAPYorDVE8T9WY+AwU2w08aUy7zIHbmg0pMSbijtWreIdsvWkl6pYN5dZo4OdgcZMi24ZYj4QlEGAzdvAMUElQqjdPJwQldwPEHlmBQDEdatAfRydEZ1AagPSgz6wdBjU6Oq0HNTvCCBDV1sKBBKmuQWnTaU8MgnTliHqtvASMzbOp+1RYuBwayBYyrsxt7coWzWrSAYbuyghbOuhJpvYN6dtwb8xaUeHZcbMuqi2dnyCpJF+unNfTsuEMmto17+iIndCHTV7QevzhNI3gUnh0O1JCRfiqrENTagHocnh1WLwIFtYS7UqvCWdCw8AyHUmpiPLAFIqAxwBnWT2toPLCFs7CQUO500cl44IQuZFh4JuGxQT0LjYfOoIaMoM1G7Wzgygog4zEznZ0NGI8ZJB4zZCNT+t1a4nGi+1d7e1399y8uMxZy//IkcvW06s4Lag14El4UNBCH6M4LCwN0F+noJyBDQkLCdXS/ej8ndCH9BJ6ECwb1LN20f/31LA7UoHoWOr90A/Uogoxsd15YUGMrRN1APQqLmFP2AUFt0yGrWBMhXRPhVyfrNRG20bXxgzTHqN6PHOvGMQLFsdPXT8R6EiT+9GY9+RIuK4ya6GM3AURNODwKUob7KzHEqiqN8KjFOEJOvQPF471VVYEmRvpYVaVJwIPNHgb1bvtYVaVhwIOtqoKFxKgTnTihCxjwsKl3Q0sVaaJutDEEPDhQQ7rRDGwCpRuoRxHwmA2Y7WsbOjtXpgnqUQQ8OGUfFNS6z9jk/Fe+nHKmwiK2DawR08Qi5txGkjBQs0hwxqaGFjGXAggKiVHP2OSErgdJWkws0U7PGoNFzIEasH7INnSuZ5soqMdgPHB6ESSoie7GA1cdDGk8EDQeNDEeuD4jkJoiQeNBR+OBrbsEhcSojQdO6EIaDwSNB+30rDEYDxyoQfUsifA7ghqNh856ESSoTcwN1QjOWuQqczkLgLmhtqlz5fHk8KhFrjIXmQXFo0iTdeOsIl4DmO4/h4R+8Km0qh7zC4i5eztSgn6e/7Qq/v36Fmx2+b2m8fUtC7f7AsWm8ZzTM//nz/dduKdflb9m+W3ljdyKyImbMQhvcKwqZaqztzpF7cY4XGaXrEaR6dMvHo0HhZ6oC0YQ8QTYUeJ6MnmFsc7ox3ReEHWeHdLwHEdl2ch670oamjZDQ3KJxZwLQT1/FUgDwkyg+yRgqSliqa2EpXwA4XG3O67gai0jHyW1DK+dj5bZFx+p50NLNQNtufHYcpBZZBbm+yKoAaKbPU5RyA/TpFCST5/9XIDst2RRxEi+/h8=&lt;/diagram&gt;&lt;/mxfile&gt;">
+    <defs/>
+    <g>
+        <path d="M 775 150 L 775 110" fill="none" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" stroke-dasharray="3 3" pointer-events="stroke"/>
+        <path d="M 845 150 L 845 140 Q 845 130 835 130 L 785 130 Q 775 130 775 120 L 775 110" fill="none" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" stroke-dasharray="3 3" pointer-events="stroke"/>
+        <path d="M 915 150 L 915 140 Q 915 130 905 130 L 785 130 Q 775 130 775 120 L 775 110" fill="none" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" stroke-dasharray="3 3" pointer-events="stroke"/>
+        <path d="M 550 160 Q 550 135 475 135 Q 400 135 400 110" fill="none" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" stroke-dasharray="3 3" pointer-events="stroke"/>
+        <rect x="120" y="220" width="60" height="40" fill="#f5f5f5" stroke="#666666" pointer-events="all"/>
+        <rect x="110" y="220" width="60" height="40" fill="#f5f5f5" stroke="#666666" pointer-events="all"/>
+        <path d="M 380 150 L 380 105" fill="none" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" stroke-dasharray="3 3" pointer-events="stroke"/>
+        <path d="M 360 210 L 345.21 270.15" fill="none" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" stroke-dasharray="3 3" pointer-events="stroke"/>
+        <path d="M 395 210 L 407.82 270.25" fill="none" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" stroke-dasharray="3 3" pointer-events="stroke"/>
+        <path d="M 360 160 Q 360 150 310 150 Q 260 150 260 165 Q 260 180 188.12 180" fill="none" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" stroke-dasharray="3 3" pointer-events="stroke"/>
+        <path d="M 181.12 180 L 188.12 177.67 L 188.12 182.33 Z" fill="rgb(0, 0, 0)" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="all"/>
+        <rect x="340" y="160" width="80" height="40" fill="rgb(255, 255, 255)" stroke="rgb(0, 0, 0)" pointer-events="all"/>
+        <g transform="translate(-0.5 -0.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: 180px; margin-left: 341px;">
+                        <div data-drawio-colors="color: rgb(0, 0, 0); " style="box-sizing: border-box; font-size: 0px; text-align: center;">
+                            <div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; white-space: normal; overflow-wrap: normal;">
+                                Extension Instance
+                            </div>
+                        </div>
+                    </div>
+                </foreignObject>
+                <text x="380" y="184" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="12px" text-anchor="middle">
+                    Extension Ins...
+                </text>
+            </switch>
+        </g>
+        <path d="M 100 200 L 100 140" fill="none" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="stroke"/>
+        <path d="M 132.77 160 L 167.07 139.07" fill="none" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="stroke"/>
+        <path d="M 173.05 135.42 L 168.29 141.06 L 165.85 137.08 Z" fill="rgb(0, 0, 0)" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="all"/>
+        <rect x="20" y="160" width="160" height="40" fill="rgb(255, 255, 255)" stroke="rgb(0, 0, 0)" pointer-events="all"/>
+        <g transform="translate(-0.5 -0.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: 158px; height: 1px; padding-top: 180px; margin-left: 21px;">
+                        <div data-drawio-colors="color: rgb(0, 0, 0); " style="box-sizing: border-box; font-size: 0px; text-align: center;">
+                            <div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; white-space: normal; overflow-wrap: normal;">
+                                Extension
+                            </div>
+                        </div>
+                    </div>
+                </foreignObject>
+                <text x="100" y="184" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="12px" text-anchor="middle">
+                    Extension
+                </text>
+            </switch>
+        </g>
+        <rect x="70" y="100" width="60" height="40" fill="#f5f5f5" stroke="#666666" pointer-events="all"/>
+        <g transform="translate(-0.5 -0.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: 58px; height: 1px; padding-top: 120px; margin-left: 71px;">
+                        <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;">
+                                Output
+                            </div>
+                        </div>
+                    </div>
+                </foreignObject>
+                <text x="100" y="124" fill="#333333" font-family="Helvetica" font-size="12px" text-anchor="middle">
+                    Output
+                </text>
+            </switch>
+        </g>
+        <path d="M 50 220 L 50 200" fill="none" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="stroke"/>
+        <rect x="20" y="220" width="60" height="40" fill="#f5f5f5" stroke="#666666" pointer-events="all"/>
+        <g transform="translate(-0.5 -0.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: 58px; height: 1px; padding-top: 240px; margin-left: 21px;">
+                        <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;">
+                                Input 1
+                            </div>
+                        </div>
+                    </div>
+                </foreignObject>
+                <text x="50" y="244" fill="#333333" font-family="Helvetica" font-size="12px" text-anchor="middle">
+                    Input 1
+                </text>
+            </switch>
+        </g>
+        <path d="M 140 220 L 140 200" fill="none" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="stroke"/>
+        <rect x="100" y="220" width="60" height="40" fill="#f5f5f5" stroke="#666666" pointer-events="all"/>
+        <g transform="translate(-0.5 -0.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: 58px; height: 1px; padding-top: 240px; margin-left: 101px;">
+                        <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;">
+                                Input 2
+                            </div>
+                        </div>
+                    </div>
+                </foreignObject>
+                <text x="130" y="244" fill="#333333" font-family="Helvetica" font-size="12px" text-anchor="middle">
+                    Input 2
+                </text>
+            </switch>
+        </g>
+        <rect x="0" y="390" width="10" height="10" fill="#dae8fc" stroke="#6c8ebf" pointer-events="all"/>
+        <rect x="20" y="390" width="100" height="10" fill="none" stroke="none" pointer-events="all"/>
+        <g transform="translate(-0.5 -0.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 flex-start; width: 98px; height: 1px; padding-top: 395px; margin-left: 22px;">
+                        <div data-drawio-colors="color: rgb(0, 0, 0); " style="box-sizing: border-box; font-size: 0px; text-align: left;">
+                            <div style="display: inline-block; font-size: 10px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; white-space: normal; overflow-wrap: normal;">
+                                React Component
+                            </div>
+                        </div>
+                    </div>
+                </foreignObject>
+                <text x="22" y="398" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="10px">
+                    React Component
+                </text>
+            </switch>
+        </g>
+        <rect x="0" y="410" width="10" height="10" fill="#fff2cc" stroke="#d6b656" pointer-events="all"/>
+        <rect x="20" y="410" width="100" height="10" fill="none" stroke="none" pointer-events="all"/>
+        <g transform="translate(-0.5 -0.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 flex-start; width: 98px; height: 1px; padding-top: 415px; margin-left: 22px;">
+                        <div data-drawio-colors="color: rgb(0, 0, 0); " style="box-sizing: border-box; font-size: 0px; text-align: left;">
+                            <div style="display: inline-block; font-size: 10px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; white-space: normal; overflow-wrap: normal;">
+                                Route Path
+                            </div>
+                        </div>
+                    </div>
+                </foreignObject>
+                <text x="22" y="418" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="10px">
+                    Route Path
+                </text>
+            </switch>
+        </g>
+        <rect x="0" y="430" width="10" height="10" fill="#d5e8d4" stroke="#82b366" pointer-events="all"/>
+        <rect x="20" y="430" width="100" height="10" fill="none" stroke="none" pointer-events="all"/>
+        <g transform="translate(-0.5 -0.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 flex-start; width: 98px; height: 1px; padding-top: 435px; margin-left: 22px;">
+                        <div data-drawio-colors="color: rgb(0, 0, 0); " style="box-sizing: border-box; font-size: 0px; text-align: left;">
+                            <div style="display: inline-block; font-size: 10px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; white-space: normal; overflow-wrap: normal;">
+                                Display Title
+                            </div>
+                        </div>
+                    </div>
+                </foreignObject>
+                <text x="22" y="438" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="10px">
+                    Display Title
+                </text>
+            </switch>
+        </g>
+        <rect x="370" y="150" width="20" height="10" fill="#f5f5f5" stroke="#666666" pointer-events="all"/>
+        <rect x="370" y="100" width="20" height="10" fill="#f5f5f5" stroke="#666666" pointer-events="all"/>
+        <path d="M 450 140 L 470 140 L 480 148 L 480 220 L 440 220 L 440 148 Z" fill="rgb(255, 255, 255)" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" transform="rotate(90,460,180)" pointer-events="all"/>
+        <g transform="translate(-0.5 -0.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: 180px; margin-left: 421px;">
+                        <div data-drawio-colors="color: rgb(0, 0, 0); " style="box-sizing: border-box; font-size: 0px; text-align: center;">
+                            <div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; white-space: normal; overflow-wrap: normal;">
+                                Configuration
+                            </div>
+                        </div>
+                    </div>
+                </foreignObject>
+                <text x="460" y="184" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="12px" text-anchor="middle">
+                    Configuration
+                </text>
+            </switch>
+        </g>
+        <rect x="350" y="200" width="20" height="10" fill="#f5f5f5" stroke="#666666" pointer-events="all"/>
+        <rect x="380" y="200" width="30" height="10" fill="#f5f5f5" stroke="#666666" pointer-events="all"/>
+        <rect x="370" y="80" width="40" height="20" fill="rgb(255, 255, 255)" stroke="rgb(0, 0, 0)" pointer-events="all"/>
+        <g transform="translate(-0.5 -0.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: 38px; height: 1px; padding-top: 90px; margin-left: 371px;">
+                        <div data-drawio-colors="color: rgb(0, 0, 0); " style="box-sizing: border-box; font-size: 0px; text-align: center;">
+                            <div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; white-space: normal; overflow-wrap: normal;">
+                                Parent
+                            </div>
+                        </div>
+                    </div>
+                </foreignObject>
+                <text x="390" y="94" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="12px" text-anchor="middle">
+                    Parent
+                </text>
+            </switch>
+        </g>
+        <path d="M 410 90 L 420 90 L 430 98 L 430 100 L 400 100 L 400 98 Z" fill="rgb(255, 255, 255)" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" transform="rotate(90,415,95)" pointer-events="all"/>
+        <path d="M 180 100 L 260 100 L 270 110 L 270 130 L 260 140 L 180 140 L 170 130 L 170 110 Z" fill="rgb(255, 255, 255)" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="all"/>
+        <g transform="translate(-0.5 -0.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: 98px; height: 1px; padding-top: 120px; margin-left: 171px;">
+                        <div data-drawio-colors="color: rgb(0, 0, 0); " style="box-sizing: border-box; font-size: 0px; text-align: center;">
+                            <div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; white-space: normal; overflow-wrap: normal;">
+                                <span style="">
+                                    Configuration Schema
+                                </span>
+                            </div>
+                        </div>
+                    </div>
+                </foreignObject>
+                <text x="220" y="124" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="12px" text-anchor="middle">
+                    Configuration Sc...
+                </text>
+            </switch>
+        </g>
+        <path d="M 320 170 L 340 170 L 350 178 L 350 190 L 310 190 L 310 178 Z" fill="rgb(255, 255, 255)" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" transform="translate(0,180)scale(1,-1)translate(0,-180)rotate(-90,330,180)" pointer-events="all"/>
+        <g transform="translate(-0.5 -0.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: 18px; height: 1px; padding-top: 180px; margin-left: 321px;">
+                        <div data-drawio-colors="color: rgb(0, 0, 0); " style="box-sizing: border-box; font-size: 0px; text-align: center;">
+                            <div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; white-space: normal; overflow-wrap: normal;">
+                                ID
+                            </div>
+                        </div>
+                    </div>
+                </foreignObject>
+                <text x="330" y="184" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="12px" text-anchor="middle">
+                    ID
+                </text>
+            </switch>
+        </g>
+        <path d="M 360 90 L 370 90 L 380 98 L 380 100 L 350 100 L 350 98 Z" fill="rgb(255, 255, 255)" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" transform="translate(0,95)scale(1,-1)translate(0,-95)rotate(-90,365,95)" pointer-events="all"/>
+        <ellipse cx="475" cy="295" rx="95" ry="35" fill="rgb(255, 255, 255)" stroke="rgb(0, 0, 0)" stroke-dasharray="3 3" pointer-events="all"/>
+        <g transform="translate(-0.5 -0.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 flex-end; justify-content: unsafe center; width: 188px; height: 1px; padding-top: 257px; margin-left: 381px;">
+                        <div data-drawio-colors="color: rgb(0, 0, 0); " style="box-sizing: border-box; font-size: 0px; text-align: center;">
+                            <div style="display: inline-block; font-size: 10px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; white-space: normal; overflow-wrap: normal;">
+                                Multi Input Attachments
+                            </div>
+                        </div>
+                    </div>
+                </foreignObject>
+                <text x="475" y="257" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="10px" text-anchor="middle">
+                    Multi Input Attachments
+                </text>
+            </switch>
+        </g>
+        <rect x="410" y="290" width="50" height="20" fill="rgb(255, 255, 255)" stroke="rgb(0, 0, 0)" pointer-events="all"/>
+        <g transform="translate(-0.5 -0.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: 48px; height: 1px; padding-top: 300px; margin-left: 411px;">
+                        <div data-drawio-colors="color: rgb(0, 0, 0); " style="box-sizing: border-box; font-size: 0px; text-align: center;">
+                            <div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; white-space: normal; overflow-wrap: normal;">
+                                Child
+                            </div>
+                        </div>
+                    </div>
+                </foreignObject>
+                <text x="435" y="304" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="12px" text-anchor="middle">
+                    Child
+                </text>
+            </switch>
+        </g>
+        <path d="M 460 290 L 470 290 L 480 298 L 480 300 L 450 300 L 450 298 Z" fill="rgb(255, 255, 255)" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" transform="rotate(90,465,295)" pointer-events="all"/>
+        <rect x="410" y="280" width="50" height="10" fill="#f5f5f5" stroke="#666666" pointer-events="all"/>
+        <rect x="490" y="290" width="50" height="20" fill="rgb(255, 255, 255)" stroke="rgb(0, 0, 0)" pointer-events="all"/>
+        <g transform="translate(-0.5 -0.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: 48px; height: 1px; padding-top: 300px; margin-left: 491px;">
+                        <div data-drawio-colors="color: rgb(0, 0, 0); " style="box-sizing: border-box; font-size: 0px; text-align: center;">
+                            <div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; white-space: normal; overflow-wrap: normal;">
+                                Child
+                            </div>
+                        </div>
+                    </div>
+                </foreignObject>
+                <text x="515" y="304" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="12px" text-anchor="middle">
+                    Child
+                </text>
+            </switch>
+        </g>
+        <path d="M 540 290 L 550 290 L 560 298 L 560 300 L 530 300 L 530 298 Z" fill="rgb(255, 255, 255)" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" transform="rotate(90,545,295)" pointer-events="all"/>
+        <rect x="490" y="280" width="50" height="10" fill="#f5f5f5" stroke="#666666" pointer-events="all"/>
+        <path d="M 400 290 L 410 290 L 420 298 L 420 300 L 390 300 L 390 298 Z" fill="rgb(255, 255, 255)" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" transform="translate(0,295)scale(1,-1)translate(0,-295)rotate(-90,405,295)" pointer-events="all"/>
+        <path d="M 480 290 L 490 290 L 500 298 L 500 300 L 470 300 L 470 298 Z" fill="rgb(255, 255, 255)" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" transform="translate(0,295)scale(1,-1)translate(0,-295)rotate(-90,485,295)" pointer-events="all"/>
+        <path d="M 500 280 L 505 275 L 505 275 L 510 280 L 510 280 L 510 280 L 505 280 L 500 280 Z" fill="#dae8fc" stroke="#6c8ebf" stroke-miterlimit="10" pointer-events="all"/>
+        <path d="M 510 280 L 515 275 L 515 275 L 520 280 L 520 280 L 520 280 L 515 280 L 510 280 Z" fill="#fff2cc" stroke="#d6b656" stroke-miterlimit="10" pointer-events="all"/>
+        <path d="M 520 280 L 525 275 L 525 275 L 530 280 L 530 280 L 530 280 L 525 280 L 520 280 Z" fill="#d5e8d4" stroke="#82b366" stroke-miterlimit="10" pointer-events="all"/>
+        <path d="M 420 280 L 425 275 L 425 275 L 430 280 L 430 280 L 430 280 L 425 280 L 420 280 Z" fill="#dae8fc" stroke="#6c8ebf" stroke-miterlimit="10" pointer-events="all"/>
+        <path d="M 430 280 L 435 275 L 435 275 L 440 280 L 440 280 L 440 280 L 435 280 L 430 280 Z" fill="#fff2cc" stroke="#d6b656" stroke-miterlimit="10" pointer-events="all"/>
+        <path d="M 440 280 L 445 275 L 445 275 L 450 280 L 450 280 L 450 280 L 445 280 L 440 280 Z" fill="#d5e8d4" stroke="#82b366" stroke-miterlimit="10" pointer-events="all"/>
+        <ellipse cx="310" cy="295" rx="50" ry="35" fill="rgb(255, 255, 255)" stroke="rgb(0, 0, 0)" stroke-dasharray="3 3" pointer-events="all"/>
+        <g transform="translate(-0.5 -0.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 flex-end; justify-content: unsafe center; width: 98px; height: 1px; padding-top: 257px; margin-left: 261px;">
+                        <div data-drawio-colors="color: rgb(0, 0, 0); " style="box-sizing: border-box; font-size: 0px; text-align: center;">
+                            <div style="display: inline-block; font-size: 10px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; white-space: normal; overflow-wrap: normal;">
+                                Single Input Attachment
+                            </div>
+                        </div>
+                    </div>
+                </foreignObject>
+                <text x="310" y="257" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="10px" text-anchor="middle">
+                    Single Input Attachm...
+                </text>
+            </switch>
+        </g>
+        <rect x="290" y="290" width="40" height="20" fill="rgb(255, 255, 255)" stroke="rgb(0, 0, 0)" pointer-events="all"/>
+        <g transform="translate(-0.5 -0.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: 38px; height: 1px; padding-top: 300px; margin-left: 291px;">
+                        <div data-drawio-colors="color: rgb(0, 0, 0); " style="box-sizing: border-box; font-size: 0px; text-align: center;">
+                            <div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; white-space: normal; overflow-wrap: normal;">
+                                Child
+                            </div>
+                        </div>
+                    </div>
+                </foreignObject>
+                <text x="310" y="304" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="12px" text-anchor="middle">
+                    Child
+                </text>
+            </switch>
+        </g>
+        <path d="M 330 290 L 340 290 L 350 298 L 350 300 L 320 300 L 320 298 Z" fill="rgb(255, 255, 255)" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" transform="rotate(90,335,295)" pointer-events="all"/>
+        <rect x="290" y="280" width="40" height="10" fill="#f5f5f5" stroke="#666666" pointer-events="all"/>
+        <path d="M 280 290 L 290 290 L 300 298 L 300 300 L 270 300 L 270 298 Z" fill="rgb(255, 255, 255)" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" transform="translate(0,295)scale(1,-1)translate(0,-295)rotate(-90,285,295)" pointer-events="all"/>
+        <path d="M 300 280 L 305 275 L 305 275 L 310 280 L 310 280 L 310 280 L 305 280 L 300 280 Z" fill="#dae8fc" stroke="#6c8ebf" stroke-miterlimit="10" pointer-events="all"/>
+        <path d="M 310 280 L 315 275 L 315 275 L 320 280 L 320 280 L 320 280 L 315 280 L 310 280 Z" fill="#fff2cc" stroke="#d6b656" stroke-miterlimit="10" pointer-events="all"/>
+        <rect x="760" y="160" width="30" height="10" fill="rgb(255, 255, 255)" stroke="rgb(0, 0, 0)" pointer-events="all"/>
+        <path d="M 790 160 L 800 160 L 810 168 L 810 170 L 780 170 L 780 168 Z" fill="rgb(255, 255, 255)" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" transform="rotate(90,795,165)" pointer-events="all"/>
+        <path d="M 750 160 L 760 160 L 770 168 L 770 170 L 740 170 L 740 168 Z" fill="rgb(255, 255, 255)" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" transform="translate(0,165)scale(1,-1)translate(0,-165)rotate(-90,755,165)" pointer-events="all"/>
+        <path d="M 20 260 L 20 260 L 20 260 L 40 260 L 40 260 L 40 280 L 30 270 L 20 280 Z" fill="#dae8fc" stroke="#6c8ebf" stroke-miterlimit="10" pointer-events="all"/>
+        <path d="M 70 100 L 80 90 L 80 90 L 90 100 L 90 100 L 90 100 L 80 100 L 70 100 Z" fill="#dae8fc" stroke="#6c8ebf" stroke-miterlimit="10" pointer-events="all"/>
+        <rect x="760" y="150" width="30" height="10" fill="#f5f5f5" stroke="#666666" pointer-events="all"/>
+        <path d="M 770 150 L 775 145 L 775 145 L 780 150 L 780 150 L 780 150 L 775 150 L 770 150 Z" fill="#dae8fc" stroke="#6c8ebf" stroke-miterlimit="10" pointer-events="all"/>
+        <rect x="390" y="100" width="20" height="10" fill="#f5f5f5" stroke="#666666" pointer-events="all"/>
+        <path d="M 775 180 L 775 220" fill="none" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" stroke-dasharray="3 3" pointer-events="stroke"/>
+        <path d="M 775 180 L 775 190 Q 775 200 785 200 L 835 200 Q 845 200 845 210 L 845 220" fill="none" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" stroke-dasharray="3 3" pointer-events="stroke"/>
+        <path d="M 775 180 L 775 190 Q 775 200 765 200 L 715 200 Q 705 200 705 210 L 705 220" fill="none" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" stroke-dasharray="3 3" pointer-events="stroke"/>
+        <rect x="760" y="170" width="30" height="10" fill="#f5f5f5" stroke="#666666" pointer-events="all"/>
+        <path d="M 760 180 L 760 180 L 760 180 L 770 180 L 770 180 L 770 190 L 765 185 L 760 190 Z" fill="#dae8fc" stroke="#6c8ebf" stroke-miterlimit="10" pointer-events="all"/>
+        <path d="M 780 180 L 780 180 L 780 180 L 790 180 L 790 180 L 790 190 L 785 185 L 780 190 Z" fill="#fff2cc" stroke="#d6b656" stroke-miterlimit="10" pointer-events="all"/>
+        <path d="M 380 210 L 380 210 L 380 210 L 390 210 L 390 210 L 390 220 L 385 215 L 380 220 Z" fill="#dae8fc" stroke="#6c8ebf" stroke-miterlimit="10" pointer-events="all"/>
+        <path d="M 390 210 L 390 210 L 390 210 L 400 210 L 400 210 L 400 220 L 395 215 L 390 220 Z" fill="#fff2cc" stroke="#d6b656" stroke-miterlimit="10" pointer-events="all"/>
+        <path d="M 400 210 L 400 210 L 400 210 L 410 210 L 410 210 L 410 220 L 405 215 L 400 220 Z" fill="#d5e8d4" stroke="#82b366" stroke-miterlimit="10" pointer-events="all"/>
+        <path d="M 350 210 L 350 210 L 350 210 L 360 210 L 360 210 L 360 220 L 355 215 L 350 220 Z" fill="#dae8fc" stroke="#6c8ebf" stroke-miterlimit="10" pointer-events="all"/>
+        <path d="M 360 210 L 360 210 L 360 210 L 370 210 L 370 210 L 370 220 L 365 215 L 360 220 Z" fill="#fff2cc" stroke="#d6b656" stroke-miterlimit="10" pointer-events="all"/>
+        <path d="M 370 150 L 375 145 L 375 145 L 380 150 L 380 150 L 380 150 L 375 150 L 370 150 Z" fill="#dae8fc" stroke="#6c8ebf" stroke-miterlimit="10" pointer-events="all"/>
+        <path d="M 380 150 L 385 145 L 385 145 L 390 150 L 390 150 L 390 150 L 385 150 L 380 150 Z" fill="#fff2cc" stroke="#d6b656" stroke-miterlimit="10" pointer-events="all"/>
+        <path d="M 390 110 L 390 110 L 390 110 L 400 110 L 400 110 L 400 120 L 395 115 L 390 120 Z" fill="#dae8fc" stroke="#6c8ebf" stroke-miterlimit="10" pointer-events="all"/>
+        <path d="M 400 110 L 400 110 L 400 110 L 410 110 L 410 110 L 410 120 L 405 115 L 400 120 Z" fill="#d5e8d4" stroke="#82b366" stroke-miterlimit="10" pointer-events="all"/>
+        <path d="M 370 110 L 370 110 L 370 110 L 380 110 L 380 110 L 380 120 L 375 115 L 370 120 Z" fill="#dae8fc" stroke="#6c8ebf" stroke-miterlimit="10" pointer-events="all"/>
+        <path d="M 380 110 L 380 110 L 380 110 L 390 110 L 390 110 L 390 120 L 385 115 L 380 120 Z" fill="#fff2cc" stroke="#d6b656" stroke-miterlimit="10" pointer-events="all"/>
+        <rect x="530" y="170" width="40" height="20" fill="rgb(255, 255, 255)" stroke="rgb(0, 0, 0)" pointer-events="all"/>
+        <g transform="translate(-0.5 -0.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: 38px; height: 1px; padding-top: 180px; margin-left: 531px;">
+                        <div data-drawio-colors="color: rgb(0, 0, 0); " style="box-sizing: border-box; font-size: 0px; text-align: center;">
+                            <div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; white-space: normal; overflow-wrap: normal;">
+                                Other
+                            </div>
+                        </div>
+                    </div>
+                </foreignObject>
+                <text x="550" y="184" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="12px" text-anchor="middle">
+                    Other
+                </text>
+            </switch>
+        </g>
+        <path d="M 570 170 L 580 170 L 590 178 L 590 180 L 560 180 L 560 178 Z" fill="rgb(255, 255, 255)" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" transform="rotate(90,575,175)" pointer-events="all"/>
+        <rect x="530" y="160" width="40" height="10" fill="#f5f5f5" stroke="#666666" pointer-events="all"/>
+        <path d="M 520 170 L 530 170 L 540 178 L 540 180 L 510 180 L 510 178 Z" fill="rgb(255, 255, 255)" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" transform="translate(0,175)scale(1,-1)translate(0,-175)rotate(-90,525,175)" pointer-events="all"/>
+        <path d="M 540 160 L 545 155 L 545 155 L 550 160 L 550 160 L 550 160 L 545 160 L 540 160 Z" fill="#dae8fc" stroke="#6c8ebf" stroke-miterlimit="10" pointer-events="all"/>
+        <path d="M 550 160 L 555 155 L 555 155 L 560 160 L 560 160 L 560 160 L 555 160 L 550 160 Z" fill="#d5e8d4" stroke="#82b366" stroke-miterlimit="10" pointer-events="all"/>
+        <path d="M 110 100 L 120 90 L 120 90 L 130 100 L 130 100 L 130 100 L 120 100 L 110 100 Z" fill="#fff2cc" stroke="#d6b656" stroke-miterlimit="10" pointer-events="all"/>
+        <path d="M 60 260 L 60 260 L 60 260 L 80 260 L 80 260 L 80 280 L 70 270 L 60 280 Z" fill="#fff2cc" stroke="#d6b656" stroke-miterlimit="10" pointer-events="all"/>
+        <path d="M 100 260 L 100 260 L 100 260 L 120 260 L 120 260 L 120 280 L 110 270 L 100 280 Z" fill="#dae8fc" stroke="#6c8ebf" stroke-miterlimit="10" pointer-events="all"/>
+        <path d="M 130 260 L 130 260 L 130 260 L 150 260 L 150 260 L 150 280 L 140 270 L 130 280 Z" fill="#fff2cc" stroke="#d6b656" stroke-miterlimit="10" pointer-events="all"/>
+        <path d="M 160 260 L 160 260 L 160 260 L 180 260 L 180 260 L 180 280 L 170 270 L 160 280 Z" fill="#d5e8d4" stroke="#82b366" stroke-miterlimit="10" pointer-events="all"/>
+        <path d="M 100 60 Q 100 70 90 70 Q 80 70 80 80" fill="none" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" stroke-dasharray="3 3" pointer-events="stroke"/>
+        <rect x="60" y="40" width="80" height="20" fill="none" stroke="none" pointer-events="all"/>
+        <g transform="translate(-0.5 -0.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: 50px; margin-left: 61px;">
+                        <div data-drawio-colors="color: rgb(0, 0, 0); " style="box-sizing: border-box; font-size: 0px; text-align: center;">
+                            <div style="display: inline-block; font-size: 10px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; white-space: normal; overflow-wrap: normal;">
+                                Output Data
+                            </div>
+                        </div>
+                    </div>
+                </foreignObject>
+                <text x="100" y="53" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="10px" text-anchor="middle">
+                    Output Data
+                </text>
+            </switch>
+        </g>
+        <path d="M 100 60 Q 100 70 110 70 Q 120 70 120 80" fill="none" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" stroke-dasharray="3 3" pointer-events="stroke"/>
+        <rect x="50" y="320" width="80" height="20" fill="none" stroke="none" pointer-events="all"/>
+        <g transform="translate(-0.5 -0.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: 330px; margin-left: 51px;">
+                        <div data-drawio-colors="color: rgb(0, 0, 0); " style="box-sizing: border-box; font-size: 0px; text-align: center;">
+                            <div style="display: inline-block; font-size: 10px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; white-space: normal; overflow-wrap: normal;">
+                                Input Data
+                            </div>
+                        </div>
+                    </div>
+                </foreignObject>
+                <text x="90" y="333" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="10px" text-anchor="middle">
+                    Input Data
+                </text>
+            </switch>
+        </g>
+        <path d="M 70 320 Q 70 300 50 300 Q 30 300 30 280" fill="none" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" stroke-dasharray="3 3" pointer-events="stroke"/>
+        <path d="M 70 320 Q 70 320 70 280" fill="none" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" stroke-dasharray="3 3" pointer-events="stroke"/>
+        <path d="M 110 320 Q 110 320 110 280" fill="none" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" stroke-dasharray="3 3" pointer-events="stroke"/>
+        <path d="M 110 320 Q 110 300 125 300 Q 140 300 140 280" fill="none" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" stroke-dasharray="3 3" pointer-events="stroke"/>
+        <path d="M 110 320 Q 110 300 140 300 Q 170 300 170 280" fill="none" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" stroke-dasharray="3 3" pointer-events="stroke"/>
+        <rect x="760" y="80" width="30" height="20" fill="rgb(255, 255, 255)" stroke="rgb(0, 0, 0)" pointer-events="all"/>
+        <g transform="translate(-0.5 -0.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: 28px; height: 1px; padding-top: 90px; margin-left: 761px;">
+                        <div data-drawio-colors="color: rgb(0, 0, 0); " style="box-sizing: border-box; font-size: 0px; text-align: center;">
+                            <div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; white-space: normal; overflow-wrap: normal;">
+                                Root
+                            </div>
+                        </div>
+                    </div>
+                </foreignObject>
+                <text x="775" y="94" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="12px" text-anchor="middle">
+                    Root
+                </text>
+            </switch>
+        </g>
+        <path d="M 790 90 L 800 90 L 810 98 L 810 100 L 780 100 L 780 98 Z" fill="rgb(255, 255, 255)" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" transform="rotate(90,795,95)" pointer-events="all"/>
+        <path d="M 750 90 L 760 90 L 770 98 L 770 100 L 740 100 L 740 98 Z" fill="rgb(255, 255, 255)" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" transform="translate(0,95)scale(1,-1)translate(0,-95)rotate(-90,755,95)" pointer-events="all"/>
+        <rect x="760" y="100" width="30" height="10" fill="#f5f5f5" stroke="#666666" pointer-events="all"/>
+        <path d="M 770 110 L 770 110 L 770 110 L 780 110 L 780 110 L 780 120 L 775 115 L 770 120 Z" fill="#dae8fc" stroke="#6c8ebf" stroke-miterlimit="10" pointer-events="all"/>
+        <rect x="830" y="160" width="30" height="20" fill="rgb(255, 255, 255)" stroke="rgb(0, 0, 0)" pointer-events="all"/>
+        <path d="M 860 160 L 870 160 L 880 168 L 880 170 L 850 170 L 850 168 Z" fill="rgb(255, 255, 255)" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" transform="rotate(90,865,165)" pointer-events="all"/>
+        <path d="M 820 160 L 830 160 L 840 168 L 840 170 L 810 170 L 810 168 Z" fill="rgb(255, 255, 255)" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" transform="translate(0,165)scale(1,-1)translate(0,-165)rotate(-90,825,165)" pointer-events="all"/>
+        <rect x="830" y="150" width="30" height="10" fill="#f5f5f5" stroke="#666666" pointer-events="all"/>
+        <path d="M 840 150 L 845 145 L 845 145 L 850 150 L 850 150 L 850 150 L 845 150 L 840 150 Z" fill="#dae8fc" stroke="#6c8ebf" stroke-miterlimit="10" pointer-events="all"/>
+        <rect x="900" y="160" width="30" height="20" fill="rgb(255, 255, 255)" stroke="rgb(0, 0, 0)" pointer-events="all"/>
+        <path d="M 930 160 L 940 160 L 950 168 L 950 170 L 920 170 L 920 168 Z" fill="rgb(255, 255, 255)" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" transform="rotate(90,935,165)" pointer-events="all"/>
+        <path d="M 890 160 L 900 160 L 910 168 L 910 170 L 880 170 L 880 168 Z" fill="rgb(255, 255, 255)" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" transform="translate(0,165)scale(1,-1)translate(0,-165)rotate(-90,895,165)" pointer-events="all"/>
+        <rect x="900" y="150" width="30" height="10" fill="#f5f5f5" stroke="#666666" pointer-events="all"/>
+        <path d="M 910 150 L 915 145 L 915 145 L 920 150 L 920 150 L 920 150 L 915 150 L 910 150 Z" fill="#dae8fc" stroke="#6c8ebf" stroke-miterlimit="10" pointer-events="all"/>
+        <rect x="760" y="230" width="30" height="10" fill="rgb(255, 255, 255)" stroke="rgb(0, 0, 0)" pointer-events="all"/>
+        <path d="M 790 230 L 800 230 L 810 238 L 810 240 L 780 240 L 780 238 Z" fill="rgb(255, 255, 255)" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" transform="rotate(90,795,235)" pointer-events="all"/>
+        <path d="M 750 230 L 760 230 L 770 238 L 770 240 L 740 240 L 740 238 Z" fill="rgb(255, 255, 255)" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" transform="translate(0,235)scale(1,-1)translate(0,-235)rotate(-90,755,235)" pointer-events="all"/>
+        <rect x="760" y="220" width="30" height="10" fill="#f5f5f5" stroke="#666666" pointer-events="all"/>
+        <path d="M 775 250 L 775 290" fill="none" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" stroke-dasharray="3 3" pointer-events="stroke"/>
+        <path d="M 775 250 L 775 260 Q 775 270 785 270 L 835 270 Q 845 270 845 280 L 845 290" fill="none" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" stroke-dasharray="3 3" pointer-events="stroke"/>
+        <path d="M 775 250 L 775 260 Q 775 270 765 270 L 715 270 Q 705 270 705 280 L 705 290" fill="none" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" stroke-dasharray="3 3" pointer-events="stroke"/>
+        <rect x="760" y="240" width="30" height="10" fill="#f5f5f5" stroke="#666666" pointer-events="all"/>
+        <path d="M 760 250 L 760 250 L 760 250 L 770 250 L 770 250 L 770 260 L 765 255 L 760 260 Z" fill="#dae8fc" stroke="#6c8ebf" stroke-miterlimit="10" pointer-events="all"/>
+        <path d="M 770 250 L 770 250 L 770 250 L 780 250 L 780 250 L 780 260 L 775 255 L 770 260 Z" fill="#fff2cc" stroke="#d6b656" stroke-miterlimit="10" pointer-events="all"/>
+        <path d="M 760 220 L 765 215 L 765 215 L 770 220 L 770 220 L 770 220 L 765 220 L 760 220 Z" fill="#dae8fc" stroke="#6c8ebf" stroke-miterlimit="10" pointer-events="all"/>
+        <path d="M 780 220 L 785 215 L 785 215 L 790 220 L 790 220 L 790 220 L 785 220 L 780 220 Z" fill="#fff2cc" stroke="#d6b656" stroke-miterlimit="10" pointer-events="all"/>
+        <path d="M 780 250 L 780 250 L 780 250 L 790 250 L 790 250 L 790 260 L 785 255 L 780 260 Z" fill="#d5e8d4" stroke="#82b366" stroke-miterlimit="10" pointer-events="all"/>
+        <rect x="830" y="230" width="30" height="20" fill="rgb(255, 255, 255)" stroke="rgb(0, 0, 0)" pointer-events="all"/>
+        <path d="M 860 230 L 870 230 L 880 238 L 880 240 L 850 240 L 850 238 Z" fill="rgb(255, 255, 255)" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" transform="rotate(90,865,235)" pointer-events="all"/>
+        <path d="M 820 230 L 830 230 L 840 238 L 840 240 L 810 240 L 810 238 Z" fill="rgb(255, 255, 255)" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" transform="translate(0,235)scale(1,-1)translate(0,-235)rotate(-90,825,235)" pointer-events="all"/>
+        <rect x="830" y="220" width="30" height="10" fill="#f5f5f5" stroke="#666666" pointer-events="all"/>
+        <path d="M 830 220 L 835 215 L 835 215 L 840 220 L 840 220 L 840 220 L 835 220 L 830 220 Z" fill="#dae8fc" stroke="#6c8ebf" stroke-miterlimit="10" pointer-events="all"/>
+        <path d="M 840 220 L 845 215 L 845 215 L 850 220 L 850 220 L 850 220 L 845 220 L 840 220 Z" fill="#fff2cc" stroke="#d6b656" stroke-miterlimit="10" pointer-events="all"/>
+        <rect x="900" y="230" width="30" height="10" fill="rgb(255, 255, 255)" stroke="rgb(0, 0, 0)" pointer-events="all"/>
+        <path d="M 930 230 L 940 230 L 950 238 L 950 240 L 920 240 L 920 238 Z" fill="rgb(255, 255, 255)" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" transform="rotate(90,935,235)" pointer-events="all"/>
+        <path d="M 890 230 L 900 230 L 910 238 L 910 240 L 880 240 L 880 238 Z" fill="rgb(255, 255, 255)" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" transform="translate(0,235)scale(1,-1)translate(0,-235)rotate(-90,895,235)" pointer-events="all"/>
+        <rect x="900" y="220" width="30" height="10" fill="#f5f5f5" stroke="#666666" pointer-events="all"/>
+        <path d="M 900 220 L 905 215 L 905 215 L 910 220 L 910 220 L 910 220 L 905 220 L 900 220 Z" fill="#dae8fc" stroke="#6c8ebf" stroke-miterlimit="10" pointer-events="all"/>
+        <path d="M 920 220 L 925 215 L 925 215 L 930 220 L 930 220 L 930 220 L 925 220 L 920 220 Z" fill="#fff2cc" stroke="#d6b656" stroke-miterlimit="10" pointer-events="all"/>
+        <rect x="970" y="230" width="30" height="10" fill="rgb(255, 255, 255)" stroke="rgb(0, 0, 0)" pointer-events="all"/>
+        <path d="M 1000 230 L 1010 230 L 1020 238 L 1020 240 L 990 240 L 990 238 Z" fill="rgb(255, 255, 255)" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" transform="rotate(90,1005,235)" pointer-events="all"/>
+        <path d="M 960 230 L 970 230 L 980 238 L 980 240 L 950 240 L 950 238 Z" fill="rgb(255, 255, 255)" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" transform="translate(0,235)scale(1,-1)translate(0,-235)rotate(-90,965,235)" pointer-events="all"/>
+        <rect x="970" y="220" width="30" height="10" fill="#f5f5f5" stroke="#666666" pointer-events="all"/>
+        <path d="M 970 220 L 975 215 L 975 215 L 980 220 L 980 220 L 980 220 L 975 220 L 970 220 Z" fill="#dae8fc" stroke="#6c8ebf" stroke-miterlimit="10" pointer-events="all"/>
+        <path d="M 990 220 L 995 215 L 995 215 L 1000 220 L 1000 220 L 1000 220 L 995 220 L 990 220 Z" fill="#fff2cc" stroke="#d6b656" stroke-miterlimit="10" pointer-events="all"/>
+        <path d="M 775 180 L 775 190 Q 775 200 785 200 L 905 200 Q 915 200 915 210 L 915 220" fill="none" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" stroke-dasharray="3 3" pointer-events="stroke"/>
+        <path d="M 775 180 L 775 190 Q 775 200 785 200 L 975 200 Q 985 200 985 210 L 985 220" fill="none" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" stroke-dasharray="3 3" pointer-events="stroke"/>
+        <rect x="760" y="300" width="30" height="20" fill="rgb(255, 255, 255)" stroke="rgb(0, 0, 0)" pointer-events="all"/>
+        <path d="M 790 300 L 800 300 L 810 308 L 810 310 L 780 310 L 780 308 Z" fill="rgb(255, 255, 255)" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" transform="rotate(90,795,305)" pointer-events="all"/>
+        <path d="M 750 300 L 760 300 L 770 308 L 770 310 L 740 310 L 740 308 Z" fill="rgb(255, 255, 255)" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" transform="translate(0,305)scale(1,-1)translate(0,-305)rotate(-90,755,305)" pointer-events="all"/>
+        <rect x="760" y="290" width="30" height="10" fill="#f5f5f5" stroke="#666666" pointer-events="all"/>
+        <path d="M 760 290 L 765 285 L 765 285 L 770 290 L 770 290 L 770 290 L 765 290 L 760 290 Z" fill="#dae8fc" stroke="#6c8ebf" stroke-miterlimit="10" pointer-events="all"/>
+        <path d="M 770 290 L 775 285 L 775 285 L 780 290 L 780 290 L 780 290 L 775 290 L 770 290 Z" fill="#fff2cc" stroke="#d6b656" stroke-miterlimit="10" pointer-events="all"/>
+        <path d="M 915 250 L 915 290" fill="none" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" stroke-dasharray="3 3" pointer-events="stroke"/>
+        <rect x="900" y="240" width="30" height="10" fill="#f5f5f5" stroke="#666666" pointer-events="all"/>
+        <path d="M 910 250 L 910 250 L 910 250 L 920 250 L 920 250 L 920 260 L 915 255 L 910 260 Z" fill="#dae8fc" stroke="#6c8ebf" stroke-miterlimit="10" pointer-events="all"/>
+        <rect x="690" y="230" width="30" height="20" fill="rgb(255, 255, 255)" stroke="rgb(0, 0, 0)" pointer-events="all"/>
+        <path d="M 720 230 L 730 230 L 740 238 L 740 240 L 710 240 L 710 238 Z" fill="rgb(255, 255, 255)" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" transform="rotate(90,725,235)" pointer-events="all"/>
+        <path d="M 680 230 L 690 230 L 700 238 L 700 240 L 670 240 L 670 238 Z" fill="rgb(255, 255, 255)" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" transform="translate(0,235)scale(1,-1)translate(0,-235)rotate(-90,685,235)" pointer-events="all"/>
+        <rect x="690" y="220" width="30" height="10" fill="#f5f5f5" stroke="#666666" pointer-events="all"/>
+        <path d="M 690 220 L 695 215 L 695 215 L 700 220 L 700 220 L 700 220 L 695 220 L 690 220 Z" fill="#dae8fc" stroke="#6c8ebf" stroke-miterlimit="10" pointer-events="all"/>
+        <path d="M 710 220 L 715 215 L 715 215 L 720 220 L 720 220 L 720 220 L 715 220 L 710 220 Z" fill="#fff2cc" stroke="#d6b656" stroke-miterlimit="10" pointer-events="all"/>
+        <rect x="900" y="300" width="30" height="20" fill="rgb(255, 255, 255)" stroke="rgb(0, 0, 0)" pointer-events="all"/>
+        <path d="M 930 300 L 940 300 L 950 308 L 950 310 L 920 310 L 920 308 Z" fill="rgb(255, 255, 255)" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" transform="rotate(90,935,305)" pointer-events="all"/>
+        <path d="M 890 300 L 900 300 L 910 308 L 910 310 L 880 310 L 880 308 Z" fill="rgb(255, 255, 255)" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" transform="translate(0,305)scale(1,-1)translate(0,-305)rotate(-90,895,305)" pointer-events="all"/>
+        <rect x="900" y="290" width="30" height="10" fill="#f5f5f5" stroke="#666666" pointer-events="all"/>
+        <path d="M 900 290 L 905 285 L 905 285 L 910 290 L 910 290 L 910 290 L 905 290 L 900 290 Z" fill="#dae8fc" stroke="#6c8ebf" stroke-miterlimit="10" pointer-events="all"/>
+        <rect x="970" y="240" width="30" height="10" fill="#f5f5f5" stroke="#666666" pointer-events="all"/>
+        <path d="M 980 250 L 980 250 L 980 250 L 990 250 L 990 250 L 990 260 L 985 255 L 980 260 Z" fill="#dae8fc" stroke="#6c8ebf" stroke-miterlimit="10" pointer-events="all"/>
+        <path d="M 780 290 L 785 285 L 785 285 L 790 290 L 790 290 L 790 290 L 785 290 L 780 290 Z" fill="#d5e8d4" stroke="#82b366" stroke-miterlimit="10" pointer-events="all"/>
+        <rect x="830" y="300" width="30" height="10" fill="rgb(255, 255, 255)" stroke="rgb(0, 0, 0)" pointer-events="all"/>
+        <path d="M 860 300 L 870 300 L 880 308 L 880 310 L 850 310 L 850 308 Z" fill="rgb(255, 255, 255)" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" transform="rotate(90,865,305)" pointer-events="all"/>
+        <path d="M 820 300 L 830 300 L 840 308 L 840 310 L 810 310 L 810 308 Z" fill="rgb(255, 255, 255)" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" transform="translate(0,305)scale(1,-1)translate(0,-305)rotate(-90,825,305)" pointer-events="all"/>
+        <rect x="830" y="290" width="30" height="10" fill="#f5f5f5" stroke="#666666" pointer-events="all"/>
+        <path d="M 830 290 L 835 285 L 835 285 L 840 290 L 840 290 L 840 290 L 835 290 L 830 290 Z" fill="#dae8fc" stroke="#6c8ebf" stroke-miterlimit="10" pointer-events="all"/>
+        <path d="M 840 290 L 845 285 L 845 285 L 850 290 L 850 290 L 850 290 L 845 290 L 840 290 Z" fill="#fff2cc" stroke="#d6b656" stroke-miterlimit="10" pointer-events="all"/>
+        <path d="M 850 290 L 855 285 L 855 285 L 860 290 L 860 290 L 860 290 L 855 290 L 850 290 Z" fill="#d5e8d4" stroke="#82b366" stroke-miterlimit="10" pointer-events="all"/>
+        <path d="M 845 320 L 845 360" fill="none" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" stroke-dasharray="3 3" pointer-events="stroke"/>
+        <path d="M 845 320 L 845 330 Q 845 340 855 340 L 905 340 Q 915 340 915 350 L 915 360" fill="none" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" stroke-dasharray="3 3" pointer-events="stroke"/>
+        <rect x="830" y="310" width="30" height="10" fill="#f5f5f5" stroke="#666666" pointer-events="all"/>
+        <path d="M 830 320 L 830 320 L 830 320 L 840 320 L 840 320 L 840 330 L 835 325 L 830 330 Z" fill="#dae8fc" stroke="#6c8ebf" stroke-miterlimit="10" pointer-events="all"/>
+        <path d="M 850 320 L 850 320 L 850 320 L 860 320 L 860 320 L 860 330 L 855 325 L 850 330 Z" fill="#d5e8d4" stroke="#82b366" stroke-miterlimit="10" pointer-events="all"/>
+        <rect x="690" y="300" width="30" height="20" fill="rgb(255, 255, 255)" stroke="rgb(0, 0, 0)" pointer-events="all"/>
+        <path d="M 720 300 L 730 300 L 740 308 L 740 310 L 710 310 L 710 308 Z" fill="rgb(255, 255, 255)" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" transform="rotate(90,725,305)" pointer-events="all"/>
+        <path d="M 680 300 L 690 300 L 700 308 L 700 310 L 670 310 L 670 308 Z" fill="rgb(255, 255, 255)" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" transform="translate(0,305)scale(1,-1)translate(0,-305)rotate(-90,685,305)" pointer-events="all"/>
+        <rect x="690" y="290" width="30" height="10" fill="#f5f5f5" stroke="#666666" pointer-events="all"/>
+        <path d="M 690 290 L 695 285 L 695 285 L 700 290 L 700 290 L 700 290 L 695 290 L 690 290 Z" fill="#dae8fc" stroke="#6c8ebf" stroke-miterlimit="10" pointer-events="all"/>
+        <path d="M 700 290 L 705 285 L 705 285 L 710 290 L 710 290 L 710 290 L 705 290 L 700 290 Z" fill="#fff2cc" stroke="#d6b656" stroke-miterlimit="10" pointer-events="all"/>
+        <path d="M 710 290 L 715 285 L 715 285 L 720 290 L 720 290 L 720 290 L 715 290 L 710 290 Z" fill="#d5e8d4" stroke="#82b366" stroke-miterlimit="10" pointer-events="all"/>
+        <rect x="830" y="370" width="30" height="20" fill="rgb(255, 255, 255)" stroke="rgb(0, 0, 0)" pointer-events="all"/>
+        <path d="M 860 370 L 870 370 L 880 378 L 880 380 L 850 380 L 850 378 Z" fill="rgb(255, 255, 255)" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" transform="rotate(90,865,375)" pointer-events="all"/>
+        <path d="M 820 370 L 830 370 L 840 378 L 840 380 L 810 380 L 810 378 Z" fill="rgb(255, 255, 255)" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" transform="translate(0,375)scale(1,-1)translate(0,-375)rotate(-90,825,375)" pointer-events="all"/>
+        <rect x="830" y="360" width="30" height="10" fill="#f5f5f5" stroke="#666666" pointer-events="all"/>
+        <path d="M 830 360 L 835 355 L 835 355 L 840 360 L 840 360 L 840 360 L 835 360 L 830 360 Z" fill="#dae8fc" stroke="#6c8ebf" stroke-miterlimit="10" pointer-events="all"/>
+        <path d="M 850 360 L 855 355 L 855 355 L 860 360 L 860 360 L 860 360 L 855 360 L 850 360 Z" fill="#d5e8d4" stroke="#82b366" stroke-miterlimit="10" pointer-events="all"/>
+        <rect x="900" y="370" width="30" height="20" fill="rgb(255, 255, 255)" stroke="rgb(0, 0, 0)" pointer-events="all"/>
+        <path d="M 930 370 L 940 370 L 950 378 L 950 380 L 920 380 L 920 378 Z" fill="rgb(255, 255, 255)" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" transform="rotate(90,935,375)" pointer-events="all"/>
+        <path d="M 890 370 L 900 370 L 910 378 L 910 380 L 880 380 L 880 378 Z" fill="rgb(255, 255, 255)" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" transform="translate(0,375)scale(1,-1)translate(0,-375)rotate(-90,895,375)" pointer-events="all"/>
+        <rect x="900" y="360" width="30" height="10" fill="#f5f5f5" stroke="#666666" pointer-events="all"/>
+        <path d="M 900 360 L 905 355 L 905 355 L 910 360 L 910 360 L 910 360 L 905 360 L 900 360 Z" fill="#dae8fc" stroke="#6c8ebf" stroke-miterlimit="10" pointer-events="all"/>
+        <path d="M 920 360 L 925 355 L 925 355 L 930 360 L 930 360 L 930 360 L 925 360 L 920 360 Z" fill="#d5e8d4" stroke="#82b366" stroke-miterlimit="10" pointer-events="all"/>
+        <path d="M 690 320 L 690 320 L 690 320 L 700 320 L 700 320 L 700 330 L 695 325 L 690 330 Z" fill="#dae8fc" stroke="#6c8ebf" stroke-miterlimit="10" pointer-events="all"/>
+        <path d="M 710 320 L 710 320 L 710 320 L 720 320 L 720 320 L 720 330 L 715 325 L 710 330 Z" fill="#d5e8d4" stroke="#82b366" stroke-miterlimit="10" pointer-events="all"/>
+        <rect x="0" y="360" width="180" height="20" fill="none" stroke="none" pointer-events="all"/>
+        <g transform="translate(-0.5 -0.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 flex-start; width: 178px; height: 1px; padding-top: 370px; margin-left: 2px;">
+                        <div data-drawio-colors="color: rgb(0, 0, 0); " style="box-sizing: border-box; font-size: 0px; text-align: left;">
+                            <div style="display: inline-block; font-size: 10px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; white-space: normal; overflow-wrap: normal;">
+                                <font style="font-size: 12px;">
+                                    Example Extension Data Types
+                                </font>
+                            </div>
+                        </div>
+                    </div>
+                </foreignObject>
+                <text x="2" y="373" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="10px">
+                    Example Extension Data Types
+                </text>
+            </switch>
+        </g>
+        <rect x="160" y="0" width="280" height="40" fill="none" stroke="none" pointer-events="all"/>
+        <g transform="translate(-0.5 -0.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: 1px; height: 1px; padding-top: 20px; margin-left: 300px;">
+                        <div data-drawio-colors="color: rgb(0, 0, 0); " style="box-sizing: border-box; font-size: 0px; text-align: center;">
+                            <div style="display: inline-block; font-size: 24px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; font-weight: bold; white-space: nowrap;">
+                                Extension Architecture
+                            </div>
+                        </div>
+                    </div>
+                </foreignObject>
+                <text x="300" y="27" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="24px" text-anchor="middle" font-weight="bold">
+                    Extension Architecture
+                </text>
+            </switch>
+        </g>
+        <rect x="680" y="0" width="320" height="40" fill="none" stroke="none" pointer-events="all"/>
+        <g transform="translate(-0.5 -0.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: 1px; height: 1px; padding-top: 20px; margin-left: 840px;">
+                        <div data-drawio-colors="color: rgb(0, 0, 0); " style="box-sizing: border-box; font-size: 0px; text-align: center;">
+                            <div style="display: inline-block; font-size: 24px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; font-weight: bold; white-space: nowrap;">
+                                App Example
+                            </div>
+                        </div>
+                    </div>
+                </foreignObject>
+                <text x="840" y="27" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="24px" text-anchor="middle" font-weight="bold">
+                    App Example
+                </text>
+            </switch>
+        </g>
+        <path d="M 920 290 L 925 285 L 925 285 L 930 290 L 930 290 L 930 290 L 925 290 L 920 290 Z" fill="#d5e8d4" stroke="#82b366" stroke-miterlimit="10" pointer-events="all"/>
+        <path d="M 850 220 L 855 215 L 855 215 L 860 220 L 860 220 L 860 220 L 855 220 L 850 220 Z" fill="#d5e8d4" stroke="#82b366" 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%">
+                Text is not SVG - cannot display
+            </text>
+        </a>
+    </switch>
+</svg>
diff --git a/packages/app-next/catalog-info.yaml b/packages/app-next/catalog-info.yaml
new file mode 100644
index 0000000000..85e3f0d70b
--- /dev/null
+++ b/packages/app-next/catalog-info.yaml
@@ -0,0 +1,9 @@
+apiVersion: backstage.io/v1alpha1
+kind: Component
+metadata:
+  name: example-app-next
+  title: example-app-next
+spec:
+  lifecycle: experimental
+  type: backstage-frontend
+  owner: maintainers
diff --git a/packages/app-next/package.json b/packages/app-next/package.json
new file mode 100644
index 0000000000..2775fe8208
--- /dev/null
+++ b/packages/app-next/package.json
@@ -0,0 +1,143 @@
+{
+  "name": "example-app-next",
+  "version": "0.0.1-next.1",
+  "private": true,
+  "backstage": {
+    "role": "frontend"
+  },
+  "bundled": true,
+  "dependencies": {
+    "@backstage/app-defaults": "workspace:^",
+    "@backstage/catalog-model": "workspace:^",
+    "@backstage/cli": "workspace:^",
+    "@backstage/config": "workspace:^",
+    "@backstage/core-app-api": "workspace:^",
+    "@backstage/core-components": "workspace:^",
+    "@backstage/core-plugin-api": "workspace:^",
+    "@backstage/frontend-app-api": "workspace:^",
+    "@backstage/frontend-plugin-api": "workspace:^",
+    "@backstage/integration-react": "workspace:^",
+    "@backstage/plugin-adr": "workspace:^",
+    "@backstage/plugin-airbrake": "workspace:^",
+    "@backstage/plugin-apache-airflow": "workspace:^",
+    "@backstage/plugin-api-docs": "workspace:^",
+    "@backstage/plugin-azure-devops": "workspace:^",
+    "@backstage/plugin-azure-sites": "workspace:^",
+    "@backstage/plugin-badges": "workspace:^",
+    "@backstage/plugin-catalog-common": "workspace:^",
+    "@backstage/plugin-catalog-graph": "workspace:^",
+    "@backstage/plugin-catalog-import": "workspace:^",
+    "@backstage/plugin-catalog-react": "workspace:^",
+    "@backstage/plugin-catalog-unprocessed-entities": "workspace:^",
+    "@backstage/plugin-circleci": "workspace:^",
+    "@backstage/plugin-cloudbuild": "workspace:^",
+    "@backstage/plugin-code-coverage": "workspace:^",
+    "@backstage/plugin-cost-insights": "workspace:^",
+    "@backstage/plugin-devtools": "workspace:^",
+    "@backstage/plugin-dynatrace": "workspace:^",
+    "@backstage/plugin-entity-feedback": "workspace:^",
+    "@backstage/plugin-explore": "workspace:^",
+    "@backstage/plugin-gcalendar": "workspace:^",
+    "@backstage/plugin-gcp-projects": "workspace:^",
+    "@backstage/plugin-github-actions": "workspace:^",
+    "@backstage/plugin-gocd": "workspace:^",
+    "@backstage/plugin-graphiql": "workspace:^",
+    "@backstage/plugin-home": "workspace:^",
+    "@backstage/plugin-jenkins": "workspace:^",
+    "@backstage/plugin-kafka": "workspace:^",
+    "@backstage/plugin-kubernetes": "workspace:^",
+    "@backstage/plugin-lighthouse": "workspace:^",
+    "@backstage/plugin-linguist": "workspace:^",
+    "@backstage/plugin-linguist-common": "workspace:^",
+    "@backstage/plugin-microsoft-calendar": "workspace:^",
+    "@backstage/plugin-newrelic": "workspace:^",
+    "@backstage/plugin-newrelic-dashboard": "workspace:^",
+    "@backstage/plugin-octopus-deploy": "workspace:^",
+    "@backstage/plugin-org": "workspace:^",
+    "@backstage/plugin-pagerduty": "workspace:^",
+    "@backstage/plugin-permission-react": "workspace:^",
+    "@backstage/plugin-playlist": "workspace:^",
+    "@backstage/plugin-puppetdb": "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:^",
+    "@backstage/plugin-sentry": "workspace:^",
+    "@backstage/plugin-shortcuts": "workspace:^",
+    "@backstage/plugin-stack-overflow": "workspace:^",
+    "@backstage/plugin-stackstorm": "workspace:^",
+    "@backstage/plugin-tech-insights": "workspace:^",
+    "@backstage/plugin-tech-radar": "workspace:^",
+    "@backstage/plugin-techdocs": "workspace:^",
+    "@backstage/plugin-techdocs-module-addons-contrib": "workspace:^",
+    "@backstage/plugin-techdocs-react": "workspace:^",
+    "@backstage/plugin-todo": "workspace:^",
+    "@backstage/plugin-user-settings": "workspace:^",
+    "@backstage/theme": "workspace:^",
+    "@internal/plugin-catalog-customized": "workspace:^",
+    "@material-ui/core": "^4.12.2",
+    "@material-ui/icons": "^4.9.1",
+    "@material-ui/lab": "4.0.0-alpha.61",
+    "@octokit/rest": "^19.0.3",
+    "@oriflame/backstage-plugin-score-card": "^0.7.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",
+    "app-next-example-plugin": "workspace:^",
+    "history": "^5.0.0",
+    "lodash": "^4.17.21",
+    "prop-types": "^15.7.2",
+    "react": "^17.0.2",
+    "react-dom": "^17.0.2",
+    "react-router": "^6.3.0",
+    "react-router-dom": "^6.3.0",
+    "react-use": "^17.2.4",
+    "zen-observable": "^0.10.0"
+  },
+  "devDependencies": {
+    "@backstage/test-utils": "workspace:^",
+    "@testing-library/cypress": "^9.0.0",
+    "@testing-library/dom": "^8.0.0",
+    "@testing-library/jest-dom": "^5.10.1",
+    "@testing-library/react": "^12.1.3",
+    "@testing-library/user-event": "^14.0.0",
+    "@types/jquery": "^3.3.34",
+    "@types/react": "*",
+    "@types/react-dom": "*",
+    "@types/zen-observable": "^0.8.0",
+    "cross-env": "^7.0.0",
+    "cypress": "^10.0.0",
+    "eslint-plugin-cypress": "^2.10.3",
+    "start-server-and-test": "^1.10.11"
+  },
+  "scripts": {
+    "start": "backstage-cli package start --config ../../app-config.yaml --config app-config.yaml",
+    "build": "backstage-cli package build",
+    "clean": "backstage-cli package clean",
+    "test": "backstage-cli package test",
+    "lint": "backstage-cli package lint",
+    "test:e2e": "start-server-and-test start http://localhost:3000 cy:dev",
+    "test:e2e:ci": "start-server-and-test start http://localhost:3000 cy:run",
+    "cy:dev": "cypress open",
+    "cy:run": "cypress run"
+  },
+  "browserslist": {
+    "production": [
+      ">0.2%",
+      "not dead",
+      "not op_mini all"
+    ],
+    "development": [
+      "last 1 chrome version",
+      "last 1 firefox version",
+      "last 1 safari version"
+    ]
+  },
+  "files": [
+    "dist"
+  ],
+  "license": "Apache-2.0"
+}
diff --git a/packages/app-next/public/android-chrome-192x192.png b/packages/app-next/public/android-chrome-192x192.png
new file mode 100644
index 0000000000..eec0ae25b9
Binary files /dev/null and b/packages/app-next/public/android-chrome-192x192.png differ
diff --git a/packages/app-next/public/android-chrome-512x512.png b/packages/app-next/public/android-chrome-512x512.png
new file mode 100644
index 0000000000..ac0578133b
Binary files /dev/null and b/packages/app-next/public/android-chrome-512x512.png differ
diff --git a/packages/app-next/public/apple-touch-icon.png b/packages/app-next/public/apple-touch-icon.png
new file mode 100644
index 0000000000..6a45afb38f
Binary files /dev/null and b/packages/app-next/public/apple-touch-icon.png differ
diff --git a/packages/app-next/public/favicon-16x16.png b/packages/app-next/public/favicon-16x16.png
new file mode 100644
index 0000000000..58cf61a35e
Binary files /dev/null and b/packages/app-next/public/favicon-16x16.png differ
diff --git a/packages/app-next/public/favicon-32x32.png b/packages/app-next/public/favicon-32x32.png
new file mode 100644
index 0000000000..c0915ece75
Binary files /dev/null and b/packages/app-next/public/favicon-32x32.png differ
diff --git a/packages/app-next/public/favicon.ico b/packages/app-next/public/favicon.ico
new file mode 100644
index 0000000000..5e45e5dfbd
Binary files /dev/null and b/packages/app-next/public/favicon.ico differ
diff --git a/packages/app-next/public/favicon.svg b/packages/app-next/public/favicon.svg
new file mode 100644
index 0000000000..7f2d375cd8
--- /dev/null
+++ b/packages/app-next/public/favicon.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" id="favicon" viewBox="0 0 337.46 428.5"><title>Backstage favicon</title><style>#favicon path{fill:#121212}@media (prefers-color-scheme:dark){#favicon path{fill:#7df3e1}}</style><path d="M303,166.05a80.69,80.69,0,0,0,13.45-10.37c.79-.77,1.55-1.53,2.3-2.3a83.12,83.12,0,0,0,7.93-9.38A63.69,63.69,0,0,0,333,133.23a48.58,48.58,0,0,0,4.35-16.4c1.49-19.39-10-38.67-35.62-54.22L198.56,0,78.3,115.23,0,190.25l108.6,65.91a111.59,111.59,0,0,0,57.76,16.41c24.92,0,48.8-8.8,66.42-25.69,19.16-18.36,25.52-42.12,13.7-61.87a49.22,49.22,0,0,0-6.8-8.87A89.17,89.17,0,0,0,259,178.29h.15a85.08,85.08,0,0,0,31-5.79A80.88,80.88,0,0,0,303,166.05ZM202.45,225.86c-19.32,18.51-50.4,21.23-75.7,5.9L51.61,186.15l67.45-64.64,76.41,46.38C223,184.58,221.49,207.61,202.45,225.86Zm8.93-82.22-70.65-42.89L205.14,39,274.51,81.1c25.94,15.72,29.31,37,10.55,55A60.69,60.69,0,0,1,211.38,143.64Zm29.86,190c-19.57,18.75-46.17,29.09-74.88,29.09a123.73,123.73,0,0,1-64.1-18.2L0,282.52v24.67L108.6,373.1a111.6,111.6,0,0,0,57.76,16.42c24.92,0,48.8-8.81,66.42-25.69,12.88-12.34,20-27.13,19.68-41.49v-1.79A87.27,87.27,0,0,1,241.24,333.68Zm0-39c-19.57,18.75-46.17,29.08-74.88,29.08a123.81,123.81,0,0,1-64.1-18.19L0,243.53v24.68l108.6,65.91a111.6,111.6,0,0,0,57.76,16.42c24.92,0,48.8-8.81,66.42-25.69,12.88-12.34,20-27.13,19.68-41.5v-1.78A87.27,87.27,0,0,1,241.24,294.7Zm0-39c-19.57,18.76-46.17,29.09-74.88,29.09a123.81,123.81,0,0,1-64.1-18.19L0,204.55v24.68l108.6,65.91a111.59,111.59,0,0,0,57.76,16.41c24.92,0,48.8-8.8,66.42-25.68,12.88-12.35,20-27.13,19.68-41.5v-1.82A86.09,86.09,0,0,1,241.24,255.71Zm83.7,25.74a94.15,94.15,0,0,1-60.2,25.86h0V334a81.6,81.6,0,0,0,51.74-22.37c14-13.38,21.14-28.11,21-42.64v-2.19A94.92,94.92,0,0,1,324.94,281.45Zm-83.7,91.21c-19.57,18.76-46.17,29.09-74.88,29.09a123.73,123.73,0,0,1-64.1-18.2L0,321.5v24.68l108.6,65.9a111.6,111.6,0,0,0,57.76,16.42c24.92,0,48.8-8.8,66.42-25.69,12.88-12.34,20-27.13,19.68-41.49v-1.79A86.29,86.29,0,0,1,241.24,372.66ZM327,162.45c-.68.69-1.35,1.38-2.05,2.06a94.37,94.37,0,0,1-10.64,8.65,91.35,91.35,0,0,1-11.6,7,94.53,94.53,0,0,1-26.24,8.71,97.69,97.69,0,0,1-14.16,1.57c.5,1.61.9,3.25,1.25,4.9a53.27,53.27,0,0,1,1.14,12V217h.05a84.41,84.41,0,0,0,25.35-5.55,81,81,0,0,0,26.39-16.82c.8-.77,1.5-1.56,2.26-2.34a82.08,82.08,0,0,0,7.93-9.38A63.76,63.76,0,0,0,333,172.17a48.55,48.55,0,0,0,4.32-16.45c.09-1.23.2-2.47.19-3.7V150q-1.08,1.54-2.25,3.09A96.73,96.73,0,0,1,327,162.45Zm0,77.92c-.69.7-1.31,1.41-2,2.1a94.2,94.2,0,0,1-60.2,25.86h0l0,26.67h0a81.6,81.6,0,0,0,51.74-22.37A73.51,73.51,0,0,0,333,250.13a48.56,48.56,0,0,0,4.32-16.44c.09-1.24.2-2.47.19-3.71v-2.19c-.74,1.07-1.46,2.15-2.27,3.21A95.68,95.68,0,0,1,327,240.37Zm0-39c-.69.7-1.31,1.41-2,2.1a93.18,93.18,0,0,1-10.63,8.65,91.63,91.63,0,0,1-11.63,7,95.47,95.47,0,0,1-37.94,10.18h0V256h0a81.65,81.65,0,0,0,51.74-22.37c.8-.77,1.5-1.56,2.26-2.34a82.08,82.08,0,0,0,7.93-9.38A63.76,63.76,0,0,0,333,211.15a48.56,48.56,0,0,0,4.32-16.44c.09-1.24.2-2.48.19-3.71v-2.2c-.74,1.08-1.46,2.16-2.27,3.22A95.68,95.68,0,0,1,327,201.39Z"/></svg>
\ No newline at end of file
diff --git a/packages/app-next/public/index.html b/packages/app-next/public/index.html
new file mode 100644
index 0000000000..0710a0d69d
--- /dev/null
+++ b/packages/app-next/public/index.html
@@ -0,0 +1,98 @@
+<!DOCTYPE html>
+<html lang="en">
+  <head>
+    <meta charset="utf-8" />
+    <meta name="viewport" content="width=device-width, initial-scale=1" />
+    <meta name="theme-color" content="#000000" />
+    <meta
+      name="description"
+      content="Backstage is an open platform for building developer portals"
+    />
+    <link rel="apple-touch-icon" href="<%= publicPath %>/logo192.png" />
+    <!--
+      manifest.json provides metadata used when your web app is installed on a
+      user's mobile device or desktop. See https://developers.google.com/web/fundamentals/web-app-manifest/
+    -->
+    <link
+      rel="manifest"
+      href="<%= publicPath %>/manifest.json"
+      crossorigin="use-credentials"
+    />
+    <link rel="icon" href="<%= publicPath %>/favicon.ico" />
+    <link rel="shortcut icon" href="<%= publicPath %>/favicon.ico" />
+    <link
+      rel="apple-touch-icon"
+      sizes="180x180"
+      href="<%= publicPath %>/apple-touch-icon.png"
+    />
+    <link
+      rel="icon"
+      type="image/png"
+      sizes="32x32"
+      href="<%= publicPath %>/favicon-32x32.png"
+    />
+    <link
+      rel="icon"
+      type="image/png"
+      sizes="16x16"
+      href="<%= publicPath %>/favicon-16x16.png"
+    />
+    <link
+      rel="mask-icon"
+      href="<%= publicPath %>/safari-pinned-tab.svg"
+      color="#5bbad5"
+    />
+    <title><%= config.getString('app.title') %></title>
+
+    <% if (config.has('app.datadogRum')) { %>
+    <script>
+      (function (h, o, u, n, d) {
+        h = h[d] = h[d] || {
+          q: [],
+          onReady: function (c) {
+            h.q.push(c);
+          },
+        };
+        d = o.createElement(u);
+        d.async = 1;
+        d.src = n;
+        n = o.getElementsByTagName(u)[0];
+        n.parentNode.insertBefore(d, n);
+      })(
+        window,
+        document,
+        'script',
+        'https://www.datadoghq-browser-agent.com/datadog-rum-v3.js',
+        'DD_RUM',
+      );
+      DD_RUM.onReady(function () {
+        DD_RUM.init({
+          clientToken: '<%= config.getString("app.datadogRum.clientToken") %>',
+          applicationId:
+            '<%= config.getString("app.datadogRum.applicationId") %>',
+          site: '<%= config.getOptionalString("app.datadogRum.site") || "datadoghq.com" %>',
+          service: 'backstage',
+          env: '<%= config.getString("app.datadogRum.env") %>',
+          sampleRate: 100,
+          trackInteractions: true,
+        });
+      });
+    </script>
+    <% } %>
+  </head>
+
+  <body>
+    <noscript>You need to enable JavaScript to run this app.</noscript>
+    <div id="root"></div>
+    <!--
+      This HTML file is a template.
+      If you open it directly in the browser, you will see an empty page.
+
+      You can add webfonts, meta tags, or analytics to this file.
+      The build step will place the bundled scripts into the <body> tag.
+
+      To begin the development, run `yarn start`.
+      To create a production bundle, use `yarn build`.
+    -->
+  </body>
+</html>
diff --git a/packages/app-next/public/manifest.json b/packages/app-next/public/manifest.json
new file mode 100644
index 0000000000..4a7c1b4ec4
--- /dev/null
+++ b/packages/app-next/public/manifest.json
@@ -0,0 +1,15 @@
+{
+  "short_name": "Backstage",
+  "name": "Backstage",
+  "icons": [
+    {
+      "src": "favicon.ico",
+      "sizes": "48x48",
+      "type": "image/png"
+    }
+  ],
+  "start_url": "./index.html",
+  "display": "standalone",
+  "theme_color": "#000000",
+  "background_color": "#ffffff"
+}
diff --git a/packages/app-next/public/robots.txt b/packages/app-next/public/robots.txt
new file mode 100644
index 0000000000..01b0f9a107
--- /dev/null
+++ b/packages/app-next/public/robots.txt
@@ -0,0 +1,2 @@
+# https://www.robotstxt.org/robotstxt.html
+User-agent: *
diff --git a/packages/app-next/public/safari-pinned-tab.svg b/packages/app-next/public/safari-pinned-tab.svg
new file mode 100644
index 0000000000..0f500b3002
--- /dev/null
+++ b/packages/app-next/public/safari-pinned-tab.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="682.667" height="682.667" preserveAspectRatio="xMidYMid meet" version="1.0" viewBox="0 0 512 512"><metadata>Created by potrace 1.11, written by Peter Selinger 2001-2013</metadata><g fill="#000" stroke="none"><path d="M492 4610 c-4 -3 -8 -882 -7 -1953 l0 -1948 850 2 c898 1 945 3 1118 49 505 134 823 531 829 1037 2 136 -9 212 -44 323 -40 125 -89 218 -163 310 -35 43 -126 128 -169 157 -22 15 -43 30 -46 33 -12 13 -131 70 -188 91 l-64 22 60 28 c171 77 317 224 403 404 64 136 92 266 91 425 -5 424 -245 770 -642 923 -79 30 -105 39 -155 50 -11 3 -38 10 -60 15 -22 6 -60 13 -85 17 -25 3 -58 9 -75 12 -36 8 -1643 11 -1653 3z m1497 -743 c236 -68 352 -254 305 -486 -26 -124 -110 -224 -232 -277 -92 -40 -151 -46 -439 -49 l-283 -3 -1 27 c-1 36 -1 760 0 790 l1 23 298 -5 c226 -4 310 -9 351 -20z m-82 -1538 c98 -3 174 -19 247 -52 169 -78 257 -212 258 -395 0 -116 -36 -221 -100 -293 -64 -72 -192 -135 -314 -155 -23 -3 -181 -7 -350 -8 l-308 -2 -1 26 c-6 210 1 874 9 879 9 5 366 6 559 0z" transform="translate(0.000000,512.000000) scale(0.100000,-0.100000)"/><path d="M4160 1789 c-275 -24 -499 -263 -503 -536 -1 -115 21 -212 66 -292 210 -369 697 -402 950 -65 77 103 110 199 111 329 0 50 -6 113 -13 140 -16 58 -62 155 -91 193 -33 43 -122 132 -132 132 -5 0 -26 11 -46 25 -85 56 -219 85 -342 74z" transform="translate(0.000000,512.000000) scale(0.100000,-0.100000)"/></g></svg>
\ No newline at end of file
diff --git a/packages/app-next/src/App.test.tsx b/packages/app-next/src/App.test.tsx
new file mode 100644
index 0000000000..047c9821b5
--- /dev/null
+++ b/packages/app-next/src/App.test.tsx
@@ -0,0 +1,48 @@
+/*
+ * 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 React from 'react';
+import { renderWithEffects } from '@backstage/test-utils';
+
+describe('App', () => {
+  it('should render', async () => {
+    process.env = {
+      NODE_ENV: 'test',
+      APP_CONFIG: [
+        {
+          data: {
+            app: {
+              title: 'Test',
+              support: { url: 'http://localhost:7007/support' },
+            },
+            backend: { baseUrl: 'http://localhost:7007' },
+            lighthouse: {
+              baseUrl: 'http://localhost:3003',
+            },
+            techdocs: {
+              storageUrl: 'http://localhost:7007/api/techdocs/static/docs',
+            },
+          },
+          context: 'test',
+        },
+      ] as any,
+    };
+
+    const { default: App } = await import('./App');
+    const rendered = await renderWithEffects(<App />);
+    expect(rendered.baseElement).toBeInTheDocument();
+  });
+});
diff --git a/packages/app-next/src/App.tsx b/packages/app-next/src/App.tsx
new file mode 100644
index 0000000000..0452cc3709
--- /dev/null
+++ b/packages/app-next/src/App.tsx
@@ -0,0 +1,114 @@
+/*
+ * 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 { graphiqlPlugin as legacyGraphiqlPlugin } from '@backstage/plugin-graphiql';
+import { createApp as createLegacyApp } from '@backstage/app-defaults';
+import { createApp } from '@backstage/frontend-app-api';
+import { pagesPlugin } from './examples/pagesPlugin';
+import graphiqlPlugin from '@backstage/plugin-graphiql/alpha';
+
+/*
+
+# Notes
+
+TODO:
+ - proper createApp
+ - connect extensions and plugins, provide method?
+ - higher level API for creating standard extensions + higher order framework API for creating those?
+ - extension config schema + validation
+ - figure out how to resolve configured extension ref to runtime value, e.g. '@backstage/plugin-graphiql#GraphiqlPage'
+ - make sure all shorthands work + tests
+ - figure out package structure / how to ship, frontend-plugin-api/frontend-app-api
+ - figure out routing, useRouteRef in the new system
+ - Legacy plugins / interop
+ - dynamic updates, runtime API
+
+*/
+
+/* core */
+
+// const discoverPackages = async () => {
+//   // stub for now, deferring package discovery til later
+//   return ['@backstage/plugin-graphiql'];
+// };
+
+/* graphiql package */
+
+/* app.tsx */
+
+const app = createApp({
+  plugins: [graphiqlPlugin, pagesPlugin],
+  // bindRoutes({ bind }) {
+  //   bind(catalogPlugin.externalRoutes, {
+  //     createComponent: scaffolderPlugin.routes.root,
+  //   });
+  //   bind(scaffolderPlugin.externalRoutes, {
+  //     registerComponent: catalogImportPlugin.routes.importPage,
+  //   });
+  // },
+});
+
+const legacyApp = createLegacyApp({ plugins: [legacyGraphiqlPlugin] });
+
+export default legacyApp.createRoot(app.createRoot());
+
+// const routes = (
+//   <FlatRoutes>
+//     {/* <Route path="/" element={<Navigate to="catalog" />} />
+//     <Route path="/catalog" element={<CatalogIndexPage />} />
+//     <Route
+//       path="/catalog/:namespace/:kind/:name"
+//       element={<CatalogEntityPage />}
+//     >
+//       <EntityLayout>
+//         <EntityLayout.Route path="/" title="Overview">
+//           <Grid container spacing={3} alignItems="stretch">
+//             <Grid item md={6} xs={12}>
+//               <EntityAboutCard variant="gridItem" />
+//             </Grid>
+
+//             <Grid item md={4} xs={12}>
+//               <EntityLinksCard />
+//             </Grid>
+//           </Grid>
+//         </EntityLayout.Route>
+
+//         <EntityLayout.Route path="/todos" title="TODOs">
+//           <EntityTodoContent />
+//         </EntityLayout.Route>
+//       </EntityLayout>
+//     </Route>
+//     <Route
+//       path="/catalog-import"
+//       element={
+//           <CatalogImportPage />
+//       }
+//     /> */}
+//     {/* <Route
+//       path="/tech-radar"
+//       element={<TechRadarPage width={1500} height={800} />}
+//     /> */}
+//     <Route path="/graphiql" element={<GraphiQLPage />} />
+//   </FlatRoutes>
+// );
+
+// export default app.createRoot(
+//   <>
+//     {/* <AlertDisplay transientTimeoutMs={2500} />
+//     <OAuthRequestDialog /> */}
+//     <AppRouter>{routes}</AppRouter>
+//   </>,
+// );
diff --git a/packages/app-next/src/examples/pagesPlugin.tsx b/packages/app-next/src/examples/pagesPlugin.tsx
new file mode 100644
index 0000000000..6616c88c4b
--- /dev/null
+++ b/packages/app-next/src/examples/pagesPlugin.tsx
@@ -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 React from 'react';
+import { Link } from '@backstage/core-components';
+import {
+  createPageExtension,
+  createPlugin,
+  useRouteRef,
+} from '@backstage/frontend-plugin-api';
+import { createRouteRef } from '@backstage/core-plugin-api';
+import { Route, Routes } from 'react-router-dom';
+
+const indexRouteRef = createRouteRef({ id: 'index' });
+const page1RouteRef = createRouteRef({ id: 'page1' });
+// const page2RouteRef = createSubRouteRef({
+//   id: 'page2',
+//   parent: page1RouteRef,
+//   path: '/page2',
+// });
+
+const IndexPage = createPageExtension({
+  id: 'index',
+  defaultPath: '/',
+  routeRef: indexRouteRef,
+  component: async () => {
+    const Component = () => {
+      const page1Link = useRouteRef(page1RouteRef);
+      return (
+        <div>
+          op
+          <div>
+            <Link to={page1Link()}>Page 1</Link>
+          </div>
+          <div>
+            <Link to="/graphiql">GraphiQL</Link>
+          </div>
+        </div>
+      );
+    };
+    return <Component />;
+  },
+});
+
+const Page1 = createPageExtension({
+  id: 'page1',
+  defaultPath: '/page1',
+  routeRef: page1RouteRef,
+  component: async () => {
+    const Component = () => {
+      const indexLink = useRouteRef(indexRouteRef);
+      // const page2Link = useRouteRef(page2RouteRef);
+
+      return (
+        <div>
+          <h1>This is page 1</h1>
+          <Link to={indexLink()}>Go back</Link>
+          <Link to="./page2">Page 2</Link>
+          {/* <Link to={page2Link()}>Page 2</Link> */}
+
+          <div>
+            Sub-page content:
+            <div>
+              <Routes>
+                <Route path="/" element={<h2>This is also page 1</h2>} />
+                <Route path="/page2" element={<h2>This is page 2</h2>} />
+              </Routes>
+            </div>
+          </div>
+        </div>
+      );
+    };
+    return <Component />;
+  },
+});
+
+export const pagesPlugin = createPlugin({
+  id: 'pages',
+  // routes: {
+  //   index: indexRouteRef,
+  //   // reference in config:
+  //   //   'plugin.pages.routes.index'
+  //   //     OR
+  //   //   'page1'
+  // },
+  extensions: [IndexPage, Page1],
+});
diff --git a/packages/app-next/src/index.tsx b/packages/app-next/src/index.tsx
new file mode 100644
index 0000000000..b15bc4c102
--- /dev/null
+++ b/packages/app-next/src/index.tsx
@@ -0,0 +1,22 @@
+/*
+ * 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 '@backstage/cli/asset-types';
+import React from 'react';
+import ReactDOM from 'react-dom';
+import App from './App';
+
+ReactDOM.render(<App />, document.getElementById('root'));
diff --git a/packages/app-next/src/setupTests.ts b/packages/app-next/src/setupTests.ts
new file mode 100644
index 0000000000..23fcbe9676
--- /dev/null
+++ b/packages/app-next/src/setupTests.ts
@@ -0,0 +1,21 @@
+/*
+ * 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.
+ */
+
+// jest-dom adds custom jest matchers for asserting on DOM nodes.
+// allows you to do things like:
+// expect(element).toHaveTextContent(/react/i)
+// learn more: https://github.com/testing-library/jest-dom
+import '@testing-library/jest-dom';
diff --git a/packages/app/CHANGELOG.md b/packages/app/CHANGELOG.md
index c1886c92d5..6ed7929e6d 100644
--- a/packages/app/CHANGELOG.md
+++ b/packages/app/CHANGELOG.md
@@ -1,5 +1,368 @@
 # example-app
 
+## 0.2.87-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-playlist@0.1.16-next.2
+  - @backstage/plugin-tech-radar@0.6.8-next.2
+  - @backstage/plugin-user-settings@0.7.9-next.2
+  - @backstage/plugin-org@0.6.14-next.2
+  - @backstage/plugin-techdocs@1.7.0-next.2
+  - @backstage/plugin-techdocs-module-addons-contrib@1.1.0-next.2
+  - @backstage/plugin-catalog-unprocessed-entities@0.1.3-next.2
+  - @backstage/integration-react@1.1.19-next.2
+  - @backstage/plugin-microsoft-calendar@0.1.7-next.2
+  - @backstage/core-components@0.13.5-next.2
+  - @backstage/core-plugin-api@1.6.0-next.2
+  - @backstage/plugin-entity-feedback@0.2.7-next.2
+  - @backstage/plugin-apache-airflow@0.2.15-next.2
+  - @backstage/plugin-github-actions@0.6.5-next.2
+  - @backstage/plugin-octopus-deploy@0.2.6-next.2
+  - @backstage/plugin-stack-overflow@0.1.20-next.2
+  - @backstage/app-defaults@1.4.3-next.2
+  - @backstage/core-app-api@1.10.0-next.2
+  - @backstage/plugin-code-coverage@0.2.17-next.2
+  - @backstage/plugin-cost-insights@0.12.13-next.2
+  - @backstage/plugin-tech-insights@0.3.16-next.2
+  - @backstage/plugin-azure-devops@0.3.6-next.2
+  - @backstage/plugin-gcp-projects@0.3.41-next.2
+  - @backstage/plugin-azure-sites@0.1.13-next.2
+  - @backstage/plugin-cloudbuild@0.3.24-next.2
+  - @backstage/plugin-kubernetes@0.10.3-next.2
+  - @backstage/plugin-lighthouse@0.4.9-next.2
+  - @backstage/plugin-scaffolder@1.14.5-next.2
+  - @backstage/plugin-stackstorm@0.1.6-next.2
+  - @backstage/plugin-dynatrace@7.0.4-next.2
+  - @backstage/plugin-gcalendar@0.3.18-next.2
+  - @backstage/plugin-pagerduty@0.6.5-next.2
+  - @backstage/plugin-shortcuts@0.3.14-next.2
+  - @backstage/plugin-airbrake@0.3.24-next.2
+  - @backstage/plugin-api-docs@0.9.11-next.2
+  - @backstage/plugin-circleci@0.3.24-next.2
+  - @backstage/plugin-devtools@0.1.4-next.2
+  - @backstage/plugin-graphiql@0.2.54-next.2
+  - @backstage/plugin-linguist@0.1.9-next.2
+  - @backstage/plugin-newrelic@0.3.40-next.2
+  - @backstage/plugin-puppetdb@0.1.7-next.2
+  - @backstage/config@1.1.0-next.1
+  - @backstage/plugin-explore@0.4.10-next.2
+  - @backstage/plugin-jenkins@0.8.6-next.2
+  - @backstage/plugin-rollbar@0.4.24-next.2
+  - @backstage/plugin-badges@0.2.48-next.2
+  - @backstage/plugin-search@1.4.0-next.2
+  - @backstage/plugin-sentry@0.5.9-next.2
+  - @backstage/plugin-kafka@0.3.24-next.2
+  - @backstage/plugin-nomad@0.1.5-next.2
+  - @backstage/cli@0.22.13-next.2
+  - @backstage/plugin-gocd@0.1.30-next.2
+  - @backstage/plugin-home@0.5.8-next.2
+  - @backstage/plugin-todo@0.2.26-next.2
+  - @backstage/plugin-adr@0.6.7-next.2
+  - @backstage/plugin-scaffolder-react@1.5.5-next.2
+  - @internal/plugin-catalog-customized@0.0.14-next.2
+  - @backstage/plugin-catalog-graph@0.2.36-next.2
+  - @backstage/plugin-catalog-import@0.9.14-next.2
+  - @backstage/plugin-catalog-react@1.8.4-next.2
+  - @backstage/plugin-newrelic-dashboard@0.2.17-next.2
+  - @backstage/plugin-search-react@1.7.0-next.2
+  - @backstage/plugin-techdocs-react@1.1.10-next.2
+  - @backstage/plugin-permission-react@0.4.15-next.2
+  - @backstage/catalog-model@1.4.2-next.1
+  - @backstage/theme@0.4.1
+  - @backstage/plugin-catalog-common@1.0.16-next.1
+  - @backstage/plugin-linguist-common@0.1.1
+  - @backstage/plugin-search-common@1.2.6-next.1
+
+## 0.2.87-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-playlist@0.1.16-next.1
+  - @backstage/plugin-tech-radar@0.6.8-next.1
+  - @backstage/plugin-catalog-react@1.8.4-next.1
+  - @backstage/core-components@0.13.5-next.1
+  - @backstage/config@1.1.0-next.0
+  - @backstage/plugin-org@0.6.14-next.1
+  - @backstage/plugin-home@0.5.8-next.1
+  - @backstage/plugin-devtools@0.1.4-next.1
+  - @backstage/plugin-user-settings@0.7.9-next.1
+  - @backstage/plugin-search-react@1.7.0-next.1
+  - @backstage/plugin-search@1.4.0-next.1
+  - @backstage/plugin-kubernetes@0.10.3-next.1
+  - @backstage/plugin-techdocs-module-addons-contrib@1.1.0-next.1
+  - @backstage/plugin-adr@0.6.7-next.1
+  - @backstage/plugin-airbrake@0.3.24-next.1
+  - @backstage/plugin-api-docs@0.9.11-next.1
+  - @backstage/plugin-azure-devops@0.3.6-next.1
+  - @backstage/plugin-azure-sites@0.1.13-next.1
+  - @backstage/plugin-badges@0.2.48-next.1
+  - @internal/plugin-catalog-customized@0.0.14-next.1
+  - @backstage/plugin-catalog-graph@0.2.36-next.1
+  - @backstage/plugin-catalog-import@0.9.14-next.1
+  - @backstage/plugin-circleci@0.3.24-next.1
+  - @backstage/plugin-cloudbuild@0.3.24-next.1
+  - @backstage/plugin-code-coverage@0.2.17-next.1
+  - @backstage/plugin-cost-insights@0.12.13-next.1
+  - @backstage/plugin-dynatrace@7.0.4-next.1
+  - @backstage/plugin-entity-feedback@0.2.7-next.1
+  - @backstage/plugin-explore@0.4.10-next.1
+  - @backstage/plugin-github-actions@0.6.5-next.1
+  - @backstage/plugin-gocd@0.1.30-next.1
+  - @backstage/plugin-jenkins@0.8.6-next.1
+  - @backstage/plugin-kafka@0.3.24-next.1
+  - @backstage/plugin-lighthouse@0.4.9-next.1
+  - @backstage/plugin-linguist@0.1.9-next.1
+  - @backstage/plugin-newrelic-dashboard@0.2.17-next.1
+  - @backstage/plugin-nomad@0.1.5-next.1
+  - @backstage/plugin-octopus-deploy@0.2.6-next.1
+  - @backstage/plugin-pagerduty@0.6.5-next.1
+  - @backstage/plugin-puppetdb@0.1.7-next.1
+  - @backstage/plugin-rollbar@0.4.24-next.1
+  - @backstage/plugin-scaffolder@1.14.5-next.1
+  - @backstage/plugin-scaffolder-react@1.5.5-next.1
+  - @backstage/plugin-sentry@0.5.9-next.1
+  - @backstage/plugin-tech-insights@0.3.16-next.1
+  - @backstage/plugin-techdocs@1.6.9-next.1
+  - @backstage/plugin-todo@0.2.26-next.1
+  - @backstage/app-defaults@1.4.3-next.1
+  - @backstage/cli@0.22.13-next.1
+  - @backstage/integration-react@1.1.19-next.1
+  - @backstage/plugin-apache-airflow@0.2.15-next.1
+  - @backstage/plugin-catalog-unprocessed-entities@0.1.3-next.1
+  - @backstage/plugin-gcalendar@0.3.18-next.1
+  - @backstage/plugin-gcp-projects@0.3.41-next.1
+  - @backstage/plugin-graphiql@0.2.54-next.1
+  - @backstage/plugin-microsoft-calendar@0.1.7-next.1
+  - @backstage/plugin-newrelic@0.3.40-next.1
+  - @backstage/plugin-shortcuts@0.3.14-next.1
+  - @backstage/plugin-stack-overflow@0.1.20-next.1
+  - @backstage/plugin-stackstorm@0.1.6-next.1
+  - @backstage/plugin-techdocs-react@1.1.10-next.1
+  - @backstage/catalog-model@1.4.2-next.0
+  - @backstage/core-app-api@1.10.0-next.1
+  - @backstage/core-plugin-api@1.6.0-next.1
+  - @backstage/plugin-permission-react@0.4.15-next.1
+  - @backstage/plugin-catalog-common@1.0.16-next.0
+  - @backstage/theme@0.4.1
+  - @backstage/plugin-linguist-common@0.1.1
+  - @backstage/plugin-search-common@1.2.6-next.0
+
+## 0.2.87-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-unprocessed-entities@0.1.3-next.0
+  - @backstage/integration-react@1.1.18-next.0
+  - @backstage/plugin-microsoft-calendar@0.1.7-next.0
+  - @backstage/plugin-newrelic-dashboard@0.2.16-next.0
+  - @backstage/plugin-apache-airflow@0.2.15-next.0
+  - @backstage/plugin-github-actions@0.6.4-next.0
+  - @backstage/plugin-octopus-deploy@0.2.5-next.0
+  - @backstage/plugin-azure-devops@0.3.5-next.0
+  - @backstage/plugin-gcp-projects@0.3.41-next.0
+  - @backstage/plugin-azure-sites@0.1.12-next.0
+  - @backstage/plugin-cloudbuild@0.3.23-next.0
+  - @backstage/plugin-lighthouse@0.4.8-next.0
+  - @backstage/plugin-tech-radar@0.6.8-next.0
+  - @backstage/plugin-dynatrace@7.0.3-next.0
+  - @backstage/plugin-gcalendar@0.3.18-next.0
+  - @backstage/plugin-shortcuts@0.3.14-next.0
+  - @backstage/plugin-airbrake@0.3.23-next.0
+  - @backstage/plugin-circleci@0.3.23-next.0
+  - @backstage/plugin-graphiql@0.2.54-next.0
+  - @backstage/plugin-linguist@0.1.8-next.0
+  - @backstage/plugin-newrelic@0.3.40-next.0
+  - @backstage/plugin-playlist@0.1.15-next.0
+  - @backstage/plugin-puppetdb@0.1.6-next.0
+  - @backstage/plugin-jenkins@0.8.5-next.0
+  - @backstage/plugin-rollbar@0.4.23-next.0
+  - @backstage/plugin-badges@0.2.47-next.0
+  - @backstage/plugin-sentry@0.5.8-next.0
+  - @backstage/plugin-kafka@0.3.23-next.0
+  - @backstage/plugin-nomad@0.1.4-next.0
+  - @backstage/plugin-todo@0.2.25-next.0
+  - @backstage/plugin-org@0.6.13-next.0
+  - @backstage/cli@0.22.12-next.0
+  - @backstage/plugin-techdocs@1.6.8-next.0
+  - @backstage/plugin-entity-feedback@0.2.6-next.0
+  - @backstage/core-app-api@1.10.0-next.0
+  - @backstage/plugin-code-coverage@0.2.16-next.0
+  - @backstage/core-plugin-api@1.6.0-next.0
+  - @backstage/plugin-cost-insights@0.12.12-next.0
+  - @backstage/core-components@0.13.5-next.0
+  - @backstage/plugin-adr@0.6.6-next.0
+  - @backstage/plugin-catalog-import@0.9.13-next.0
+  - @backstage/plugin-scaffolder@1.14.4-next.0
+  - @backstage/plugin-techdocs-module-addons-contrib@1.0.18-next.0
+  - @backstage/plugin-home@0.5.7-next.0
+  - @backstage/plugin-pagerduty@0.6.4-next.0
+  - @backstage/plugin-stack-overflow@0.1.20-next.0
+  - @backstage/plugin-api-docs@0.9.10-next.0
+  - @internal/plugin-catalog-customized@0.0.14-next.0
+  - @backstage/plugin-catalog-graph@0.2.35-next.0
+  - @backstage/plugin-explore@0.4.9-next.0
+  - @backstage/plugin-scaffolder-react@1.5.4-next.0
+  - @backstage/app-defaults@1.4.3-next.0
+  - @backstage/catalog-model@1.4.1
+  - @backstage/config@1.0.8
+  - @backstage/theme@0.4.1
+  - @backstage/plugin-catalog-common@1.0.15
+  - @backstage/plugin-catalog-react@1.8.3-next.0
+  - @backstage/plugin-devtools@0.1.4-next.0
+  - @backstage/plugin-gocd@0.1.29-next.0
+  - @backstage/plugin-kubernetes@0.10.2-next.0
+  - @backstage/plugin-linguist-common@0.1.1
+  - @backstage/plugin-permission-react@0.4.15-next.0
+  - @backstage/plugin-search@1.3.6-next.0
+  - @backstage/plugin-search-common@1.2.5
+  - @backstage/plugin-search-react@1.6.5-next.0
+  - @backstage/plugin-stackstorm@0.1.6-next.0
+  - @backstage/plugin-tech-insights@0.3.15-next.0
+  - @backstage/plugin-techdocs-react@1.1.10-next.0
+  - @backstage/plugin-user-settings@0.7.8-next.0
+
+## 0.2.86
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-app-api@1.9.1
+  - @backstage/plugin-catalog-graph@0.2.33
+  - @backstage/plugin-playlist@0.1.13
+  - @backstage/plugin-pagerduty@0.6.2
+  - @backstage/plugin-scaffolder@1.14.2
+  - @backstage/plugin-explore@0.4.7
+  - @backstage/plugin-org@0.6.11
+  - @backstage/integration-react@1.1.16
+  - @backstage/plugin-microsoft-calendar@0.1.6
+  - @backstage/plugin-newrelic-dashboard@0.2.14
+  - @backstage/plugin-entity-feedback@0.2.4
+  - @backstage/plugin-linguist-common@0.1.1
+  - @backstage/plugin-apache-airflow@0.2.14
+  - @backstage/plugin-octopus-deploy@0.2.3
+  - @backstage/plugin-stack-overflow@0.1.19
+  - @backstage/plugin-code-coverage@0.2.14
+  - @backstage/plugin-tech-insights@0.3.13
+  - @backstage/plugin-dynatrace@7.0.1
+  - @backstage/plugin-gcalendar@0.3.17
+  - @backstage/plugin-shortcuts@0.3.13
+  - @backstage/plugin-airbrake@0.3.21
+  - @backstage/plugin-kafka@0.3.21
+  - @backstage/plugin-nomad@0.1.2
+  - @backstage/plugin-adr@0.6.4
+  - @backstage/plugin-newrelic@0.3.39
+  - @backstage/cli@0.22.10
+  - @backstage/plugin-kubernetes@0.10.0
+  - @backstage/core-components@0.13.4
+  - @backstage/plugin-home@0.5.5
+  - @backstage/plugin-catalog-react@1.8.1
+  - @backstage/plugin-scaffolder-react@1.5.2
+  - @backstage/plugin-devtools@0.1.3
+  - @backstage/app-defaults@1.4.2
+  - @backstage/core-plugin-api@1.5.3
+  - @backstage/plugin-api-docs@0.9.7
+  - @backstage/plugin-azure-devops@0.3.3
+  - @backstage/plugin-azure-sites@0.1.10
+  - @backstage/plugin-badges@0.2.45
+  - @backstage/plugin-catalog-import@0.9.11
+  - @backstage/plugin-catalog-unprocessed-entities@0.1.2
+  - @backstage/plugin-circleci@0.3.21
+  - @backstage/plugin-cloudbuild@0.3.21
+  - @backstage/plugin-cost-insights@0.12.10
+  - @backstage/plugin-gcp-projects@0.3.40
+  - @backstage/plugin-github-actions@0.6.2
+  - @backstage/plugin-gocd@0.1.27
+  - @backstage/plugin-graphiql@0.2.53
+  - @backstage/plugin-jenkins@0.8.3
+  - @backstage/plugin-lighthouse@0.4.6
+  - @backstage/plugin-linguist@0.1.6
+  - @backstage/plugin-puppetdb@0.1.4
+  - @backstage/plugin-rollbar@0.4.21
+  - @backstage/plugin-search@1.3.4
+  - @backstage/plugin-search-react@1.6.4
+  - @backstage/plugin-sentry@0.5.6
+  - @backstage/plugin-stackstorm@0.1.5
+  - @backstage/plugin-tech-radar@0.6.7
+  - @backstage/plugin-techdocs@1.6.6
+  - @backstage/plugin-techdocs-module-addons-contrib@1.0.16
+  - @backstage/plugin-todo@0.2.23
+  - @backstage/plugin-user-settings@0.7.6
+  - @backstage/catalog-model@1.4.1
+  - @backstage/config@1.0.8
+  - @backstage/theme@0.4.1
+  - @backstage/plugin-catalog-common@1.0.15
+  - @backstage/plugin-permission-react@0.4.14
+  - @backstage/plugin-search-common@1.2.5
+  - @backstage/plugin-techdocs-react@1.1.9
+  - @internal/plugin-catalog-customized@0.0.13
+
+## 0.2.86-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-graph@0.2.33-next.2
+  - @backstage/plugin-linguist-common@0.1.1-next.1
+  - @backstage/plugin-catalog-react@1.8.1-next.1
+  - @backstage/plugin-linguist@0.1.6-next.2
+  - @backstage/plugin-adr@0.6.4-next.2
+  - @backstage/plugin-airbrake@0.3.21-next.2
+  - @backstage/plugin-api-docs@0.9.7-next.2
+  - @backstage/plugin-azure-devops@0.3.3-next.1
+  - @backstage/plugin-azure-sites@0.1.10-next.1
+  - @backstage/plugin-badges@0.2.45-next.1
+  - @internal/plugin-catalog-customized@0.0.13-next.2
+  - @backstage/plugin-catalog-import@0.9.11-next.2
+  - @backstage/plugin-circleci@0.3.21-next.1
+  - @backstage/plugin-cloudbuild@0.3.21-next.1
+  - @backstage/plugin-code-coverage@0.2.14-next.2
+  - @backstage/plugin-cost-insights@0.12.10-next.1
+  - @backstage/plugin-dynatrace@7.0.1-next.2
+  - @backstage/plugin-entity-feedback@0.2.4-next.2
+  - @backstage/plugin-explore@0.4.7-next.1
+  - @backstage/plugin-github-actions@0.6.2-next.2
+  - @backstage/plugin-gocd@0.1.27-next.1
+  - @backstage/plugin-home@0.5.5-next.1
+  - @backstage/plugin-jenkins@0.8.3-next.2
+  - @backstage/plugin-kafka@0.3.21-next.2
+  - @backstage/plugin-kubernetes@0.9.4-next.1
+  - @backstage/plugin-lighthouse@0.4.6-next.1
+  - @backstage/plugin-newrelic-dashboard@0.2.14-next.2
+  - @backstage/plugin-nomad@0.1.2-next.2
+  - @backstage/plugin-octopus-deploy@0.2.3-next.2
+  - @backstage/plugin-org@0.6.11-next.2
+  - @backstage/plugin-pagerduty@0.6.2-next.1
+  - @backstage/plugin-playlist@0.1.13-next.2
+  - @backstage/plugin-puppetdb@0.1.4-next.1
+  - @backstage/plugin-rollbar@0.4.21-next.1
+  - @backstage/plugin-scaffolder@1.14.2-next.2
+  - @backstage/plugin-scaffolder-react@1.5.2-next.1
+  - @backstage/plugin-search@1.3.4-next.1
+  - @backstage/plugin-sentry@0.5.6-next.1
+  - @backstage/plugin-tech-insights@0.3.13-next.2
+  - @backstage/plugin-techdocs@1.6.6-next.2
+  - @backstage/plugin-todo@0.2.23-next.1
+  - @backstage/plugin-user-settings@0.7.6-next.1
+  - @backstage/cli@0.22.10-next.1
+  - @backstage/integration-react@1.1.16-next.1
+  - @backstage/plugin-apache-airflow@0.2.14-next.1
+  - @backstage/plugin-catalog-unprocessed-entities@0.1.2-next.0
+  - @backstage/plugin-devtools@0.1.3-next.1
+  - @backstage/plugin-gcalendar@0.3.17-next.1
+  - @backstage/plugin-gcp-projects@0.3.40-next.0
+  - @backstage/plugin-graphiql@0.2.53-next.0
+  - @backstage/plugin-microsoft-calendar@0.1.6-next.1
+  - @backstage/plugin-newrelic@0.3.39-next.0
+  - @backstage/plugin-shortcuts@0.3.13-next.1
+  - @backstage/plugin-stack-overflow@0.1.19-next.1
+  - @backstage/plugin-stackstorm@0.1.5-next.0
+  - @backstage/plugin-tech-radar@0.6.7-next.0
+  - @backstage/plugin-techdocs-module-addons-contrib@1.0.16-next.1
+
 ## 0.2.86-next.1
 
 ### Patch Changes
diff --git a/packages/app/catalog-info.yaml b/packages/app/catalog-info.yaml
new file mode 100644
index 0000000000..e0808307cc
--- /dev/null
+++ b/packages/app/catalog-info.yaml
@@ -0,0 +1,9 @@
+apiVersion: backstage.io/v1alpha1
+kind: Component
+metadata:
+  name: example-app
+  title: example-app
+spec:
+  lifecycle: experimental
+  type: backstage-frontend
+  owner: maintainers
diff --git a/packages/app/package.json b/packages/app/package.json
index f33a5645b9..52e7a295a1 100644
--- a/packages/app/package.json
+++ b/packages/app/package.json
@@ -1,6 +1,6 @@
 {
   "name": "example-app",
-  "version": "0.2.86-next.1",
+  "version": "0.2.87-next.2",
   "private": true,
   "backstage": {
     "role": "frontend"
@@ -108,7 +108,6 @@
     "@testing-library/react": "^12.1.3",
     "@testing-library/user-event": "^14.0.0",
     "@types/jquery": "^3.3.34",
-    "@types/node": "^16.11.26",
     "@types/react": "*",
     "@types/react-dom": "*",
     "@types/zen-observable": "^0.8.0",
diff --git a/packages/app/src/components/home/HomePage.tsx b/packages/app/src/components/home/HomePage.tsx
index aa3739728e..a8ddc0e0e2 100644
--- a/packages/app/src/components/home/HomePage.tsx
+++ b/packages/app/src/components/home/HomePage.tsx
@@ -15,14 +15,14 @@
  */
 
 import {
-  HomePageRandomJoke,
-  WelcomeTitle,
-  HeaderWorldClock,
   ClockConfig,
-  HomePageStarredEntities,
   CustomHomepageGrid,
-  HomePageToolkit,
+  HeaderWorldClock,
   HomePageCompanyLogo,
+  HomePageRandomJoke,
+  HomePageStarredEntities,
+  HomePageToolkit,
+  WelcomeTitle,
 } from '@backstage/plugin-home';
 import { Content, Header, Page } from '@backstage/core-components';
 import { HomePageSearchBar } from '@backstage/plugin-search';
@@ -64,6 +64,9 @@ const defaultConfig = [
     y: 0,
     width: 12,
     height: 1,
+    movable: false,
+    resizable: false,
+    deletable: false,
   },
   {
     component: 'WelcomeTitle',
@@ -77,7 +80,7 @@ const defaultConfig = [
     x: 0,
     y: 2,
     width: 12,
-    height: 1,
+    height: 2,
   },
 ];
 
diff --git a/packages/app/src/setupTests.ts b/packages/app/src/setupTests.ts
index 23fcbe9676..d6dc983b17 100644
--- a/packages/app/src/setupTests.ts
+++ b/packages/app/src/setupTests.ts
@@ -19,3 +19,9 @@
 // expect(element).toHaveTextContent(/react/i)
 // learn more: https://github.com/testing-library/jest-dom
 import '@testing-library/jest-dom';
+
+// Do not remove, patching jsdom environment to support TextEncoder, refer to https://github.com/jsdom/jsdom/issues/2524
+// eslint-disable-next-line no-restricted-imports
+import { TextEncoder } from 'util';
+
+global.TextEncoder = TextEncoder;
diff --git a/packages/backend-app-api/CHANGELOG.md b/packages/backend-app-api/CHANGELOG.md
index cbfbfef468..e53e5d273d 100644
--- a/packages/backend-app-api/CHANGELOG.md
+++ b/packages/backend-app-api/CHANGELOG.md
@@ -1,5 +1,111 @@
 # @backstage/backend-app-api
 
+## 0.5.3-next.2
+
+### Patch Changes
+
+- 37a20c7f14aa: Adds include and exclude configuration to feature discovery of backend packages
+  Adds alpha modules to feature discovery
+- 3fc64b9e2f8f: Extension points are now tracked via their ID rather than reference, in order to support package duplication.
+- b219d097b3f4: Backend startup will now fail if any circular service dependencies are detected.
+- Updated dependencies
+  - @backstage/config-loader@1.5.0-next.2
+  - @backstage/config@1.1.0-next.1
+  - @backstage/backend-tasks@0.5.8-next.2
+  - @backstage/backend-common@0.19.5-next.2
+  - @backstage/plugin-auth-node@0.3.0-next.2
+  - @backstage/plugin-permission-node@0.7.14-next.2
+  - @backstage/backend-plugin-api@0.6.3-next.2
+  - @backstage/cli-common@0.1.12
+  - @backstage/cli-node@0.1.3
+  - @backstage/errors@1.2.1
+  - @backstage/types@1.1.0
+
+## 0.5.3-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config@1.1.0-next.0
+  - @backstage/backend-tasks@0.5.8-next.1
+  - @backstage/backend-common@0.19.5-next.1
+  - @backstage/backend-plugin-api@0.6.3-next.1
+  - @backstage/config-loader@1.5.0-next.1
+  - @backstage/plugin-auth-node@0.3.0-next.1
+  - @backstage/plugin-permission-node@0.7.14-next.1
+  - @backstage/cli-common@0.1.12
+  - @backstage/cli-node@0.1.3
+  - @backstage/errors@1.2.1
+  - @backstage/types@1.1.0
+
+## 0.5.2-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-auth-node@0.3.0-next.0
+  - @backstage/backend-common@0.19.4-next.0
+  - @backstage/config-loader@1.5.0-next.0
+  - @backstage/backend-tasks@0.5.7-next.0
+  - @backstage/backend-plugin-api@0.6.2-next.0
+  - @backstage/cli-common@0.1.12
+  - @backstage/cli-node@0.1.3
+  - @backstage/config@1.0.8
+  - @backstage/errors@1.2.1
+  - @backstage/types@1.1.0
+  - @backstage/plugin-permission-node@0.7.13-next.0
+
+## 0.5.0
+
+### Minor Changes
+
+- b9c57a4f857e: **BREAKING**: Renamed `configServiceFactory` to `rootConfigServiceFactory`.
+- a6d7983f349c: **BREAKING**: Removed the `services` option from `createBackend`. Service factories are now `BackendFeature`s and should be installed with `backend.add(...)` instead. The following should be migrated:
+
+  ```ts
+  const backend = createBackend({ services: [myCustomServiceFactory] });
+  ```
+
+  To instead pass the service factory via `backend.add(...)`:
+
+  ```ts
+  const backend = createBackend();
+  backend.add(customRootLoggerServiceFactory);
+  ```
+
+### Patch Changes
+
+- e65c4896f755: Do not throw in backend.stop, if start failed
+- c7aa4ff1793c: Allow modules to register extension points.
+- 57a10c6c69cc: Add validation to make sure that extension points do not cross plugin boundaries.
+- cc9256a33bcc: Added new experimental `featureDiscoveryServiceFactory`, available as an `/alpha` export.
+- Updated dependencies
+  - @backstage/backend-common@0.19.2
+  - @backstage/config-loader@1.4.0
+  - @backstage/backend-plugin-api@0.6.0
+  - @backstage/cli-node@0.1.3
+  - @backstage/plugin-auth-node@0.2.17
+  - @backstage/backend-tasks@0.5.5
+  - @backstage/plugin-permission-node@0.7.11
+  - @backstage/cli-common@0.1.12
+  - @backstage/config@1.0.8
+  - @backstage/errors@1.2.1
+  - @backstage/types@1.1.0
+
+## 0.5.0-next.2
+
+### Patch Changes
+
+- e65c4896f755: Do not throw in backend.stop, if start failed
+- cc9256a33bcc: Added new experimental `featureDiscoveryServiceFactory`, available as an `/alpha` export.
+- Updated dependencies
+  - @backstage/backend-plugin-api@0.6.0-next.2
+  - @backstage/backend-tasks@0.5.5-next.2
+  - @backstage/backend-common@0.19.2-next.2
+  - @backstage/plugin-permission-node@0.7.11-next.2
+  - @backstage/plugin-auth-node@0.2.17-next.2
+  - @backstage/config-loader@1.4.0-next.1
+
 ## 0.5.0-next.1
 
 ### Minor Changes
diff --git a/packages/backend-app-api/alpha-api-report.md b/packages/backend-app-api/alpha-api-report.md
new file mode 100644
index 0000000000..488feedf2c
--- /dev/null
+++ b/packages/backend-app-api/alpha-api-report.md
@@ -0,0 +1,16 @@
+## API Report File for "@backstage/backend-app-api"
+
+> Do not edit this file. It is a report generated by [API Extractor](https://api-extractor.com/).
+
+```ts
+import { FeatureDiscoveryService } from '@backstage/backend-plugin-api/alpha';
+import { ServiceFactory } from '@backstage/backend-plugin-api';
+
+// @alpha (undocumented)
+export const featureDiscoveryServiceFactory: () => ServiceFactory<
+  FeatureDiscoveryService,
+  'root'
+>;
+
+// (No @packageDocumentation comment for this package)
+```
diff --git a/packages/backend-app-api/api-report.md b/packages/backend-app-api/api-report.md
index 675a7755fc..3bddcc48d5 100644
--- a/packages/backend-app-api/api-report.md
+++ b/packages/backend-app-api/api-report.md
@@ -43,7 +43,14 @@ import { UrlReader } from '@backstage/backend-common';
 // @public (undocumented)
 export interface Backend {
   // (undocumented)
-  add(feature: BackendFeature): void;
+  add(
+    feature:
+      | BackendFeature
+      | (() => BackendFeature)
+      | Promise<{
+          default: BackendFeature | (() => BackendFeature);
+        }>,
+  ): void;
   // (undocumented)
   start(): Promise<void>;
   // (undocumented)
@@ -81,7 +88,7 @@ export function createSpecializedBackend(
 // @public (undocumented)
 export interface CreateSpecializedBackendOptions {
   // (undocumented)
-  services: ServiceFactoryOrFunction[];
+  defaultServiceFactories: ServiceFactoryOrFunction[];
 }
 
 // @public (undocumented)
diff --git a/packages/backend-app-api/catalog-info.yaml b/packages/backend-app-api/catalog-info.yaml
new file mode 100644
index 0000000000..051e7ab5c2
--- /dev/null
+++ b/packages/backend-app-api/catalog-info.yaml
@@ -0,0 +1,10 @@
+apiVersion: backstage.io/v1alpha1
+kind: Component
+metadata:
+  name: backstage-backend-app-api
+  title: '@backstage/backend-app-api'
+  description: Core API used by Backstage backend apps
+spec:
+  lifecycle: experimental
+  type: backstage-node-library
+  owner: maintainers
diff --git a/packages/backend-app-api/package.json b/packages/backend-app-api/package.json
index d1aa511794..3bd12759f2 100644
--- a/packages/backend-app-api/package.json
+++ b/packages/backend-app-api/package.json
@@ -1,17 +1,30 @@
 {
   "name": "@backstage/backend-app-api",
   "description": "Core API used by Backstage backend apps",
-  "version": "0.5.0-next.1",
+  "version": "0.5.3-next.2",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "publishConfig": {
-    "access": "public",
-    "main": "dist/index.cjs.js",
-    "types": "dist/index.d.ts"
+    "access": "public"
   },
   "backstage": {
     "role": "node-library"
   },
+  "exports": {
+    ".": "./src/index.ts",
+    "./alpha": "./src/alpha.ts",
+    "./package.json": "./package.json"
+  },
+  "typesVersions": {
+    "*": {
+      "alpha": [
+        "src/alpha.ts"
+      ],
+      "package.json": [
+        "package.json"
+      ]
+    }
+  },
   "homepage": "https://backstage.io",
   "repository": {
     "type": "git",
@@ -36,6 +49,7 @@
     "@backstage/backend-plugin-api": "workspace:^",
     "@backstage/backend-tasks": "workspace:^",
     "@backstage/cli-common": "workspace:^",
+    "@backstage/cli-node": "workspace:^",
     "@backstage/config": "workspace:^",
     "@backstage/config-loader": "workspace:^",
     "@backstage/errors": "workspace:^",
@@ -73,6 +87,7 @@
     "@types/node-forge": "^1.3.0",
     "@types/stoppable": "^1.1.0",
     "http-errors": "^2.0.0",
+    "mock-fs": "^5.2.0",
     "supertest": "^6.1.3"
   },
   "files": [
diff --git a/packages/backend-app-api/src/alpha.ts b/packages/backend-app-api/src/alpha.ts
new file mode 100644
index 0000000000..a334214738
--- /dev/null
+++ b/packages/backend-app-api/src/alpha.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 { featureDiscoveryServiceFactory } from './alpha/featureDiscoveryServiceFactory';
diff --git a/packages/backend-app-api/src/alpha/featureDiscoveryServiceFactory.test.ts b/packages/backend-app-api/src/alpha/featureDiscoveryServiceFactory.test.ts
new file mode 100644
index 0000000000..448f1a8ff7
--- /dev/null
+++ b/packages/backend-app-api/src/alpha/featureDiscoveryServiceFactory.test.ts
@@ -0,0 +1,329 @@
+/*
+ * 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 mockFs from 'mock-fs';
+import { resolve as resolvePath, dirname } from 'path';
+import { startTestBackend, mockServices } from '@backstage/backend-test-utils';
+import { featureDiscoveryServiceFactory } from './featureDiscoveryServiceFactory';
+
+const rootDir = dirname(process.argv[1]);
+
+describe('featureDiscoveryServiceFactory', () => {
+  beforeEach(() => {
+    mockFs({
+      [rootDir]: {
+        'package.json': JSON.stringify({
+          name: 'example-app',
+          dependencies: {
+            'detected-plugin': '0.0.0',
+            'detected-module': '0.0.0',
+            'detected-plugin-with-alpha': '0.0.0',
+            'detected-library': '0.0.0',
+          },
+        }),
+      },
+      [resolvePath(rootDir, 'node_modules/detected-plugin')]: {
+        'package.json': JSON.stringify({
+          name: 'detected-plugin',
+          main: 'index.js',
+          backstage: {
+            role: 'backend-plugin',
+          },
+        }),
+        'index.js': `
+        const { createBackendPlugin, coreServices } = require('@backstage/backend-plugin-api');
+        exports.default = createBackendPlugin({
+            pluginId: 'detected',
+            register(env) {
+              env.registerInit({
+                deps: { logger: coreServices.rootLogger },
+                async init({ logger }) {
+                  logger.warn('detected-plugin');
+                },
+              });
+            },
+        });
+        `,
+      },
+      [resolvePath(rootDir, 'node_modules/detected-module')]: {
+        'package.json': JSON.stringify({
+          name: 'detected-module',
+          main: 'index.js',
+          backstage: {
+            role: 'backend-plugin-module',
+          },
+        }),
+        'index.js': `
+        const { createBackendModule, coreServices } = require('@backstage/backend-plugin-api');
+        exports.default = createBackendModule({
+            pluginId: 'detected',
+            moduleId: 'derp',
+            register(env) {
+              env.registerInit({
+                deps: { logger: coreServices.rootLogger },
+                async init({ logger }) {
+                  logger.warn('detected-module');
+                },
+              });
+            },
+        });
+        `,
+      },
+      [resolvePath(rootDir, 'node_modules/detected-plugin-with-alpha')]: {
+        'package.json': JSON.stringify({
+          name: 'detected-plugin-with-alpha',
+          main: 'index.js',
+          exports: {
+            '.': {
+              default: 'index.js',
+            },
+            './alpha': {
+              default: 'alpha.js',
+            },
+            './package.json': './package.json',
+          },
+          backstage: {
+            role: 'backend-plugin',
+          },
+        }),
+        'index.js': `exports.default = undefined;`,
+        'alpha.js': `
+        const { createBackendPlugin, coreServices } = require('@backstage/backend-plugin-api');
+        exports.default = createBackendPlugin({
+            pluginId: 'detected-alpha',
+            register(env) {
+              env.registerInit({
+                deps: { logger: coreServices.rootLogger },
+                async init({ logger }) {
+                  logger.warn('detected-plugin-with-alpha');
+                },
+              });
+            },
+        });
+        `,
+      },
+      [resolvePath(rootDir, 'node_modules/detected-library')]: {
+        'package.json': JSON.stringify({
+          name: 'detected-library',
+          main: 'index.js',
+          backstage: {
+            role: 'node-library',
+          },
+        }),
+        'index.js': `
+        const { createServiceFactory, createServiceRef, coreServices } = require('@backstage/backend-plugin-api');
+        exports.default = createServiceFactory({
+          service: createServiceRef({ id: 'test', scope: 'root' }),
+          deps: { logger: coreServices.rootLogger },
+          factory({ logger }) {
+            logger.warn('detected-library');
+            return {};
+          },
+        });
+        `,
+      },
+    });
+  });
+
+  afterEach(() => {
+    mockFs.restore();
+  });
+
+  it('should detect plugin and module packages when "all" is specified', async () => {
+    const mock = mockServices.rootLogger.mock({ child: () => mock });
+
+    await startTestBackend({
+      features: [
+        mock.factory,
+        featureDiscoveryServiceFactory(),
+        mockServices.rootConfig.factory({
+          data: { backend: { packages: 'all' } },
+        }),
+      ],
+    });
+
+    expect(mock.warn).toHaveBeenCalledWith('detected-plugin');
+    expect(mock.warn).toHaveBeenCalledWith('detected-module');
+    expect(mock.warn).toHaveBeenCalledWith('detected-plugin-with-alpha');
+    expect(mock.warn).toHaveBeenCalledWith('detected-library');
+  });
+
+  it('detects only the packages that are listed as included', async () => {
+    const mock = mockServices.rootLogger.mock({ child: () => mock });
+
+    await startTestBackend({
+      features: [
+        mock.factory,
+        featureDiscoveryServiceFactory(),
+        mockServices.rootConfig.factory({
+          data: {
+            backend: {
+              packages: {
+                include: [
+                  'detected-plugin',
+                  'detected-plugin-with-alpha',
+                  'detected-library',
+                ],
+              },
+            },
+          },
+        }),
+      ],
+    });
+
+    expect(mock.warn).toHaveBeenCalledWith('detected-plugin');
+    expect(mock.warn).toHaveBeenCalledWith('detected-plugin-with-alpha');
+    expect(mock.warn).toHaveBeenCalledWith('detected-library');
+    expect(mock.warn).not.toHaveBeenCalledWith('detected-module');
+  });
+
+  it('does not detect packages when included is an empty list', async () => {
+    const mock = mockServices.rootLogger.mock({ child: () => mock });
+
+    await startTestBackend({
+      features: [
+        mock.factory,
+        featureDiscoveryServiceFactory(),
+        mockServices.rootConfig.factory({
+          data: {
+            backend: {
+              packages: {
+                include: [],
+              },
+            },
+          },
+        }),
+      ],
+    });
+
+    expect(mock.warn).not.toHaveBeenCalledWith('detected-plugin');
+    expect(mock.warn).not.toHaveBeenCalledWith('detected-plugin-with-alpha');
+    expect(mock.warn).not.toHaveBeenCalledWith('detected-module');
+    expect(mock.warn).not.toHaveBeenCalledWith('detected-library');
+  });
+
+  it('does not detect an excluded packages', async () => {
+    const mock = mockServices.rootLogger.mock({ child: () => mock });
+
+    await startTestBackend({
+      features: [
+        mock.factory,
+        featureDiscoveryServiceFactory(),
+        mockServices.rootConfig.factory({
+          data: {
+            backend: {
+              packages: {
+                exclude: ['detected-plugin', 'detected-module'],
+              },
+            },
+          },
+        }),
+      ],
+    });
+
+    expect(mock.warn).not.toHaveBeenCalledWith('detected-plugin');
+    expect(mock.warn).not.toHaveBeenCalledWith('detected-module');
+    expect(mock.warn).toHaveBeenCalledWith('detected-plugin-with-alpha');
+    expect(mock.warn).toHaveBeenCalledWith('detected-library');
+  });
+
+  it('does not excluded packages when it is an empty list', async () => {
+    const mock = mockServices.rootLogger.mock({ child: () => mock });
+
+    await startTestBackend({
+      features: [
+        mock.factory,
+        featureDiscoveryServiceFactory(),
+        mockServices.rootConfig.factory({
+          data: {
+            backend: {
+              packages: {
+                exclude: [],
+              },
+            },
+          },
+        }),
+      ],
+    });
+
+    expect(mock.warn).toHaveBeenCalledWith('detected-plugin');
+    expect(mock.warn).toHaveBeenCalledWith('detected-module');
+    expect(mock.warn).toHaveBeenCalledWith('detected-plugin-with-alpha');
+    expect(mock.warn).toHaveBeenCalledWith('detected-library');
+  });
+
+  it('does not detect packages that are included and excluded', async () => {
+    const mock = mockServices.rootLogger.mock({ child: () => mock });
+
+    await startTestBackend({
+      features: [
+        mock.factory,
+        featureDiscoveryServiceFactory(),
+        mockServices.rootConfig.factory({
+          data: {
+            backend: {
+              packages: {
+                include: [
+                  'detected-plugin',
+                  'detected-module',
+                  'detected-plugin-with-alpha',
+                ],
+                exclude: ['detected-plugin'],
+              },
+            },
+          },
+        }),
+      ],
+    });
+
+    expect(mock.warn).not.toHaveBeenCalledWith('detected-plugin');
+    expect(mock.warn).not.toHaveBeenCalledWith('detected-library');
+    expect(mock.warn).toHaveBeenCalledWith('detected-module');
+    expect(mock.warn).toHaveBeenCalledWith('detected-plugin-with-alpha');
+  });
+
+  it('does not detect any packages when "packages" is empty', async () => {
+    const mock = mockServices.rootLogger.mock({ child: () => mock });
+
+    await startTestBackend({
+      features: [
+        mock.factory,
+        featureDiscoveryServiceFactory(),
+        mockServices.rootConfig.factory({
+          data: { backend: { packages: {} } },
+        }),
+      ],
+    });
+
+    expect(mock.warn).not.toHaveBeenCalled();
+  });
+
+  it('does not detect any packages when "packages" is not present', async () => {
+    const mock = mockServices.rootLogger.mock({ child: () => mock });
+
+    await startTestBackend({
+      features: [
+        mock.factory,
+        featureDiscoveryServiceFactory(),
+        mockServices.rootConfig.factory({
+          data: { backend: {} },
+        }),
+      ],
+    });
+
+    expect(mock.warn).not.toHaveBeenCalled();
+  });
+});
diff --git a/packages/backend-app-api/src/alpha/featureDiscoveryServiceFactory.ts b/packages/backend-app-api/src/alpha/featureDiscoveryServiceFactory.ts
new file mode 100644
index 0000000000..b68475a77b
--- /dev/null
+++ b/packages/backend-app-api/src/alpha/featureDiscoveryServiceFactory.ts
@@ -0,0 +1,174 @@
+/*
+ * 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 {
+  BackendFeature,
+  RootConfigService,
+  RootLoggerService,
+  coreServices,
+  createServiceFactory,
+} from '@backstage/backend-plugin-api';
+import {
+  featureDiscoveryServiceRef,
+  FeatureDiscoveryService,
+} from '@backstage/backend-plugin-api/alpha';
+import { resolve as resolvePath, dirname } from 'path';
+import fs from 'fs-extra';
+import { BackstagePackageJson } from '@backstage/cli-node';
+
+/** @internal */
+async function findClosestPackageDir(
+  searchDir: string,
+): Promise<string | undefined> {
+  let path = searchDir;
+
+  // Some confidence check to avoid infinite loop
+  for (let i = 0; i < 1000; i++) {
+    const packagePath = resolvePath(path, 'package.json');
+    const exists = await fs.pathExists(packagePath);
+    if (exists) {
+      return path;
+    }
+
+    const newPath = dirname(path);
+    if (newPath === path) {
+      return undefined;
+    }
+    path = newPath;
+  }
+
+  throw new Error(
+    `Iteration limit reached when searching for root package.json at ${searchDir}`,
+  );
+}
+
+/** @internal */
+class PackageDiscoveryService implements FeatureDiscoveryService {
+  constructor(
+    private readonly config: RootConfigService,
+    private readonly logger: RootLoggerService,
+  ) {}
+
+  getDependencyNames(path: string) {
+    const { dependencies } = require(path) as BackstagePackageJson;
+    const packagesConfig = this.config.getOptional('backend.packages');
+
+    const dependencyNames = Object.keys(dependencies || {});
+
+    if (packagesConfig === 'all') {
+      return dependencyNames;
+    }
+
+    const includedPackagesConfig = this.config.getOptionalStringArray(
+      'backend.packages.include',
+    );
+
+    const includedPackages = includedPackagesConfig
+      ? new Set(includedPackagesConfig)
+      : dependencyNames;
+    const excludedPackagesSet = new Set(
+      this.config.getOptionalStringArray('backend.packages.exclude'),
+    );
+
+    return [...includedPackages].filter(name => !excludedPackagesSet.has(name));
+  }
+
+  async getBackendFeatures(): Promise<{ features: Array<BackendFeature> }> {
+    const packagesConfig = this.config.getOptional('backend.packages');
+    if (!packagesConfig || Object.keys(packagesConfig).length === 0) {
+      return { features: [] };
+    }
+
+    const packageDir = await findClosestPackageDir(process.argv[1]);
+    if (!packageDir) {
+      throw new Error('Package discovery failed to find package.json');
+    }
+    const dependencyNames = this.getDependencyNames(
+      resolvePath(packageDir, 'package.json'),
+    );
+
+    const features: BackendFeature[] = [];
+
+    for (const name of dependencyNames) {
+      const depPkg = require(require.resolve(`${name}/package.json`, {
+        paths: [packageDir],
+      })) as BackstagePackageJson;
+      if (!depPkg?.backstage || depPkg?.backstage?.role === 'cli') {
+        continue; // Not a backstage package, ignore
+      }
+
+      const exportedModulePaths = [
+        require.resolve(name, {
+          paths: [packageDir],
+        }),
+      ];
+
+      // Find modules exported as alpha
+      try {
+        exportedModulePaths.push(
+          require.resolve(`${name}/alpha`, { paths: [packageDir] }),
+        );
+      } catch {
+        /* ignore */
+      }
+
+      for (const modulePath of exportedModulePaths) {
+        const mod = require(modulePath);
+
+        if (isBackendFeature(mod.default)) {
+          this.logger.info(`Detected: ${name}`);
+          features.push(mod.default);
+        }
+        if (isBackendFeatureFactory(mod.default)) {
+          this.logger.info(`Detected: ${name}`);
+          features.push(mod.default());
+        }
+      }
+    }
+
+    return { features };
+  }
+}
+
+/** @alpha */
+export const featureDiscoveryServiceFactory = createServiceFactory({
+  service: featureDiscoveryServiceRef,
+  deps: {
+    config: coreServices.rootConfig,
+    logger: coreServices.rootLogger,
+  },
+  factory({ config, logger }) {
+    return new PackageDiscoveryService(config, logger);
+  },
+});
+
+function isBackendFeature(value: unknown): value is BackendFeature {
+  return (
+    !!value &&
+    typeof value === 'object' &&
+    (value as BackendFeature).$$type === '@backstage/BackendFeature'
+  );
+}
+
+function isBackendFeatureFactory(
+  value: unknown,
+): value is () => BackendFeature {
+  return (
+    !!value &&
+    typeof value === 'function' &&
+    (value as any).$$type === '@backstage/BackendFeatureFactory'
+  );
+}
diff --git a/packages/backend-app-api/src/lib/DependencyGraph.test.ts b/packages/backend-app-api/src/lib/DependencyGraph.test.ts
new file mode 100644
index 0000000000..394359e486
--- /dev/null
+++ b/packages/backend-app-api/src/lib/DependencyGraph.test.ts
@@ -0,0 +1,518 @@
+/*
+ * 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 { DependencyGraph } from './DependencyGraph';
+
+describe('DependencyGraph', () => {
+  it('should be empty', async () => {
+    const empty = DependencyGraph.fromMap({});
+    expect(empty.findUnsatisfiedDeps()).toEqual([]);
+    expect(empty.detectCircularDependency()).toBeUndefined();
+    await expect(
+      empty.parallelTopologicalTraversal(async id => id),
+    ).resolves.toEqual([]);
+  });
+
+  describe('detectCircularDependency', () => {
+    it('should return undefined with no deps', () => {
+      expect(
+        DependencyGraph.fromMap({
+          1: {},
+          2: {},
+          3: {},
+          4: {},
+        }).detectCircularDependency(),
+      ).toBeUndefined();
+    });
+
+    it('should return undefined with no circular deps', () => {
+      expect(
+        DependencyGraph.fromMap({
+          1: { provides: ['a'] },
+          2: { consumes: ['a'], provides: ['b', 'c'] },
+          3: { consumes: ['b'] },
+          4: { consumes: ['c'] },
+        }).detectCircularDependency(),
+      ).toBeUndefined();
+    });
+
+    it('should detect an immediate circular dependency', () => {
+      expect(
+        DependencyGraph.fromMap({
+          1: { provides: ['a'], consumes: ['a'] },
+        }).detectCircularDependency(),
+      ).toEqual(['1', '1']);
+    });
+
+    it('should detect a small circular dependency', () => {
+      expect(
+        DependencyGraph.fromMap({
+          1: { provides: ['a'], consumes: ['b'] },
+          2: { provides: ['b'], consumes: ['a'] },
+        }).detectCircularDependency(),
+      ).toEqual(['1', '2', '1']);
+    });
+
+    it('should detect a larger distance circular dependency', () => {
+      expect(
+        DependencyGraph.fromMap({
+          1: { provides: ['a'] },
+          2: { provides: ['b'], consumes: ['a', 'e'] },
+          3: { provides: ['c'], consumes: ['b'] },
+          4: { provides: ['d', 'e'], consumes: ['c', 'a'] },
+        }).detectCircularDependency(),
+      ).toEqual(['2', '4', '3', '2']);
+    });
+
+    it('should detect a circular dependency starting from the first node', () => {
+      expect(
+        DependencyGraph.fromMap({
+          1: { provides: ['a'], consumes: ['b'] },
+          2: { provides: ['b'], consumes: ['c'] },
+          3: { provides: ['c'], consumes: ['d'] },
+          4: { provides: ['d'], consumes: ['a'] },
+        }).detectCircularDependency(),
+      ).toEqual(['1', '2', '3', '4', '1']);
+    });
+
+    it('should detect all independent circular dependency cycles', () => {
+      expect(
+        Array.from(
+          DependencyGraph.fromMap({
+            // Cycle 1
+            1: { provides: ['a'], consumes: ['b'] },
+            2: { provides: ['b'], consumes: ['c'] },
+            3: { provides: ['c'], consumes: ['a'] },
+
+            // Cycle 2
+            4: { provides: ['d'], consumes: ['e'] },
+            5: { provides: ['e'], consumes: ['f'] },
+            6: { provides: ['f'], consumes: ['d'] },
+
+            // Cycle 3
+            7: { provides: ['g'], consumes: ['h'] },
+            8: { provides: ['h'], consumes: ['i'] },
+            9: { provides: ['i'], consumes: ['g'] },
+          }).detectCircularDependencies(),
+        ),
+      ).toEqual([
+        ['1', '2', '3', '1'],
+        ['4', '5', '6', '4'],
+        ['7', '8', '9', '7'],
+      ]);
+    });
+
+    it('should only detect unique circular dependency cycles', () => {
+      expect(
+        Array.from(
+          DependencyGraph.fromMap({
+            1: { provides: ['a'], consumes: ['b'] },
+            2: { provides: ['b'], consumes: ['c', 'a'] },
+            3: { provides: ['c'], consumes: ['d', 'a'] },
+            4: { provides: ['d'], consumes: ['e', 'a'] },
+            5: { provides: ['e'], consumes: ['f', 'a'] },
+            6: { provides: ['f'], consumes: ['h', 'a'] },
+            7: { provides: ['h'], consumes: ['a'] },
+          }).detectCircularDependencies(),
+        ),
+      ).toEqual([
+        ['1', '2', '1'],
+        ['1', '2', '3', '1'],
+        ['1', '2', '3', '4', '1'],
+        ['1', '2', '3', '4', '5', '1'],
+        ['1', '2', '3', '4', '5', '6', '1'],
+        ['1', '2', '3', '4', '5', '6', '7', '1'],
+      ]);
+    });
+
+    it('should detect circular dependency cycles in order when fromIterable', () => {
+      expect(
+        Array.from(
+          DependencyGraph.fromIterable([
+            { value: 'a', provides: ['a'], consumes: ['b'] },
+            { value: 'b', provides: ['b'], consumes: ['c', 'a'] },
+            { value: 'c', provides: ['c'], consumes: ['d', 'a'] },
+            { value: '4', provides: ['d'], consumes: ['e', 'a'] },
+            { value: '5', provides: ['e'], consumes: ['f', 'a'] },
+            { value: '6', provides: ['f'], consumes: ['h', 'a'] },
+          ]).detectCircularDependencies(),
+        ),
+      ).toEqual([
+        ['a', 'b', 'a'],
+        ['a', 'b', 'c', 'a'],
+        ['a', 'b', 'c', '4', 'a'],
+        ['a', 'b', 'c', '4', '5', 'a'],
+        ['a', 'b', 'c', '4', '5', '6', 'a'],
+      ]);
+    });
+
+    it('should detect circular dependency cycles in order by key when fromMap', () => {
+      expect(
+        Array.from(
+          DependencyGraph.fromMap({
+            1: { provides: ['a'], consumes: ['b'] },
+            2: { provides: ['b'], consumes: ['c', 'a'] },
+            3: { provides: ['c'], consumes: ['d', 'a'] },
+            4: { provides: ['d'], consumes: ['e', 'a'] },
+            5: { provides: ['e'], consumes: ['f', 'a'] },
+            6: { provides: ['f'], consumes: ['h', 'a'] },
+          }).detectCircularDependencies(),
+        ),
+      ).toEqual([
+        ['1', '2', '1'],
+        ['1', '2', '3', '1'],
+        ['1', '2', '3', '4', '1'],
+        ['1', '2', '3', '4', '5', '1'],
+        ['1', '2', '3', '4', '5', '6', '1'],
+      ]);
+    });
+
+    it('should detect circular dependency cycles in order by key when fromMap 2', () => {
+      expect(
+        Array.from(
+          DependencyGraph.fromMap({
+            a: { provides: ['a'], consumes: ['b'] },
+            b: { provides: ['b'], consumes: ['c', 'a'] },
+            c: { provides: ['c'], consumes: ['d', 'a'] },
+            4: { provides: ['d'], consumes: ['e', 'a'] },
+            5: { provides: ['e'], consumes: ['f', 'a'] },
+            6: { provides: ['f'], consumes: ['h', 'a'] },
+          }).detectCircularDependencies(),
+        ),
+      ).toEqual([
+        ['4', 'a', 'b', 'c', '4'],
+        ['5', 'a', 'b', 'c', '4', '5'],
+        ['6', 'a', 'b', 'c', '4', '5', '6'],
+        ['a', 'b', 'a'],
+        ['a', 'b', 'c', 'a'],
+      ]);
+    });
+
+    it('should detect circular dependency cycles in order by key when fromMap 3', () => {
+      expect(
+        Array.from(
+          DependencyGraph.fromMap({
+            a: { provides: ['a'], consumes: ['b'] },
+            b: { provides: ['b'], consumes: ['c', 'a'] },
+            c: { provides: ['c'], consumes: ['d', 'a'] },
+            d: { provides: ['d'], consumes: ['e', 'a'] },
+            e: { provides: ['e'], consumes: ['f', 'a'] },
+            f: { provides: ['f'], consumes: ['h', 'a'] },
+          }).detectCircularDependencies(),
+        ),
+      ).toEqual([
+        ['a', 'b', 'a'],
+        ['a', 'b', 'c', 'a'],
+        ['a', 'b', 'c', 'd', 'a'],
+        ['a', 'b', 'c', 'd', 'e', 'a'],
+        ['a', 'b', 'c', 'd', 'e', 'f', 'a'],
+      ]);
+    });
+
+    it('should detect circular dependency cycles with duplicate keys when fromIterable', () => {
+      expect(
+        Array.from(
+          DependencyGraph.fromIterable([
+            { value: 'a', provides: ['a'], consumes: ['b'] },
+            { value: 'a', provides: ['b'], consumes: ['c', 'a'] },
+            { value: 'a', provides: ['c'], consumes: ['d', 'a'] },
+            { value: 'a', provides: ['d'], consumes: ['e', 'a'] },
+            { value: 'a', provides: ['e'], consumes: ['f', 'a'] },
+            { value: 'a', provides: ['f'], consumes: ['h', 'a'] },
+          ]).detectCircularDependencies(),
+        ),
+      ).toEqual([
+        ['a', 'a', 'a'],
+        ['a', 'a', 'a', 'a'],
+        ['a', 'a', 'a', 'a', 'a'],
+        ['a', 'a', 'a', 'a', 'a', 'a'],
+        ['a', 'a', 'a', 'a', 'a', 'a', 'a'],
+      ]);
+    });
+
+    it('should detect circular dependency cycles with object values when fromIterable', () => {
+      expect(
+        Array.from(
+          DependencyGraph.fromIterable([
+            { value: { key: 1 }, provides: ['a'], consumes: ['b'] },
+            { value: { key: 2 }, provides: ['b'], consumes: ['c', 'a'] },
+            { value: { key: 3 }, provides: ['c'], consumes: ['d', 'a'] },
+            { value: { key: 4 }, provides: ['d'], consumes: ['e', 'a'] },
+            { value: { key: 5 }, provides: ['e'], consumes: ['f', 'a'] },
+            { value: { key: 6 }, provides: ['f'], consumes: ['h', 'a'] },
+          ]).detectCircularDependencies(),
+        ),
+      ).toEqual([
+        [{ key: 1 }, { key: 2 }, { key: 1 }],
+        [{ key: 1 }, { key: 2 }, { key: 3 }, { key: 1 }],
+        [{ key: 1 }, { key: 2 }, { key: 3 }, { key: 4 }, { key: 1 }],
+        [
+          { key: 1 },
+          { key: 2 },
+          { key: 3 },
+          { key: 4 },
+          { key: 5 },
+          { key: 1 },
+        ],
+        [
+          { key: 1 },
+          { key: 2 },
+          { key: 3 },
+          { key: 4 },
+          { key: 5 },
+          { key: 6 },
+          { key: 1 },
+        ],
+      ]);
+    });
+
+    it('should detect circular dependency cycles with array values when fromIterable', () => {
+      expect(
+        Array.from(
+          DependencyGraph.fromIterable([
+            { value: [1], provides: ['a'], consumes: ['b'] },
+            { value: [2], provides: ['b'], consumes: ['c', 'a'] },
+            { value: [3], provides: ['c'], consumes: ['d', 'a'] },
+            { value: [4], provides: ['d'], consumes: ['e', 'a'] },
+            { value: [5], provides: ['e'], consumes: ['f', 'a'] },
+            { value: [6], provides: ['f'], consumes: ['h', 'a'] },
+          ]).detectCircularDependencies(),
+        ),
+      ).toEqual([
+        [[1], [2], [1]],
+        [[1], [2], [3], [1]],
+        [[1], [2], [3], [4], [1]],
+        [[1], [2], [3], [4], [5], [1]],
+        [[1], [2], [3], [4], [5], [6], [1]],
+      ]);
+    });
+
+    it('should detect circular dependency cycles by reference with symbol values when fromIterable', () => {
+      const symbol1 = Symbol(1);
+      const symbol2 = Symbol(2);
+      const symbol3 = Symbol(3);
+      const symbol4 = Symbol(4);
+      const symbol5 = Symbol(5);
+      const symbol6 = Symbol(6);
+
+      expect(
+        Array.from(
+          DependencyGraph.fromIterable([
+            { value: symbol1, provides: ['a'], consumes: ['b'] },
+            { value: symbol2, provides: ['b'], consumes: ['c', 'a'] },
+            { value: symbol3, provides: ['c'], consumes: ['d', 'a'] },
+            { value: symbol4, provides: ['d'], consumes: ['e', 'a'] },
+            { value: symbol5, provides: ['e'], consumes: ['f', 'a'] },
+            { value: symbol6, provides: ['f'], consumes: ['h', 'a'] },
+          ]).detectCircularDependencies(),
+        ),
+      ).toEqual([
+        [symbol1, symbol2, symbol1],
+        [symbol1, symbol2, symbol3, symbol1],
+        [symbol1, symbol2, symbol3, symbol4, symbol1],
+        [symbol1, symbol2, symbol3, symbol4, symbol5, symbol1],
+        [symbol1, symbol2, symbol3, symbol4, symbol5, symbol6, symbol1],
+      ]);
+    });
+
+    it('should ignore circular dependency cycles by reference with symbol values when fromMap', () => {
+      const symbol1 = Symbol('1');
+      const symbol2 = Symbol('2');
+      const symbol3 = Symbol('3');
+      const symbol4 = Symbol('4');
+      const symbol5 = Symbol('5');
+      const symbol6 = Symbol('6');
+
+      expect(
+        Array.from(
+          DependencyGraph.fromMap({
+            [symbol1]: { provides: ['a'], consumes: ['b'] },
+            [symbol2]: { provides: ['b'], consumes: ['c', 'a'] },
+            [symbol3]: { provides: ['c'], consumes: ['d', 'a'] },
+            [symbol4]: { provides: ['d'], consumes: ['e', 'a'] },
+            [symbol5]: { provides: ['e'], consumes: ['f', 'a'] },
+            [symbol6]: { provides: ['f'], consumes: ['h', 'a'] },
+          }).detectCircularDependencies(),
+        ),
+      ).toEqual([]);
+    });
+  });
+
+  describe('findUnsatisfiedDeps', () => {
+    it('should return nothing with no deps', () => {
+      expect(
+        DependencyGraph.fromMap({
+          1: {},
+          2: {},
+          3: {},
+          4: {},
+        }).findUnsatisfiedDeps(),
+      ).toEqual([]);
+    });
+
+    it('should return nothing when all deps are satisfied', async () => {
+      expect(
+        DependencyGraph.fromMap({
+          1: { provides: ['a'] },
+          2: { consumes: ['a'], provides: ['b', 'c'] },
+          3: { consumes: ['b'] },
+          4: { consumes: ['c'] },
+        }).findUnsatisfiedDeps(),
+      ).toEqual([]);
+    });
+
+    it('should find a single unsatisfied dep', async () => {
+      expect(
+        DependencyGraph.fromMap({
+          1: { consumes: ['a'] },
+        }).findUnsatisfiedDeps(),
+      ).toEqual([{ value: '1', unsatisfied: ['a'] }]);
+    });
+
+    it('should handle circular dependencies', async () => {
+      expect(
+        DependencyGraph.fromMap({
+          1: { consumes: ['a'], provides: ['a'] },
+        }).findUnsatisfiedDeps(),
+      ).toEqual([]);
+
+      expect(
+        DependencyGraph.fromMap({
+          1: { consumes: ['a'], provides: ['b'] },
+          2: { consumes: ['b'], provides: ['a'] },
+        }).findUnsatisfiedDeps(),
+      ).toEqual([]);
+
+      expect(
+        DependencyGraph.fromMap({
+          1: { consumes: ['a'] },
+          2: { consumes: ['b'], provides: ['c'] },
+          3: { consumes: ['c'], provides: ['a', 'b'] },
+        }).findUnsatisfiedDeps(),
+      ).toEqual([]);
+    });
+
+    it('should find multiple unsatisfied deps for one node', async () => {
+      expect(
+        DependencyGraph.fromMap({
+          1: { provides: ['a'], consumes: ['b'] },
+          2: { provides: ['b'], consumes: ['a', 'd', 'e'] },
+        }).findUnsatisfiedDeps(),
+      ).toEqual([{ value: '2', unsatisfied: ['d', 'e'] }]);
+    });
+
+    it('should find multiple unsatisfied deps for multiple nodes', async () => {
+      expect(
+        DependencyGraph.fromMap({
+          1: { provides: ['a'] },
+          2: { provides: ['b'], consumes: ['a', 'd', 'e'] },
+          3: { provides: [], consumes: ['b'] },
+          4: { provides: [], consumes: ['c', 'a'] },
+        }).findUnsatisfiedDeps(),
+      ).toEqual([
+        { value: '2', unsatisfied: ['d', 'e'] },
+        { value: '4', unsatisfied: ['c'] },
+      ]);
+    });
+  });
+
+  describe('parallelTopologicalTraversal', () => {
+    it('should traverse with no deps', async () => {
+      await expect(
+        DependencyGraph.fromMap({
+          1: {},
+          2: {},
+          3: {},
+          4: {},
+        }).parallelTopologicalTraversal(async id => id),
+      ).resolves.toEqual(['1', '2', '3', '4']);
+    });
+
+    it('should traverse with a few deps', async () => {
+      await expect(
+        DependencyGraph.fromMap({
+          1: { provides: ['a'] },
+          2: { consumes: ['a'], provides: ['b', 'c'] },
+          3: { consumes: ['b'] },
+          4: { consumes: ['c'] },
+        }).parallelTopologicalTraversal(async id => id),
+      ).resolves.toEqual(['1', '2', '3', '4']);
+    });
+
+    it('should traverse in reverse', async () => {
+      await expect(
+        DependencyGraph.fromMap({
+          1: { consumes: ['c'] },
+          2: { provides: ['c'], consumes: ['b'] },
+          3: { provides: ['b'], consumes: ['a'] },
+          4: { provides: ['a'] },
+        }).parallelTopologicalTraversal(async id => id),
+      ).resolves.toEqual(['4', '3', '2', '1']);
+    });
+
+    it('should execute in parallel', async () => {
+      await expect(
+        DependencyGraph.fromMap({
+          1: { provides: ['a'] },
+          2: { provides: ['b'], consumes: ['a'] },
+          3: { provides: ['c'], consumes: ['a'] },
+          4: { consumes: ['b'] },
+          5: { consumes: ['c'] },
+        }).parallelTopologicalTraversal(async id => id),
+      ).resolves.toEqual(['1', '2', '3', '4', '5']);
+
+      // Same as above, but with 2 being delayed
+      await expect(
+        DependencyGraph.fromMap({
+          1: { provides: ['a'] },
+          2: { provides: ['b'], consumes: ['a'] },
+          3: { provides: ['c'], consumes: ['a'] },
+          4: { consumes: ['b'] },
+          5: { consumes: ['c'] },
+        }).parallelTopologicalTraversal(async id => {
+          // When delaying 2 we expect 3 and 5 to complete before 2 and 4
+          if (id === '2') {
+            await new Promise(resolve => setTimeout(resolve, 100));
+          }
+          return id;
+        }),
+      ).resolves.toEqual(['1', '3', '5', '2', '4']);
+    });
+
+    it('should detect circular dependencies', async () => {
+      await expect(
+        DependencyGraph.fromMap({
+          1: { provides: ['a'], consumes: ['a'] },
+        }).parallelTopologicalTraversal(async id => id),
+      ).rejects.toThrow('Circular dependency detected');
+
+      await expect(
+        DependencyGraph.fromMap({
+          1: { provides: ['a'], consumes: ['b'] },
+          2: { provides: ['b'], consumes: ['a'] },
+        }).parallelTopologicalTraversal(async id => id),
+      ).rejects.toThrow('Circular dependency detected');
+
+      await expect(
+        DependencyGraph.fromMap({
+          1: { provides: ['a'] },
+          2: { provides: ['c'], consumes: ['a', 'b'] },
+          3: { provides: ['b'], consumes: ['a', 'c'] },
+        }).parallelTopologicalTraversal(async id => id),
+      ).rejects.toThrow('Circular dependency detected');
+    });
+  });
+});
diff --git a/packages/backend-app-api/src/lib/DependencyGraph.ts b/packages/backend-app-api/src/lib/DependencyGraph.ts
new file mode 100644
index 0000000000..86fad3fbf2
--- /dev/null
+++ b/packages/backend-app-api/src/lib/DependencyGraph.ts
@@ -0,0 +1,246 @@
+/*
+ * 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.
+ */
+
+interface NodeInput<T> {
+  value: T;
+  consumes?: Iterable<string>;
+  provides?: Iterable<string>;
+}
+
+/** @internal */
+class Node<T> {
+  static from<T>(input: NodeInput<T>) {
+    return new Node<T>(
+      input.value,
+      input.consumes ? new Set(input.consumes) : new Set(),
+      input.provides ? new Set(input.provides) : new Set(),
+    );
+  }
+
+  private constructor(
+    readonly value: T,
+    readonly consumes: Set<string>,
+    readonly provides: Set<string>,
+  ) {}
+}
+
+/** @internal */
+class CycleKeySet<T> {
+  static from<T>(nodes: Array<Node<T>>) {
+    return new CycleKeySet<T>(nodes);
+  }
+
+  #nodeIds: Map<T, number>;
+  #cycleKeys: Set<string>;
+
+  private constructor(nodes: Array<Node<T>>) {
+    this.#nodeIds = new Map(nodes.map((n, i) => [n.value, i]));
+    this.#cycleKeys = new Set<string>();
+  }
+
+  tryAdd(path: T[]): boolean {
+    const cycleKey = this.#getCycleKey(path);
+    if (this.#cycleKeys.has(cycleKey)) {
+      return false;
+    }
+    this.#cycleKeys.add(cycleKey);
+    return true;
+  }
+
+  #getCycleKey(path: T[]): string {
+    return path
+      .map(n => this.#nodeIds.get(n)!)
+      .sort()
+      .join(',');
+  }
+}
+
+/**
+ * Internal helper to help validate and traverse a dependency graph.
+ * @internal
+ */
+export class DependencyGraph<T> {
+  static fromMap(
+    nodes: Record<string, Omit<NodeInput<unknown>, 'value'>>,
+  ): DependencyGraph<string> {
+    return this.fromIterable(
+      Object.entries(nodes).map(([key, node]) => ({
+        value: String(key),
+        ...node,
+      })),
+    );
+  }
+
+  static fromIterable<T>(
+    nodeInputs: Iterable<NodeInput<T>>,
+  ): DependencyGraph<T> {
+    const nodes = new Array<Node<T>>();
+    for (const nodeInput of nodeInputs) {
+      nodes.push(Node.from(nodeInput));
+    }
+
+    return new DependencyGraph(nodes);
+  }
+
+  #nodes: Array<Node<T>>;
+  #allProvided: Set<string>;
+
+  private constructor(nodes: Array<Node<T>>) {
+    this.#nodes = nodes;
+    this.#allProvided = new Set();
+
+    for (const node of this.#nodes.values()) {
+      for (const produced of node.provides) {
+        this.#allProvided.add(produced);
+      }
+    }
+  }
+
+  /**
+   * Find all nodes that consume dependencies that are not provided by any other node.
+   */
+  findUnsatisfiedDeps(): Array<{ value: T; unsatisfied: string[] }> {
+    const unsatisfiedDependencies = [];
+    for (const node of this.#nodes.values()) {
+      const unsatisfied = Array.from(node.consumes).filter(
+        id => !this.#allProvided.has(id),
+      );
+      if (unsatisfied.length > 0) {
+        unsatisfiedDependencies.push({ value: node.value, unsatisfied });
+      }
+    }
+    return unsatisfiedDependencies;
+  }
+
+  /**
+   * Detect the first circular dependency within the graph, returning the path of nodes that
+   * form a cycle, with the same node as the first and last element of the array.
+   */
+  detectCircularDependency(): T[] | undefined {
+    return this.detectCircularDependencies().next().value;
+  }
+
+  /**
+   * Detect circular dependencies within the graph, returning the path of nodes that
+   * form a cycle, with the same node as the first and last element of the array.
+   */
+  *detectCircularDependencies(): Generator<T[], undefined> {
+    const cycleKeys = CycleKeySet.from(this.#nodes);
+
+    for (const startNode of this.#nodes) {
+      const visited = new Set<Node<T>>();
+      const stack = new Array<[node: Node<T>, path: T[]]>([
+        startNode,
+        [startNode.value],
+      ]);
+
+      while (stack.length > 0) {
+        const [node, path] = stack.pop()!;
+        if (visited.has(node)) {
+          continue;
+        }
+        visited.add(node);
+        for (const consumed of node.consumes) {
+          const providerNodes = this.#nodes.filter(other =>
+            other.provides.has(consumed),
+          );
+          for (const provider of providerNodes) {
+            if (provider === startNode) {
+              if (cycleKeys.tryAdd(path)) {
+                yield [...path, startNode.value];
+              }
+
+              break;
+            }
+            if (!visited.has(provider)) {
+              stack.push([provider, [...path, provider.value]]);
+            }
+          }
+        }
+      }
+    }
+    return undefined;
+  }
+
+  /**
+   * Traverses the dependency graph in topological order, calling the provided
+   * function for each node and waiting for it to resolve.
+   *
+   * The nodes are traversed in parallel, but in such a way that no node is
+   * visited before all of its dependencies.
+   *
+   * Dependencies of nodes that are not produced by any other nodes will be ignored.
+   */
+  async parallelTopologicalTraversal<TResult>(
+    fn: (value: T) => Promise<TResult>,
+  ): Promise<TResult[]> {
+    const allProvided = this.#allProvided;
+    const producedSoFar = new Set<string>();
+    const waiting = new Set(this.#nodes.values());
+    const visited = new Set<Node<T>>();
+    const results = new Array<TResult>();
+    let inFlight = 0; // Keep track of how many callbacks are in flight, so that we know if we got stuck
+
+    // Find all nodes that have no dependencies that have not already been produced by visited nodes
+    async function processMoreNodes() {
+      if (waiting.size === 0) {
+        return;
+      }
+      const nodesToProcess = [];
+      for (const node of waiting) {
+        let ready = true;
+        for (const consumed of node.consumes) {
+          if (allProvided.has(consumed) && !producedSoFar.has(consumed)) {
+            ready = false;
+            continue;
+          }
+        }
+        if (ready) {
+          nodesToProcess.push(node);
+        }
+      }
+
+      for (const node of nodesToProcess) {
+        waiting.delete(node);
+      }
+
+      if (nodesToProcess.length === 0 && inFlight === 0) {
+        // We expect the caller to check for circular dependencies before
+        // traversal, so this error should never happen
+        throw new Error('Circular dependency detected');
+      }
+
+      await Promise.all(nodesToProcess.map(processNode));
+    }
+
+    // Process an individual node, and then add its produced dependencies to the set of available products
+    async function processNode(node: Node<T>) {
+      visited.add(node);
+      inFlight += 1;
+
+      const result = await fn(node.value);
+      results.push(result);
+
+      node.provides.forEach(produced => producedSoFar.add(produced));
+      inFlight -= 1;
+      await processMoreNodes();
+    }
+
+    await processMoreNodes();
+
+    return results;
+  }
+}
diff --git a/packages/backend-app-api/src/services/implementations/httpRouter/httpRouterServiceFactory.test.ts b/packages/backend-app-api/src/services/implementations/httpRouter/httpRouterServiceFactory.test.ts
index d0b40df33b..a6c586d806 100644
--- a/packages/backend-app-api/src/services/implementations/httpRouter/httpRouterServiceFactory.test.ts
+++ b/packages/backend-app-api/src/services/implementations/httpRouter/httpRouterServiceFactory.test.ts
@@ -14,39 +14,29 @@
  * limitations under the License.
  */
 
+import {
+  ServiceFactoryTester,
+  mockServices,
+} from '@backstage/backend-test-utils';
 import { httpRouterServiceFactory } from './httpRouterServiceFactory';
 
 describe('httpRouterFactory', () => {
   it('should register plugin paths', async () => {
-    const rootHttpRouter = { use: jest.fn() };
-    const factory = httpRouterServiceFactory() as any;
+    const rootHttpRouter = mockServices.rootHttpRouter.mock();
+    const tester = ServiceFactoryTester.from(httpRouterServiceFactory, {
+      dependencies: [rootHttpRouter.factory],
+    });
 
-    const handler1 = () => {};
-    const router1 = await factory.factory(
-      {
-        rootHttpRouter,
-        plugin: { getId: () => 'test1' },
-        lifecycle: { addStartupHook() {}, addShutdownHook() {} },
-      },
-      undefined,
-    );
-    router1.use(handler1);
+    const router1 = await tester.get('test1');
+    router1.use(() => {});
     expect(rootHttpRouter.use).toHaveBeenCalledTimes(1);
     expect(rootHttpRouter.use).toHaveBeenCalledWith(
       '/api/test1',
       expect.any(Function),
     );
 
-    const handler2 = () => {};
-    const router2 = await factory.factory(
-      {
-        rootHttpRouter,
-        plugin: { getId: () => 'test2' },
-        lifecycle: { addStartupHook() {}, addShutdownHook() {} },
-      },
-      undefined,
-    );
-    router2.use(handler2);
+    const router2 = await tester.get('test2');
+    router2.use(() => {});
     expect(rootHttpRouter.use).toHaveBeenCalledTimes(2);
     expect(rootHttpRouter.use).toHaveBeenCalledWith(
       '/api/test2',
@@ -55,37 +45,24 @@ describe('httpRouterFactory', () => {
   });
 
   it('should use custom path generator', async () => {
-    const rootHttpRouter = { use: jest.fn() };
-    const factory = httpRouterServiceFactory({
-      getPath: id => `/some/${id}/path`,
-    }) as any;
-
-    const handler1 = () => {};
-    const router1 = await factory.factory(
-      {
-        rootHttpRouter,
-        plugin: { getId: () => 'test1' },
-        lifecycle: { addStartupHook() {}, addShutdownHook() {} },
-      },
-      undefined,
+    const rootHttpRouter = mockServices.rootHttpRouter.mock();
+    const tester = ServiceFactoryTester.from(
+      httpRouterServiceFactory({
+        getPath: id => `/some/${id}/path`,
+      }),
+      { dependencies: [rootHttpRouter.factory] },
     );
-    router1.use(handler1);
+
+    const router1 = await tester.get('test1');
+    router1.use(() => {});
     expect(rootHttpRouter.use).toHaveBeenCalledTimes(1);
     expect(rootHttpRouter.use).toHaveBeenCalledWith(
       '/some/test1/path',
       expect.any(Function),
     );
 
-    const handler2 = () => {};
-    const router2 = await factory.factory(
-      {
-        rootHttpRouter,
-        plugin: { getId: () => 'test2' },
-        lifecycle: { addStartupHook() {}, addShutdownHook() {} },
-      },
-      undefined,
-    );
-    router2.use(handler2);
+    const router2 = await tester.get('test2');
+    router2.use(() => {});
     expect(rootHttpRouter.use).toHaveBeenCalledTimes(2);
     expect(rootHttpRouter.use).toHaveBeenCalledWith(
       '/some/test2/path',
diff --git a/packages/backend-app-api/src/services/implementations/scheduler/schedulerServiceFactory.test.ts b/packages/backend-app-api/src/services/implementations/scheduler/schedulerServiceFactory.test.ts
index 7af9de44da..7b889b3a0e 100644
--- a/packages/backend-app-api/src/services/implementations/scheduler/schedulerServiceFactory.test.ts
+++ b/packages/backend-app-api/src/services/implementations/scheduler/schedulerServiceFactory.test.ts
@@ -14,55 +14,33 @@
  * limitations under the License.
  */
 
-import {
-  coreServices,
-  createBackendPlugin,
-} from '@backstage/backend-plugin-api';
-import { startTestBackend } from '@backstage/backend-test-utils';
+import { coreServices } from '@backstage/backend-plugin-api';
+import { ServiceFactoryTester } from '@backstage/backend-test-utils';
 import { schedulerServiceFactory } from './schedulerServiceFactory';
 
 describe('schedulerFactory', () => {
   it('creates sidecar database features', async () => {
-    expect.assertions(3);
+    const tester = ServiceFactoryTester.from(schedulerServiceFactory());
 
-    const subject = schedulerServiceFactory();
-
-    const plugin = createBackendPlugin({
-      pluginId: '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) }]);
-          },
-        });
-      },
+    const scheduler = await tester.get();
+    await scheduler.scheduleTask({
+      id: 'task1',
+      timeout: { seconds: 1 },
+      frequency: { seconds: 1 },
+      fn: async () => {},
     });
 
-    await startTestBackend({
-      features: [plugin()],
-      services: [subject],
-    });
+    const database = await tester.getService(coreServices.database);
+
+    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) }]);
   });
 });
diff --git a/packages/backend-app-api/src/wiring/BackendInitializer.test.ts b/packages/backend-app-api/src/wiring/BackendInitializer.test.ts
index b05194f594..791b9b1c3a 100644
--- a/packages/backend-app-api/src/wiring/BackendInitializer.test.ts
+++ b/packages/backend-app-api/src/wiring/BackendInitializer.test.ts
@@ -20,10 +20,15 @@ import {
   coreServices,
   createBackendPlugin,
   createBackendModule,
+  createExtensionPoint,
 } from '@backstage/backend-plugin-api';
 import { BackendInitializer } from './BackendInitializer';
-import { ServiceRegistry } from './ServiceRegistry';
-import { rootLifecycleServiceFactory } from '../services/implementations';
+
+import {
+  lifecycleServiceFactory,
+  loggerServiceFactory,
+  rootLifecycleServiceFactory,
+} from '../services/implementations';
 
 const rootRef = createServiceRef<{ x: number }>({
   id: '1',
@@ -44,12 +49,23 @@ class MockLogger {
   }
 }
 
+const baseFactories = [
+  lifecycleServiceFactory(),
+  rootLifecycleServiceFactory(),
+  createServiceFactory({
+    service: coreServices.rootLogger,
+    deps: {},
+    factory: () => new MockLogger(),
+  })(),
+  loggerServiceFactory(),
+];
+
 describe('BackendInitializer', () => {
   it('should initialize root scoped services', async () => {
     const rootFactory = jest.fn();
     const pluginFactory = jest.fn();
 
-    const registry = new ServiceRegistry([
+    const services = [
       createServiceFactory({
         service: rootRef,
         deps: {},
@@ -66,17 +82,76 @@ describe('BackendInitializer', () => {
         deps: {},
         factory: () => new MockLogger(),
       })(),
-    ]);
+    ];
 
-    const init = new BackendInitializer(registry);
+    const init = new BackendInitializer(services);
     await init.start();
 
     expect(rootFactory).toHaveBeenCalled();
     expect(pluginFactory).not.toHaveBeenCalled();
   });
 
+  it('should initialize modules with extension points', async () => {
+    expect.assertions(3);
+
+    const extensionPoint = createExtensionPoint<{ values: string[] }>({
+      id: 'a',
+    });
+    const init = new BackendInitializer(baseFactories);
+
+    init.add(
+      createBackendModule({
+        pluginId: 'test',
+        moduleId: 'modA',
+        register(reg) {
+          reg.registerInit({
+            deps: { extension: extensionPoint },
+            async init({ extension }) {
+              expect(extension.values).toEqual(['b']);
+              extension.values.push('a');
+            },
+          });
+        },
+      })(),
+    );
+
+    init.add(
+      createBackendModule({
+        pluginId: 'test',
+        moduleId: 'modB',
+        register(reg) {
+          const values = ['b'];
+          reg.registerExtensionPoint(extensionPoint, { values });
+          reg.registerInit({
+            deps: {},
+            async init() {
+              expect(values).toEqual(['b', 'a', 'c']);
+            },
+          });
+        },
+      })(),
+    );
+
+    init.add(
+      createBackendModule({
+        pluginId: 'test',
+        moduleId: 'modC',
+        register(reg) {
+          reg.registerInit({
+            deps: { extension: extensionPoint },
+            async init({ extension }) {
+              expect(extension.values).toEqual(['b', 'a']);
+              extension.values.push('c');
+            },
+          });
+        },
+      })(),
+    );
+    await init.start();
+  });
+
   it('should forward errors when plugins fail to start', async () => {
-    const init = new BackendInitializer(new ServiceRegistry([]));
+    const init = new BackendInitializer([]);
     init.add(
       createBackendPlugin({
         pluginId: 'test',
@@ -96,7 +171,7 @@ describe('BackendInitializer', () => {
   });
 
   it('should forward errors when modules fail to start', async () => {
-    const init = new BackendInitializer(new ServiceRegistry([]));
+    const init = new BackendInitializer([]);
     init.add(
       createBackendModule({
         pluginId: 'test',
@@ -117,7 +192,7 @@ describe('BackendInitializer', () => {
   });
 
   it('should reject duplicate plugins', async () => {
-    const init = new BackendInitializer(new ServiceRegistry([]));
+    const init = new BackendInitializer([]);
     init.add(
       createBackendPlugin({
         pluginId: 'test',
@@ -146,7 +221,7 @@ describe('BackendInitializer', () => {
   });
 
   it('should reject duplicate modules', async () => {
-    const init = new BackendInitializer(new ServiceRegistry([]));
+    const init = new BackendInitializer([]);
     init.add(
       createBackendModule({
         pluginId: 'test',
@@ -175,4 +250,78 @@ describe('BackendInitializer', () => {
       "Module 'mod' for plugin 'test' is already registered",
     );
   });
+
+  it('should reject modules with circular dependencies', async () => {
+    const extA = createExtensionPoint<string>({ id: 'a' });
+    const extB = createExtensionPoint<string>({ id: 'b' });
+    const init = new BackendInitializer([
+      rootLifecycleServiceFactory(),
+      createServiceFactory({
+        service: coreServices.rootLogger,
+        deps: {},
+        factory: () => new MockLogger(),
+      })(),
+    ]);
+    init.add(
+      createBackendModule({
+        pluginId: 'test',
+        moduleId: 'modA',
+        register(reg) {
+          reg.registerExtensionPoint(extA, 'a');
+          reg.registerInit({
+            deps: { ext: extB },
+            async init() {},
+          });
+        },
+      })(),
+    );
+    init.add(
+      createBackendModule({
+        pluginId: 'test',
+        moduleId: 'modB',
+        register(reg) {
+          reg.registerExtensionPoint(extB, 'b');
+          reg.registerInit({
+            deps: { ext: extA },
+            async init() {},
+          });
+        },
+      })(),
+    );
+    await expect(init.start()).rejects.toThrow(
+      "Circular dependency detected for modules of plugin 'test', 'modA' -> 'modB' -> 'modA'",
+    );
+  });
+
+  it('should reject modules that depend on extension points other plugins', async () => {
+    const init = new BackendInitializer(baseFactories);
+    const extA = createExtensionPoint<string>({ id: 'a' });
+    init.add(
+      createBackendPlugin({
+        pluginId: 'testA',
+        register(reg) {
+          reg.registerExtensionPoint(extA, 'a');
+          reg.registerInit({
+            deps: {},
+            async init() {},
+          });
+        },
+      })(),
+    );
+    init.add(
+      createBackendModule({
+        pluginId: 'testB',
+        moduleId: 'mod',
+        register(reg) {
+          reg.registerInit({
+            deps: { ext: extA },
+            async init() {},
+          });
+        },
+      })(),
+    );
+    await expect(init.start()).rejects.toThrow(
+      "Extension point registered for plugin 'testA' may not be used by module for plugin 'testB'",
+    );
+  });
 });
diff --git a/packages/backend-app-api/src/wiring/BackendInitializer.ts b/packages/backend-app-api/src/wiring/BackendInitializer.ts
index ec4b2a79ac..4969f82176 100644
--- a/packages/backend-app-api/src/wiring/BackendInitializer.ts
+++ b/packages/backend-app-api/src/wiring/BackendInitializer.ts
@@ -19,14 +19,18 @@ import {
   ExtensionPoint,
   coreServices,
   ServiceRef,
+  ServiceFactory,
 } from '@backstage/backend-plugin-api';
 import { BackendLifecycleImpl } from '../services/implementations/rootLifecycle/rootLifecycleServiceFactory';
 import { BackendPluginLifecycleImpl } from '../services/implementations/lifecycle/lifecycleServiceFactory';
-import { EnumerableServiceHolder, ServiceOrExtensionPoint } from './types';
+import { ServiceOrExtensionPoint } from './types';
 // Direct internal import to avoid duplication
 // eslint-disable-next-line @backstage/no-forbidden-package-imports
 import { InternalBackendFeature } from '@backstage/backend-plugin-api/src/wiring/types';
-import { ForwardedError } from '@backstage/errors';
+import { ForwardedError, ConflictError } from '@backstage/errors';
+import { featureDiscoveryServiceRef } from '@backstage/backend-plugin-api/alpha';
+import { DependencyGraph } from '../lib/DependencyGraph';
+import { ServiceRegistry } from './ServiceRegistry';
 
 export interface BackendRegisterInit {
   consumes: Set<ServiceOrExtensionPoint>;
@@ -40,11 +44,12 @@ export interface BackendRegisterInit {
 export class BackendInitializer {
   #startPromise?: Promise<void>;
   #features = new Array<InternalBackendFeature>();
-  #extensionPoints = new Map<ExtensionPoint<unknown>, unknown>();
-  #serviceHolder: EnumerableServiceHolder;
+  #extensionPoints = new Map<string, { impl: unknown; pluginId: string }>();
+  #serviceRegistry: ServiceRegistry;
+  #registeredFeatures = new Array<Promise<BackendFeature>>();
 
-  constructor(serviceHolder: EnumerableServiceHolder) {
-    this.#serviceHolder = serviceHolder;
+  constructor(defaultApiFactories: ServiceFactory[]) {
+    this.#serviceRegistry = ServiceRegistry.create([...defaultApiFactories]);
   }
 
   async #getInitDeps(
@@ -55,13 +60,16 @@ export class BackendInitializer {
     const missingRefs = new Set<ServiceOrExtensionPoint>();
 
     for (const [name, ref] of Object.entries(deps)) {
-      const extensionPoint = this.#extensionPoints.get(
-        ref as ExtensionPoint<unknown>,
-      );
-      if (extensionPoint) {
-        result.set(name, extensionPoint);
+      const ep = this.#extensionPoints.get(ref.id);
+      if (ep) {
+        if (ep.pluginId !== pluginId) {
+          throw new Error(
+            `Extension point registered for plugin '${ep.pluginId}' may not be used by module for plugin '${pluginId}'`,
+          );
+        }
+        result.set(name, ep.impl);
       } else {
-        const impl = await this.#serviceHolder.get(
+        const impl = await this.#serviceRegistry.get(
           ref as ServiceRef<unknown>,
           pluginId,
         );
@@ -83,22 +91,34 @@ export class BackendInitializer {
     return Object.fromEntries(result);
   }
 
-  add(feature: BackendFeature) {
+  add(feature: BackendFeature | Promise<BackendFeature>) {
     if (this.#startPromise) {
       throw new Error('feature can not be added after the backend has started');
     }
+    this.#registeredFeatures.push(Promise.resolve(feature));
+  }
+
+  #addFeature(feature: BackendFeature) {
     if (feature.$$type !== '@backstage/BackendFeature') {
       throw new Error(
         `Failed to add feature, invalid type '${feature.$$type}'`,
       );
     }
-    const internalFeature = feature as InternalBackendFeature;
-    if (internalFeature.version !== 'v1') {
+
+    if (isServiceFactory(feature)) {
+      this.#serviceRegistry.add(feature);
+    } else if (isInternalBackendFeature(feature)) {
+      if (feature.version !== 'v1') {
+        throw new Error(
+          `Failed to add feature, invalid version '${feature.version}'`,
+        );
+      }
+      this.#features.push(feature);
+    } else {
       throw new Error(
-        `Failed to add feature, invalid version '${internalFeature.version}'`,
+        `Failed to add feature, invalid feature ${JSON.stringify(feature)}`,
       );
     }
-    this.#features.push(internalFeature);
   }
 
   async start(): Promise<void> {
@@ -129,10 +149,29 @@ export class BackendInitializer {
   }
 
   async #doStart(): Promise<void> {
+    this.#serviceRegistry.checkForCircularDeps();
+
+    for (const feature of this.#registeredFeatures) {
+      this.#addFeature(await feature);
+    }
+
+    const featureDiscovery = await this.#serviceRegistry.get(
+      featureDiscoveryServiceRef,
+      'root',
+    );
+
+    if (featureDiscovery) {
+      const { features } = await featureDiscovery.getBackendFeatures();
+      for (const feature of features) {
+        this.#addFeature(feature);
+      }
+      this.#serviceRegistry.checkForCircularDeps();
+    }
+
     // Initialize all root scoped services
-    for (const ref of this.#serviceHolder.getServiceRefs()) {
+    for (const ref of this.#serviceRegistry.getServiceRefs()) {
       if (ref.scope === 'root') {
-        await this.#serviceHolder.get(ref, 'root');
+        await this.#serviceRegistry.get(ref, 'root');
       }
     }
 
@@ -144,14 +183,17 @@ export class BackendInitializer {
       for (const r of feature.getRegistrations()) {
         const provides = new Set<ExtensionPoint<unknown>>();
 
-        if (r.type === 'plugin') {
+        if (r.type === 'plugin' || r.type === 'module') {
           for (const [extRef, extImpl] of r.extensionPoints) {
-            if (this.#extensionPoints.has(extRef)) {
+            if (this.#extensionPoints.has(extRef.id)) {
               throw new Error(
                 `ExtensionPoint with ID '${extRef.id}' is already registered`,
               );
             }
-            this.#extensionPoints.set(extRef, extImpl);
+            this.#extensionPoints.set(extRef.id, {
+              impl: extImpl,
+              pluginId: r.pluginId,
+            });
             provides.add(extRef);
           }
         }
@@ -193,21 +235,41 @@ export class BackendInitializer {
     await Promise.all(
       allPluginIds.map(async pluginId => {
         // Modules are initialized before plugins, so that they can provide extension to the plugin
-        const modules = moduleInits.get(pluginId) ?? [];
-        await Promise.all(
-          Array.from(modules).map(async ([moduleId, moduleInit]) => {
-            const moduleDeps = await this.#getInitDeps(
-              moduleInit.init.deps,
-              pluginId,
+        const modules = moduleInits.get(pluginId);
+        if (modules) {
+          const tree = DependencyGraph.fromIterable(
+            Array.from(modules).map(([moduleId, moduleInit]) => ({
+              value: { moduleId, moduleInit },
+              // Relationships are reversed at this point since we're only interested in the extension points.
+              // If a modules provides extension point A we want it to be initialized AFTER all modules
+              // that depend on extension point A, so that they can provide their extensions.
+              consumes: Array.from(moduleInit.provides).map(p => p.id),
+              provides: Array.from(moduleInit.consumes).map(c => c.id),
+            })),
+          );
+          const circular = tree.detectCircularDependency();
+          if (circular) {
+            throw new ConflictError(
+              `Circular dependency detected for modules of plugin '${pluginId}', ${circular
+                .map(({ moduleId }) => `'${moduleId}'`)
+                .join(' -> ')}`,
             );
-            await moduleInit.init.func(moduleDeps).catch(error => {
-              throw new ForwardedError(
-                `Module '${moduleId}' for plugin '${pluginId}' startup failed`,
-                error,
+          }
+          await tree.parallelTopologicalTraversal(
+            async ({ moduleId, moduleInit }) => {
+              const moduleDeps = await this.#getInitDeps(
+                moduleInit.init.deps,
+                pluginId,
               );
-            });
-          }),
-        );
+              await moduleInit.init.func(moduleDeps).catch(error => {
+                throw new ForwardedError(
+                  `Module '${moduleId}' for plugin '${pluginId}' startup failed`,
+                  error,
+                );
+              });
+            },
+          );
+        }
 
         // Once all modules have been initialized, we can initialize the plugin itself
         const pluginInit = pluginInits.get(pluginId);
@@ -238,7 +300,7 @@ export class BackendInitializer {
     // Once the backend is started, any uncaught errors or unhandled rejections are caught
     // and logged, in order to avoid crashing the entire backend on local failures.
     if (process.env.NODE_ENV !== 'test') {
-      const rootLogger = await this.#serviceHolder.get(
+      const rootLogger = await this.#serviceRegistry.get(
         coreServices.rootLogger,
         'root',
       );
@@ -272,7 +334,7 @@ export class BackendInitializer {
 
   // Bit of a hacky way to grab the lifecycle services, potentially find a nicer way to do this
   async #getRootLifecycleImpl(): Promise<BackendLifecycleImpl> {
-    const lifecycleService = await this.#serviceHolder.get(
+    const lifecycleService = await this.#serviceRegistry.get(
       coreServices.rootLifecycle,
       'root',
     );
@@ -285,7 +347,7 @@ export class BackendInitializer {
   async #getPluginLifecycleImpl(
     pluginId: string,
   ): Promise<BackendPluginLifecycleImpl> {
-    const lifecycleService = await this.#serviceHolder.get(
+    const lifecycleService = await this.#serviceRegistry.get(
       coreServices.lifecycle,
       pluginId,
     );
@@ -295,3 +357,15 @@ export class BackendInitializer {
     throw new Error('Unexpected plugin lifecycle service implementation');
   }
 }
+
+function isServiceFactory(feature: BackendFeature): feature is ServiceFactory {
+  return !!(feature as ServiceFactory).service;
+}
+
+function isInternalBackendFeature(
+  feature: BackendFeature,
+): feature is InternalBackendFeature {
+  return (
+    typeof (feature as InternalBackendFeature).getRegistrations === 'function'
+  );
+}
diff --git a/packages/backend-app-api/src/wiring/BackstageBackend.ts b/packages/backend-app-api/src/wiring/BackstageBackend.ts
index c53f47b685..2b916908de 100644
--- a/packages/backend-app-api/src/wiring/BackstageBackend.ts
+++ b/packages/backend-app-api/src/wiring/BackstageBackend.ts
@@ -14,22 +14,28 @@
  * limitations under the License.
  */
 
-import { ServiceFactory, BackendFeature } from '@backstage/backend-plugin-api';
+import { BackendFeature, ServiceFactory } from '@backstage/backend-plugin-api';
 import { BackendInitializer } from './BackendInitializer';
-import { ServiceRegistry } from './ServiceRegistry';
 import { Backend } from './types';
 
 export class BackstageBackend implements Backend {
-  #services: ServiceRegistry;
   #initializer: BackendInitializer;
 
-  constructor(apiFactories: ServiceFactory[]) {
-    this.#services = new ServiceRegistry(apiFactories);
-    this.#initializer = new BackendInitializer(this.#services);
+  constructor(defaultServiceFactories: ServiceFactory[]) {
+    this.#initializer = new BackendInitializer(defaultServiceFactories);
   }
 
-  add(feature: BackendFeature): void {
-    this.#initializer.add(feature);
+  add(
+    feature:
+      | BackendFeature
+      | (() => BackendFeature)
+      | Promise<{ default: BackendFeature | (() => BackendFeature) }>,
+  ): void {
+    if (isPromise(feature)) {
+      this.#initializer.add(feature.then(f => unwrapFeature(f.default)));
+    } else {
+      this.#initializer.add(unwrapFeature(feature));
+    }
   }
 
   async start(): Promise<void> {
@@ -40,3 +46,18 @@ export class BackstageBackend implements Backend {
     await this.#initializer.stop();
   }
 }
+
+function isPromise<T>(value: unknown | Promise<T>): value is Promise<T> {
+  return (
+    typeof value === 'object' &&
+    value !== null &&
+    'then' in value &&
+    typeof value.then === 'function'
+  );
+}
+
+function unwrapFeature(
+  feature: BackendFeature | (() => BackendFeature),
+): BackendFeature {
+  return typeof feature === 'function' ? feature() : feature;
+}
diff --git a/packages/backend-app-api/src/wiring/ServiceRegistry.test.ts b/packages/backend-app-api/src/wiring/ServiceRegistry.test.ts
index e698ade348..32807ca826 100644
--- a/packages/backend-app-api/src/wiring/ServiceRegistry.test.ts
+++ b/packages/backend-app-api/src/wiring/ServiceRegistry.test.ts
@@ -31,7 +31,7 @@ const sf1 = createServiceFactory({
   async factory() {
     return { x: 1 };
   },
-})();
+});
 
 const ref2 = createServiceRef<{ x: number }>({
   scope: 'root',
@@ -43,14 +43,14 @@ const sf2 = createServiceFactory({
   async factory() {
     return { x: 2 };
   },
-})();
+});
 const sf2b = createServiceFactory({
   service: ref2,
   deps: {},
   async factory() {
     return { x: 22 };
   },
-})();
+});
 
 const refDefault1 = createServiceRef<{ x: number }>({
   id: '1',
@@ -61,7 +61,7 @@ const refDefault1 = createServiceRef<{ x: number }>({
       async factory() {
         return { x: 10 };
       },
-    })(),
+    }),
 });
 
 const refDefault2a = createServiceRef<{ x: number }>({
@@ -90,12 +90,12 @@ const refDefault2b = createServiceRef<{ x: number }>({
 
 describe('ServiceRegistry', () => {
   it('should return undefined if there is no factory defined', async () => {
-    const registry = new ServiceRegistry([]);
+    const registry = ServiceRegistry.create([]);
     expect(registry.get(ref1, 'catalog')).toBe(undefined);
   });
 
   it('should return an implementation for a registered ref', async () => {
-    const registry = new ServiceRegistry([sf1]);
+    const registry = ServiceRegistry.create([sf1()]);
     await expect(registry.get(ref1, 'catalog')).resolves.toEqual({ x: 1 });
     await expect(registry.get(ref1, 'scaffolder')).resolves.toEqual({ x: 1 });
     expect(await registry.get(ref1, 'catalog')).toBe(
@@ -110,7 +110,7 @@ describe('ServiceRegistry', () => {
   });
 
   it('should handle multiple factories with different serviceRefs', async () => {
-    const registry = new ServiceRegistry([sf1, sf2]);
+    const registry = ServiceRegistry.create([sf1(), sf2()]);
 
     await expect(registry.get(ref1, 'catalog')).resolves.toEqual({
       x: 1,
@@ -125,13 +125,14 @@ describe('ServiceRegistry', () => {
 
   it('should not be possible for root scoped services to depend on plugin scoped services', async () => {
     const factory = createServiceFactory({
+      // @ts-expect-error
       service: ref2,
       deps: { pluginDep: ref1 },
       async factory() {
         return { x: 2 };
       },
     });
-    const registry = new ServiceRegistry([factory(), sf1]);
+    const registry = ServiceRegistry.create([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'.",
     );
@@ -145,7 +146,7 @@ describe('ServiceRegistry', () => {
         return { x: rootDep.x };
       },
     });
-    const registry = new ServiceRegistry([factory(), sf2]);
+    const registry = ServiceRegistry.create([factory(), sf2()]);
     await expect(registry.get(ref1, 'catalog')).resolves.toEqual({
       x: 2,
     });
@@ -160,7 +161,7 @@ describe('ServiceRegistry', () => {
         return { x: rootDep.x };
       },
     });
-    const registry = new ServiceRegistry([factory(), sf2]);
+    const registry = ServiceRegistry.create([factory(), sf2()]);
     await expect(registry.get(ref, 'catalog')).resolves.toEqual({
       x: 2,
     });
@@ -175,35 +176,61 @@ describe('ServiceRegistry', () => {
         return { pluginId: meta.getId() };
       },
     });
-    const registry = new ServiceRegistry([factory()]);
+    const registry = ServiceRegistry.create([factory()]);
     await expect(registry.get(ref, 'catalog')).resolves.toEqual({
       pluginId: 'catalog',
     });
   });
 
   it('should use the last factory for each ref', async () => {
-    const registry = new ServiceRegistry([sf2, sf2b]);
+    const registry = ServiceRegistry.create([sf2(), sf2b()]);
     await expect(registry.get(ref2, 'catalog')).resolves.toEqual({
       x: 22,
     });
   });
 
+  it('should use added service factories for each ref', async () => {
+    const registry = ServiceRegistry.create([sf2()]);
+    registry.add(sf2b());
+    await expect(registry.get(ref2, 'catalog')).resolves.toEqual({
+      x: 22,
+    });
+  });
+
+  it('should not allow factories to be added after instantiation', async () => {
+    const registry = ServiceRegistry.create([sf2()]);
+    await expect(registry.get(ref2, 'catalog')).resolves.toEqual({
+      x: 2,
+    });
+    expect(() => registry.add(sf2b())).toThrow(
+      'Unable to set service factory with id 2, service has already been instantiated',
+    );
+  });
+
+  it('should not allow the same factory to be added twice', async () => {
+    const registry = ServiceRegistry.create([sf2()]);
+    registry.add(sf2b());
+    expect(() => registry.add(sf2b())).toThrow(
+      'Duplicate service implementations provided for 2',
+    );
+  });
+
   it('should use the defaultFactory from the ref if not provided to the registry', async () => {
-    const registry = new ServiceRegistry([]);
+    const registry = ServiceRegistry.create([]);
     await expect(registry.get(refDefault1, 'catalog')).resolves.toEqual({
       x: 10,
     });
   });
 
   it('should not use the defaultFactory from the ref if provided to the registry', async () => {
-    const registry = new ServiceRegistry([sf1]);
+    const registry = ServiceRegistry.create([sf1()]);
     await expect(registry.get(refDefault1, 'catalog')).resolves.toEqual({
       x: 1,
     });
   });
 
   it('should handle duplicate defaultFactories by duplicating the implementations', async () => {
-    const registry = new ServiceRegistry([]);
+    const registry = ServiceRegistry.create([]);
     await expect(registry.get(refDefault2a, 'catalog')).resolves.toEqual({
       x: 20,
     });
@@ -234,7 +261,7 @@ describe('ServiceRegistry', () => {
       defaultFactory: factoryLoader,
     });
 
-    const registry = new ServiceRegistry([]);
+    const registry = ServiceRegistry.create([]);
     await Promise.all([
       expect(registry.get(ref, 'catalog')).resolves.toBeUndefined(),
       expect(registry.get(ref, 'catalog')).resolves.toBeUndefined(),
@@ -252,7 +279,7 @@ describe('ServiceRegistry', () => {
       factory,
     });
 
-    const registry = new ServiceRegistry([myFactory()]);
+    const registry = ServiceRegistry.create([myFactory()]);
 
     await Promise.all([
       registry.get(ref1, 'catalog')!,
@@ -274,7 +301,7 @@ describe('ServiceRegistry', () => {
       factory,
     });
 
-    const registry = new ServiceRegistry([myFactory()]);
+    const registry = ServiceRegistry.create([myFactory()]);
 
     await Promise.all([
       registry.get(ref1, 'catalog')!,
@@ -296,7 +323,7 @@ describe('ServiceRegistry', () => {
       },
     });
 
-    const registry = new ServiceRegistry([myFactory()]);
+    const registry = ServiceRegistry.create([myFactory()]);
 
     await expect(registry.get(ref1, 'catalog')).rejects.toThrow(
       "Failed to instantiate service '1' for 'catalog' because the following dependent services are missing: '2'",
@@ -323,13 +350,217 @@ describe('ServiceRegistry', () => {
       },
     });
 
-    const registry = new ServiceRegistry([factoryA(), factoryB()]);
+    const registry = ServiceRegistry.create([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'",
     );
   });
 
+  describe('checkForCircularDeps', () => {
+    it('should throw if there are shallow circular dependencies', async () => {
+      const refA = createServiceRef<string>({ id: 'a' });
+      const refB = createServiceRef<string>({ id: 'b' });
+
+      const factoryA = createServiceFactory({
+        service: refA,
+        deps: { b: refB },
+        factory: async ({ b }) => b,
+      });
+
+      const factoryB = createServiceFactory({
+        service: refB,
+        deps: { a: refA },
+        factory: async ({ a }) => a,
+      });
+
+      expect(() => ServiceRegistry.create([factoryA(), factoryB()])).toThrow(
+        `Circular dependencies detected:
+  'a' -> 'b' -> 'a'`,
+      );
+    });
+
+    it('should throw if there are multiple circular dependency cycles', async () => {
+      const refA = createServiceRef<string>({ id: 'a' });
+      const refB = createServiceRef<string>({ id: 'b' });
+      const refC = createServiceRef<string>({ id: 'c' });
+      const refD = createServiceRef<string>({ id: 'd' });
+
+      const factoryA = createServiceFactory({
+        service: refA,
+        deps: { b: refB },
+        factory: async ({ b }) => b,
+      });
+
+      const factoryB = createServiceFactory({
+        service: refB,
+        deps: { a: refA },
+        factory: async ({ a }) => a,
+      });
+
+      const factoryC = createServiceFactory({
+        service: refC,
+        deps: { d: refD },
+        factory: async ({ d }) => d,
+      });
+
+      const factoryD = createServiceFactory({
+        service: refD,
+        deps: { c: refC },
+        factory: async ({ c }) => c,
+      });
+
+      expect(() =>
+        ServiceRegistry.create([
+          factoryA(),
+          factoryB(),
+          factoryC(),
+          factoryD(),
+        ]),
+      ).toThrow(
+        `Circular dependencies detected:
+  'a' -> 'b' -> 'a'
+  'c' -> 'd' -> 'c'`,
+      );
+    });
+
+    it('should throw if there are deep circular dependencies', async () => {
+      const refA = createServiceRef<string>({ id: 'a' });
+      const refB = createServiceRef<string>({ id: 'b' });
+      const refC = createServiceRef<string>({ id: 'c' });
+
+      const factoryA = createServiceFactory({
+        service: refA,
+        deps: { b: refB },
+        factory: async ({ b }) => b,
+      });
+
+      const factoryB = createServiceFactory({
+        service: refB,
+        deps: { c: refC },
+        factory: async ({ c }) => c,
+      });
+
+      const factoryC = createServiceFactory({
+        service: refC,
+        deps: { a: refA },
+        factory: async ({ a }) => a,
+      });
+
+      expect(() =>
+        ServiceRegistry.create([factoryA(), factoryB(), factoryC()]),
+      ).toThrow(
+        `Circular dependencies detected:
+  'a' -> 'b' -> 'c' -> 'a'`,
+      );
+    });
+
+    it('should throw if there are deep circular dependencies 2', async () => {
+      const refA = createServiceRef<string>({ id: 'a' });
+      const refB = createServiceRef<string>({ id: 'b' });
+      const refC = createServiceRef<string>({ id: 'c' });
+      const refD = createServiceRef<string>({ id: 'd' });
+
+      const factoryA = createServiceFactory({
+        service: refA,
+        deps: { b: refB },
+        factory: async ({ b }) => b,
+      });
+
+      const factoryB = createServiceFactory({
+        service: refB,
+        deps: { c: refC, d: refD },
+        factory: async ({ c, d }) => c + d,
+      });
+
+      const factoryC = createServiceFactory({
+        service: refC,
+        deps: { a: refA },
+        factory: async ({ a }) => a,
+      });
+
+      const factoryD = createServiceFactory({
+        service: refD,
+        deps: {},
+        factory: async () => 'd',
+      });
+
+      expect(() =>
+        ServiceRegistry.create([
+          factoryA(),
+          factoryB(),
+          factoryC(),
+          factoryD(),
+        ]),
+      ).toThrow(
+        `Circular dependencies detected:
+  'a' -> 'b' -> 'c' -> 'a'`,
+      );
+    });
+
+    it('should throw if there are circular dependencies', async () => {
+      const refA = createServiceRef<string>({ id: 'a' });
+      const refB = createServiceRef<string>({ id: 'b' });
+      const refC = createServiceRef<string>({ id: 'c' });
+
+      const factoryA = createServiceFactory({
+        service: refA,
+        deps: { b: refB, c: refC },
+        factory: async ({ b, c }) => b + c,
+      });
+
+      const factoryB = createServiceFactory({
+        service: refB,
+        deps: {},
+        factory: async () => 'b',
+      });
+
+      const factoryC = createServiceFactory({
+        service: refC,
+        deps: { a: refA },
+        factory: async ({ a }) => a,
+      });
+
+      expect(() =>
+        ServiceRegistry.create([factoryA(), factoryB(), factoryC()]),
+      ).toThrow(
+        `Circular dependencies detected:
+  'a' -> 'c' -> 'a'`,
+      );
+    });
+
+    it('should not infinitely loop if there are circular dependencies where not all nodes are in the cycle', async () => {
+      const refA = createServiceRef<string>({ id: 'a' });
+      const refB = createServiceRef<string>({ id: 'b' });
+      const refC = createServiceRef<string>({ id: 'c' });
+
+      const factoryA = createServiceFactory({
+        service: refA,
+        deps: { b: refB },
+        factory: async ({ b }) => b,
+      });
+
+      const factoryB = createServiceFactory({
+        service: refB,
+        deps: { c: refC },
+        factory: async ({ c }) => c,
+      });
+
+      const factoryC = createServiceFactory({
+        service: refC,
+        deps: { b: refB },
+        factory: async ({ b }) => b,
+      });
+
+      expect(() =>
+        ServiceRegistry.create([factoryA(), factoryB(), factoryC()]),
+      ).toThrow(
+        `Circular dependencies detected:
+  'b' -> 'c' -> 'b'`,
+      );
+    });
+  });
+
   it('should decorate error messages thrown by the top-level factory function', async () => {
     const myFactory = createServiceFactory({
       service: ref1,
@@ -342,7 +573,7 @@ describe('ServiceRegistry', () => {
       },
     });
 
-    const registry = new ServiceRegistry([myFactory()]);
+    const registry = ServiceRegistry.create([myFactory()]);
 
     await expect(registry.get(ref1, 'catalog')).rejects.toThrow(
       "Failed to instantiate service '1' because createRootContext threw an error, Error: top-level error",
@@ -358,7 +589,7 @@ describe('ServiceRegistry', () => {
       },
     });
 
-    const registry = new ServiceRegistry([myFactory()]);
+    const registry = ServiceRegistry.create([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",
@@ -373,7 +604,7 @@ describe('ServiceRegistry', () => {
       },
     });
 
-    const registry = new ServiceRegistry([]);
+    const registry = ServiceRegistry.create([]);
 
     await expect(registry.get(ref, 'catalog')).rejects.toThrow(
       "Failed to instantiate service '1' because the default factory loader threw an error, Error: default factory error",
diff --git a/packages/backend-app-api/src/wiring/ServiceRegistry.ts b/packages/backend-app-api/src/wiring/ServiceRegistry.ts
index b5b55f67cf..ad52e645bb 100644
--- a/packages/backend-app-api/src/wiring/ServiceRegistry.ts
+++ b/packages/backend-app-api/src/wiring/ServiceRegistry.ts
@@ -20,11 +20,11 @@ import {
   coreServices,
   createServiceFactory,
 } from '@backstage/backend-plugin-api';
-import { stringifyError } from '@backstage/errors';
-import { EnumerableServiceHolder } from './types';
+import { ConflictError, stringifyError } from '@backstage/errors';
 // Direct internal import to avoid duplication
 // eslint-disable-next-line @backstage/no-forbidden-package-imports
 import { InternalServiceFactory } from '@backstage/backend-plugin-api/src/services/system/types';
+import { DependencyGraph } from '../lib/DependencyGraph';
 /**
  * Keep in sync with `@backstage/backend-plugin-api/src/services/system/types.ts`
  * @internal
@@ -39,7 +39,7 @@ function toInternalServiceFactory<TService, TScope extends 'plugin' | 'root'>(
   factory: ServiceFactory<TService, TScope>,
 ): InternalServiceFactory<TService, TScope> {
   const f = factory as InternalServiceFactory<TService, TScope>;
-  if (f.$$type !== '@backstage/ServiceFactory') {
+  if (f.$$type !== '@backstage/BackendFeature') {
     throw new Error(`Invalid service factory, bad type '${f.$$type}'`);
   }
   if (f.version !== 'v1') {
@@ -49,14 +49,20 @@ function toInternalServiceFactory<TService, TScope extends 'plugin' | 'root'>(
 }
 
 const pluginMetadataServiceFactory = createServiceFactory(
-  (options: { pluginId: string }) => ({
+  (options?: { pluginId: string }) => ({
     service: coreServices.pluginMetadata,
     deps: {},
-    factory: async () => ({ getId: () => options.pluginId }),
+    factory: async () => ({ getId: () => options?.pluginId! }),
   }),
 );
 
-export class ServiceRegistry implements EnumerableServiceHolder {
+export class ServiceRegistry {
+  static create(factories: Array<ServiceFactory>): ServiceRegistry {
+    const registry = new ServiceRegistry(factories);
+    registry.checkForCircularDeps();
+    return registry;
+  }
+
   readonly #providedFactories: Map<string, InternalServiceFactory>;
   readonly #loadedDefaultFactories: Map<
     Function,
@@ -73,8 +79,10 @@ export class ServiceRegistry implements EnumerableServiceHolder {
     InternalServiceFactory,
     Promise<unknown>
   >();
+  readonly #addedFactoryIds = new Set<string>();
+  readonly #instantiatedFactories = new Set<string>();
 
-  constructor(factories: Array<ServiceFactory>) {
+  private constructor(factories: Array<ServiceFactory>) {
     this.#providedFactories = new Map(
       factories.map(sf => [sf.service.id, toInternalServiceFactory(sf)]),
     );
@@ -146,11 +154,58 @@ export class ServiceRegistry implements EnumerableServiceHolder {
     }
   }
 
+  checkForCircularDeps(): void {
+    const graph = DependencyGraph.fromIterable(
+      Array.from(this.#providedFactories).map(
+        ([serviceId, serviceFactory]) => ({
+          value: serviceId,
+          provides: [serviceId],
+          consumes: Object.values(serviceFactory.deps).map(d => d.id),
+        }),
+      ),
+    );
+    const circularDependencies = Array.from(graph.detectCircularDependencies());
+
+    if (circularDependencies.length) {
+      const cycles = circularDependencies
+        .map(c => c.map(id => `'${id}'`).join(' -> '))
+        .join('\n  ');
+
+      throw new ConflictError(`Circular dependencies detected:\n  ${cycles}`);
+    }
+  }
+
+  add(factory: ServiceFactory) {
+    const factoryId = factory.service.id;
+    if (factoryId === coreServices.pluginMetadata.id) {
+      throw new Error(
+        `The ${coreServices.pluginMetadata.id} service cannot be overridden`,
+      );
+    }
+
+    if (this.#addedFactoryIds.has(factoryId)) {
+      throw new Error(
+        `Duplicate service implementations provided for ${factoryId}`,
+      );
+    }
+
+    if (this.#instantiatedFactories.has(factoryId)) {
+      throw new Error(
+        `Unable to set service factory with id ${factoryId}, service has already been instantiated`,
+      );
+    }
+
+    this.#addedFactoryIds.add(factoryId);
+    this.#providedFactories.set(factoryId, toInternalServiceFactory(factory));
+  }
+
   getServiceRefs(): ServiceRef<unknown>[] {
     return Array.from(this.#providedFactories.values()).map(f => f.service);
   }
 
   get<T>(ref: ServiceRef<T>, pluginId: string): Promise<T> | undefined {
+    this.#instantiatedFactories.add(ref.id);
+
     return this.#resolveFactory(ref, pluginId)?.then(factory => {
       if (factory.service.scope === 'root') {
         let existing = this.#rootServiceImplementations.get(factory);
diff --git a/packages/backend-app-api/src/wiring/createSpecializedBackend.test.ts b/packages/backend-app-api/src/wiring/createSpecializedBackend.test.ts
index dc9a0cc085..1fd7fcbbec 100644
--- a/packages/backend-app-api/src/wiring/createSpecializedBackend.test.ts
+++ b/packages/backend-app-api/src/wiring/createSpecializedBackend.test.ts
@@ -22,13 +22,15 @@ import { createSpecializedBackend } from './createSpecializedBackend';
 
 describe('createSpecializedBackend', () => {
   it('should create a backend without services', () => {
-    expect(() => createSpecializedBackend({ services: [] })).not.toThrow();
+    expect(() =>
+      createSpecializedBackend({ defaultServiceFactories: [] }),
+    ).not.toThrow();
   });
 
   it('should throw on duplicate service implementations', () => {
     expect(() =>
       createSpecializedBackend({
-        services: [
+        defaultServiceFactories: [
           createServiceFactory({
             service: coreServices.rootLifecycle,
             deps: {},
@@ -55,7 +57,7 @@ describe('createSpecializedBackend', () => {
   it('should throw when providing a plugin metadata service implementation', () => {
     expect(() =>
       createSpecializedBackend({
-        services: [
+        defaultServiceFactories: [
           createServiceFactory({
             service: coreServices.pluginMetadata,
             deps: {},
diff --git a/packages/backend-app-api/src/wiring/createSpecializedBackend.ts b/packages/backend-app-api/src/wiring/createSpecializedBackend.ts
index 15e51f7c4c..f5c4d8b152 100644
--- a/packages/backend-app-api/src/wiring/createSpecializedBackend.ts
+++ b/packages/backend-app-api/src/wiring/createSpecializedBackend.ts
@@ -24,7 +24,7 @@ import { Backend, CreateSpecializedBackendOptions } from './types';
 export function createSpecializedBackend(
   options: CreateSpecializedBackendOptions,
 ): Backend {
-  const services = options.services.map(sf =>
+  const services = options.defaultServiceFactories.map(sf =>
     typeof sf === 'function' ? sf() : sf,
   );
 
diff --git a/packages/backend-app-api/src/wiring/types.ts b/packages/backend-app-api/src/wiring/types.ts
index ffedb40324..027b2bf254 100644
--- a/packages/backend-app-api/src/wiring/types.ts
+++ b/packages/backend-app-api/src/wiring/types.ts
@@ -25,7 +25,12 @@ import {
  * @public
  */
 export interface Backend {
-  add(feature: BackendFeature): void;
+  add(
+    feature:
+      | BackendFeature
+      | (() => BackendFeature)
+      | Promise<{ default: BackendFeature | (() => BackendFeature) }>,
+  ): void;
   start(): Promise<void>;
   stop(): Promise<void>;
 }
@@ -34,18 +39,7 @@ export interface Backend {
  * @public
  */
 export interface CreateSpecializedBackendOptions {
-  services: ServiceFactoryOrFunction[];
-}
-
-export interface ServiceHolder {
-  get<T>(api: ServiceRef<T>, pluginId: string): Promise<T> | undefined;
-}
-
-/**
- * @internal
- */
-export interface EnumerableServiceHolder extends ServiceHolder {
-  getServiceRefs(): ServiceRef<unknown>[];
+  defaultServiceFactories: ServiceFactoryOrFunction[];
 }
 
 /**
diff --git a/packages/backend-common/CHANGELOG.md b/packages/backend-common/CHANGELOG.md
index f0c6d75478..2d4c3cd4d9 100644
--- a/packages/backend-common/CHANGELOG.md
+++ b/packages/backend-common/CHANGELOG.md
@@ -1,5 +1,88 @@
 # @backstage/backend-common
 
+## 0.19.5-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-app-api@0.5.3-next.2
+  - @backstage/config-loader@1.5.0-next.2
+  - @backstage/config@1.1.0-next.1
+  - @backstage/integration@1.7.0-next.2
+  - @backstage/integration-aws-node@0.1.6-next.1
+  - @backstage/backend-plugin-api@0.6.3-next.2
+  - @backstage/backend-dev-utils@0.1.1
+  - @backstage/cli-common@0.1.12
+  - @backstage/errors@1.2.1
+  - @backstage/types@1.1.0
+
+## 0.19.5-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config@1.1.0-next.0
+  - @backstage/integration@1.7.0-next.1
+  - @backstage/backend-app-api@0.5.3-next.1
+  - @backstage/backend-plugin-api@0.6.3-next.1
+  - @backstage/config-loader@1.5.0-next.1
+  - @backstage/integration-aws-node@0.1.6-next.0
+  - @backstage/backend-dev-utils@0.1.1
+  - @backstage/cli-common@0.1.12
+  - @backstage/errors@1.2.1
+  - @backstage/types@1.1.0
+
+## 0.19.4-next.0
+
+### Patch Changes
+
+- 5f1a92b9f19f: Use `DefaultAzureDevOpsCredentialsProvider` to retrieve credentials for Azure DevOps.
+- cfc3ca6ce060: Changes needed to support MySQL
+- Updated dependencies
+  - @backstage/integration@1.7.0-next.0
+  - @backstage/config-loader@1.5.0-next.0
+  - @backstage/backend-app-api@0.5.2-next.0
+  - @backstage/backend-dev-utils@0.1.1
+  - @backstage/backend-plugin-api@0.6.2-next.0
+  - @backstage/cli-common@0.1.12
+  - @backstage/config@1.0.8
+  - @backstage/errors@1.2.1
+  - @backstage/integration-aws-node@0.1.5
+  - @backstage/types@1.1.0
+
+## 0.19.2
+
+### Patch Changes
+
+- 629cbd194a87: Use `coreServices.rootConfig` instead of `coreService.config`
+- 443afcf7f567: To improve performance, `GerritUrlReader.readTree()` now uses Gitiles to fetch an archive instead of cloning the repository.
+  If `gitilesBaseUrl` is not configured, `readTree` still uses Git to clone the repository.
+
+  Added `stripFirstDirectory` option to `ReadTreeResponseFactory.fromTarArchive()`, allowing to disable stripping first directory
+  for `tar` archives.
+
+- 4b82382ed8c2: Fixed invalid configuration schema. The configuration schema may be more strict as a result.
+- Updated dependencies
+  - @backstage/backend-app-api@0.5.0
+  - @backstage/config-loader@1.4.0
+  - @backstage/backend-plugin-api@0.6.0
+  - @backstage/integration@1.6.0
+  - @backstage/integration-aws-node@0.1.5
+  - @backstage/backend-dev-utils@0.1.1
+  - @backstage/cli-common@0.1.12
+  - @backstage/config@1.0.8
+  - @backstage/errors@1.2.1
+  - @backstage/types@1.1.0
+
+## 0.19.2-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-app-api@0.5.0-next.2
+  - @backstage/backend-plugin-api@0.6.0-next.2
+  - @backstage/config-loader@1.4.0-next.1
+
 ## 0.19.2-next.1
 
 ### Patch Changes
diff --git a/packages/backend-common/api-report.md b/packages/backend-common/api-report.md
index fae3e2117d..f0fa15efb0 100644
--- a/packages/backend-common/api-report.md
+++ b/packages/backend-common/api-report.md
@@ -9,6 +9,7 @@
 import { AppConfig } from '@backstage/config';
 import { AwsCredentialsManager } from '@backstage/integration-aws-node';
 import { AwsS3Integration } from '@backstage/integration';
+import { AzureDevOpsCredentialsProvider } from '@backstage/integration';
 import { AzureIntegration } from '@backstage/integration';
 import { BackendFeature } from '@backstage/backend-plugin-api';
 import { BitbucketCloudIntegration } from '@backstage/integration';
@@ -94,6 +95,7 @@ export class AzureUrlReader implements UrlReader {
     integration: AzureIntegration,
     deps: {
       treeResponseFactory: ReadTreeResponseFactory;
+      credentialsProvider: AzureDevOpsCredentialsProvider;
     },
   );
   // (undocumented)
@@ -610,7 +612,9 @@ export interface ReadTreeResponseFactory {
   ): Promise<ReadTreeResponse>;
   // (undocumented)
   fromTarArchive(
-    options: ReadTreeResponseFactoryOptions,
+    options: ReadTreeResponseFactoryOptions & {
+      stripFirstDirectory?: boolean;
+    },
   ): Promise<ReadTreeResponse>;
   // (undocumented)
   fromZipArchive(
diff --git a/packages/backend-common/catalog-info.yaml b/packages/backend-common/catalog-info.yaml
new file mode 100644
index 0000000000..ff38a4df75
--- /dev/null
+++ b/packages/backend-common/catalog-info.yaml
@@ -0,0 +1,10 @@
+apiVersion: backstage.io/v1alpha1
+kind: Component
+metadata:
+  name: backstage-backend-common
+  title: '@backstage/backend-common'
+  description: Common functionality library for Backstage backends
+spec:
+  lifecycle: experimental
+  type: backstage-node-library
+  owner: maintainers
diff --git a/packages/backend-common/package.json b/packages/backend-common/package.json
index e18369b7e7..bb9427da51 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.19.2-next.1",
+  "version": "0.19.5-next.2",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "publishConfig": {
@@ -92,6 +92,7 @@
     "minimatch": "^5.0.0",
     "minimist": "^1.2.5",
     "morgan": "^1.10.0",
+    "mysql2": "^2.2.5",
     "node-fetch": "^2.6.7",
     "node-forge": "^1.3.1",
     "pg": "^8.3.0",
diff --git a/packages/backend-common/src/database/DatabaseManager.test.ts b/packages/backend-common/src/database/DatabaseManager.test.ts
index 69386d77c5..bf4af17d05 100644
--- a/packages/backend-common/src/database/DatabaseManager.test.ts
+++ b/packages/backend-common/src/database/DatabaseManager.test.ts
@@ -425,6 +425,33 @@ describe('DatabaseManager', () => {
       );
     });
 
+    it('generates a database name override when prefix is not explicitly set for mysql', async () => {
+      const testManager = DatabaseManager.fromConfig(
+        new ConfigReader({
+          backend: {
+            database: {
+              client: 'mysql',
+              connection: {
+                host: 'localhost',
+                user: 'foo',
+                password: 'bar',
+                database: 'foodb',
+              },
+            },
+          },
+        }),
+      );
+
+      await testManager.forPlugin('testplugin').getClient();
+      const mockCalls = mocked(createDatabaseClient).mock.calls.splice(-1);
+      const [_baseConfig, overrides] = mockCalls[0];
+
+      expect(overrides).toHaveProperty(
+        'connection.database',
+        expect.stringContaining('backstage_plugin_'),
+      );
+    });
+
     it('uses values from plugin connection string if top level client should be used', async () => {
       const pluginId = 'stringoverride';
       await manager.forPlugin(pluginId).getClient();
diff --git a/packages/backend-common/src/reading/AzureUrlReader.test.ts b/packages/backend-common/src/reading/AzureUrlReader.test.ts
index f969b3b7eb..6b2f41a2bf 100644
--- a/packages/backend-common/src/reading/AzureUrlReader.test.ts
+++ b/packages/backend-common/src/reading/AzureUrlReader.test.ts
@@ -17,7 +17,11 @@
 import { ConfigReader } from '@backstage/config';
 import {
   AzureIntegration,
+  DefaultAzureDevOpsCredentialsProvider,
   readAzureIntegrationConfig,
+  ScmIntegrations,
+  AzureDevOpsCredentialLike,
+  AzureIntegrationConfig,
 } from '@backstage/integration';
 import { setupRequestMockHandlers } from '@backstage/backend-test-utils';
 import fs from 'fs-extra';
@@ -31,12 +35,40 @@ import { getVoidLogger } from '../logging';
 import { AzureUrlReader } from './AzureUrlReader';
 import { DefaultReadTreeResponseFactory } from './tree';
 
+type AzureIntegrationConfigLike = Partial<
+  Omit<AzureIntegrationConfig, 'credential' | 'credentials'>
+> & {
+  credentials?: Partial<AzureDevOpsCredentialLike>[];
+};
+
 const logger = getVoidLogger();
 
 const treeResponseFactory = DefaultReadTreeResponseFactory.create({
   config: new ConfigReader({}),
 });
 
+const urlReaderFactory = (azureIntegration: AzureIntegrationConfigLike) => {
+  const credentialsProvider =
+    DefaultAzureDevOpsCredentialsProvider.fromIntegrations(
+      ScmIntegrations.fromConfig(
+        new ConfigReader({
+          integrations: {
+            azure: [azureIntegration],
+          },
+        }),
+      ),
+    );
+  return new AzureUrlReader(
+    new AzureIntegration(
+      readAzureIntegrationConfig(new ConfigReader(azureIntegration)),
+    ),
+    {
+      treeResponseFactory,
+      credentialsProvider,
+    },
+  );
+};
+
 const tmpDir = os.platform() === 'win32' ? 'C:\\tmp' : '/tmp';
 
 describe('AzureUrlReader', () => {
@@ -68,13 +100,29 @@ describe('AzureUrlReader', () => {
       );
     });
 
-    const createConfig = (token?: string) =>
-      new ConfigReader(
+    const createConfig = (token?: string) => {
+      let credentials: AzureDevOpsCredentialLike[] | undefined = undefined;
+      if (token !== undefined) {
+        credentials = [
+          {
+            personalAccessToken: token,
+          },
+        ];
+      }
+      return new ConfigReader(
         {
-          integrations: { azure: [{ host: 'dev.azure.com', token }] },
+          integrations: {
+            azure: [
+              {
+                host: 'dev.azure.com',
+                credentials: credentials,
+              },
+            ],
+          },
         },
         'test-config',
       );
+    };
 
     it.each([
       {
@@ -104,8 +152,8 @@ describe('AzureUrlReader', () => {
         url: 'https://dev.azure.com/a/b/_git/repo-name?path=my-template.yaml',
         config: createConfig(undefined),
         response: expect.objectContaining({
-          headers: expect.not.objectContaining({
-            authorization: expect.anything(),
+          headers: expect.objectContaining({
+            authorization: expect.stringMatching(/^Bearer /),
           }),
         }),
       },
@@ -137,7 +185,7 @@ describe('AzureUrlReader', () => {
         url: '',
         config: createConfig(''),
         error:
-          "Invalid type in config for key 'integrations.azure[0].token' in 'test-config', got empty-string, wanted string",
+          "Invalid type in config for key 'integrations.azure[0].credentials[0].personalAccessToken' in 'test-config', got empty-string, wanted string",
       },
     ])('should handle error path %#', async ({ url, config, error }) => {
       await expect(async () => {
@@ -156,16 +204,14 @@ describe('AzureUrlReader', () => {
       path.resolve(__dirname, '__fixtures__/mock-main.zip'),
     );
 
-    const processor = new AzureUrlReader(
-      new AzureIntegration(
-        readAzureIntegrationConfig(
-          new ConfigReader({
-            host: 'dev.azure.com',
-          }),
-        ),
-      ),
-      { treeResponseFactory },
-    );
+    const processor = urlReaderFactory({
+      host: 'dev.azure.com',
+      credentials: [
+        {
+          personalAccessToken: 'my-pat',
+        },
+      ],
+    });
 
     beforeEach(() => {
       worker.use(
@@ -268,16 +314,14 @@ describe('AzureUrlReader', () => {
       path.resolve(__dirname, '__fixtures__/mock-main.zip'),
     );
 
-    const processor = new AzureUrlReader(
-      new AzureIntegration(
-        readAzureIntegrationConfig(
-          new ConfigReader({
-            host: 'dev.azure.com',
-          }),
-        ),
-      ),
-      { treeResponseFactory },
-    );
+    const processor = urlReaderFactory({
+      host: 'dev.azure.com',
+      credentials: [
+        {
+          personalAccessToken: 'my-pat',
+        },
+      ],
+    });
 
     beforeEach(() => {
       worker.use(
diff --git a/packages/backend-common/src/reading/AzureUrlReader.ts b/packages/backend-common/src/reading/AzureUrlReader.ts
index 94abf3a178..783736b639 100644
--- a/packages/backend-common/src/reading/AzureUrlReader.ts
+++ b/packages/backend-common/src/reading/AzureUrlReader.ts
@@ -15,12 +15,13 @@
  */
 
 import {
-  AzureIntegration,
   getAzureCommitsUrl,
   getAzureDownloadUrl,
   getAzureFileFetchUrl,
-  getAzureRequestOptions,
+  AzureDevOpsCredentialsProvider,
+  DefaultAzureDevOpsCredentialsProvider,
   ScmIntegrations,
+  AzureIntegration,
 } from '@backstage/integration';
 import fetch, { Response } from 'node-fetch';
 import { Minimatch } from 'minimatch';
@@ -47,8 +48,13 @@ import { ReadUrlResponseFactory } from './ReadUrlResponseFactory';
 export class AzureUrlReader implements UrlReader {
   static factory: ReaderFactory = ({ config, treeResponseFactory }) => {
     const integrations = ScmIntegrations.fromConfig(config);
+    const credentialProvider =
+      DefaultAzureDevOpsCredentialsProvider.fromIntegrations(integrations);
     return integrations.azure.list().map(integration => {
-      const reader = new AzureUrlReader(integration, { treeResponseFactory });
+      const reader = new AzureUrlReader(integration, {
+        treeResponseFactory,
+        credentialsProvider: credentialProvider,
+      });
       const predicate = (url: URL) => url.host === integration.config.host;
       return { reader, predicate };
     });
@@ -56,7 +62,10 @@ export class AzureUrlReader implements UrlReader {
 
   constructor(
     private readonly integration: AzureIntegration,
-    private readonly deps: { treeResponseFactory: ReadTreeResponseFactory },
+    private readonly deps: {
+      treeResponseFactory: ReadTreeResponseFactory;
+      credentialsProvider: AzureDevOpsCredentialsProvider;
+    },
   ) {}
 
   async read(url: string): Promise<Buffer> {
@@ -72,11 +81,13 @@ export class AzureUrlReader implements UrlReader {
     const { signal } = options ?? {};
 
     const builtUrl = getAzureFileFetchUrl(url);
-
     let response: Response;
     try {
+      const credentials = await this.deps.credentialsProvider.getCredentials({
+        url: builtUrl,
+      });
       response = await fetch(builtUrl, {
-        ...(await getAzureRequestOptions(this.integration.config)),
+        headers: credentials?.headers,
         // TODO(freben): The signal cast is there because pre-3.x versions of
         // node-fetch have a very slightly deviating AbortSignal type signature.
         // The difference does not affect us in practice however. The cast can
@@ -111,10 +122,13 @@ export class AzureUrlReader implements UrlReader {
 
     // Get latest commit SHA
 
-    const commitsAzureResponse = await fetch(
-      getAzureCommitsUrl(url),
-      await getAzureRequestOptions(this.integration.config),
-    );
+    const credentials = await this.deps.credentialsProvider.getCredentials({
+      url: url,
+    });
+
+    const commitsAzureResponse = await fetch(getAzureCommitsUrl(url), {
+      headers: credentials?.headers,
+    });
     if (!commitsAzureResponse.ok) {
       const message = `Failed to read tree from ${url}, ${commitsAzureResponse.status} ${commitsAzureResponse.statusText}`;
       if (commitsAzureResponse.status === 404) {
@@ -129,9 +143,10 @@ export class AzureUrlReader implements UrlReader {
     }
 
     const archiveAzureResponse = await fetch(getAzureDownloadUrl(url), {
-      ...(await getAzureRequestOptions(this.integration.config, {
+      headers: {
+        ...credentials?.headers,
         Accept: 'application/zip',
-      })),
+      },
       // TODO(freben): The signal cast is there because pre-3.x versions of
       // node-fetch have a very slightly deviating AbortSignal type signature.
       // The difference does not affect us in practice however. The cast can be
@@ -198,7 +213,9 @@ export class AzureUrlReader implements UrlReader {
   }
 
   toString() {
-    const { host, token } = this.integration.config;
-    return `azure{host=${host},authed=${Boolean(token)}}`;
+    const { host, credentials } = this.integration.config;
+    return `azure{host=${host},authed=${Boolean(
+      credentials !== undefined && credentials.length > 0,
+    )}}`;
   }
 }
diff --git a/packages/backend-common/src/reading/GerritUrlReader.test.ts b/packages/backend-common/src/reading/GerritUrlReader.test.ts
index 4e0b97fc58..9de9aac33d 100644
--- a/packages/backend-common/src/reading/GerritUrlReader.test.ts
+++ b/packages/backend-common/src/reading/GerritUrlReader.test.ts
@@ -37,14 +37,16 @@ const treeResponseFactory = DefaultReadTreeResponseFactory.create({
   config: new ConfigReader({}),
 });
 
+const cloneMock = jest.fn(() => Promise.resolve());
 jest.mock('../scm', () => ({
   Git: {
     fromAuth: () => ({
-      clone: jest.fn(() => Promise.resolve({})),
+      clone: cloneMock,
     }),
   },
 }));
 
+// Gerrit processor without a gitilesBaseUrl configured
 const gerritProcessor = new GerritUrlReader(
   new GerritIntegration(
     readGerritIntegrationConfig(
@@ -57,6 +59,21 @@ const gerritProcessor = new GerritUrlReader(
   '/tmp',
 );
 
+// Gerrit processor with a gitilesBaseUrl configured.
+// Use to test readTree with Gitiles archive download.
+const gerritProcessorWithGitiles = new GerritUrlReader(
+  new GerritIntegration(
+    readGerritIntegrationConfig(
+      new ConfigReader({
+        host: 'gerrit.com',
+        gitilesBaseUrl: 'https://gerrit.com/gitiles',
+      }),
+    ),
+  ),
+  { treeResponseFactory },
+  '/tmp',
+);
+
 const createReader = (config: JsonObject): UrlReaderPredicateTuple[] => {
   return GerritUrlReader.factory({
     config: new ConfigReader(config),
@@ -217,9 +234,17 @@ describe('GerritUrlReader', () => {
       path.resolve(__dirname, '__fixtures__/gerrit/branch-info-response.txt'),
     );
     const treeUrl = 'https://gerrit.com/app/web/+/refs/heads/master/';
+    const treeUrlGitiles =
+      'https://gerrit.com/gitiles/app/web/+/refs/heads/master/';
     const etag = '52432507a70b677b5674b019c9a46b2e9f29d0a1';
-    const mkdocsContent = 'great content';
+    const mkdocsContent = 'a repo fetched using git clone';
     const mdContent = 'doc';
+    const repoArchiveBuffer = fs.readFileSync(
+      path.resolve(__dirname, '__fixtures__/gerrit/gerrit-master.tar.gz'),
+    );
+    const repoArchiveDocsBuffer = fs.readFileSync(
+      path.resolve(__dirname, '__fixtures__/gerrit/gerrit-master-docs.tar.gz'),
+    );
 
     beforeEach(() => {
       mockFs({
@@ -229,6 +254,35 @@ describe('GerritUrlReader', () => {
       });
       const spy = jest.spyOn(fs, 'mkdtemp');
       spy.mockImplementation(() => '/tmp/gerrit-clone-123abc');
+
+      worker.use(
+        rest.get(
+          'https://gerrit.com/gitiles/app/web/\\+archive/refs/heads/master.tar.gz',
+          (_, res, ctx) =>
+            res(
+              ctx.status(200),
+              ctx.set('Content-Type', 'application/x-gzip'),
+              ctx.set(
+                'content-disposition',
+                'attachment; filename=web-refs/heads/master.tar.gz',
+              ),
+              ctx.body(repoArchiveBuffer),
+            ),
+        ),
+        rest.get(
+          'https://gerrit.com/gitiles/app/web/\\+archive/refs/heads/master/docs.tar.gz',
+          (_, res, ctx) =>
+            res(
+              ctx.status(200),
+              ctx.set('Content-Type', 'application/x-gzip'),
+              ctx.set(
+                'content-disposition',
+                'attachment; filename=web-refs/heads/master-docs.tar.gz',
+              ),
+              ctx.body(repoArchiveDocsBuffer),
+            ),
+        ),
+      );
     });
 
     afterEach(() => {
@@ -236,7 +290,32 @@ describe('GerritUrlReader', () => {
       jest.clearAllMocks();
     });
 
-    it('reads the wanted files correctly.', async () => {
+    it('reads the wanted files correctly using gitiles.', async () => {
+      worker.use(
+        rest.get(branchAPIUrl, (_, res, ctx) => {
+          return res(ctx.status(200), ctx.body(branchAPIresponse));
+        }),
+      );
+
+      const response = await gerritProcessorWithGitiles.readTree(
+        treeUrlGitiles,
+      );
+
+      expect(response.etag).toBe(etag);
+
+      const files = await response.files();
+      expect(files.length).toBe(2);
+
+      const docsYaml = await files[0].content();
+      expect(docsYaml.toString()).toBe('# Test\n');
+
+      const mdFile = await files[1].content();
+      expect(mdFile.toString()).toBe('site_name: Test\n');
+
+      expect(cloneMock).not.toHaveBeenCalled();
+    });
+
+    it('reads the wanted files correctly using git clone.', async () => {
       worker.use(
         rest.get(branchAPIUrl, (_, res, ctx) => {
           return res(ctx.status(200), ctx.body(branchAPIresponse));
@@ -255,6 +334,8 @@ describe('GerritUrlReader', () => {
 
       const mdFile = await files[1].content();
       expect(mdFile.toString()).toBe(mdContent);
+
+      expect(cloneMock).toHaveBeenCalled();
     });
 
     it('throws NotModifiedError for matching etags.', async () => {
@@ -291,7 +372,29 @@ describe('GerritUrlReader', () => {
       await expect(gerritProcessor.readTree(treeUrl)).rejects.toThrow(Error);
     });
 
-    it('should returns wanted files with a subpath', async () => {
+    it('should returns wanted files with a subpath using gitiles', async () => {
+      worker.use(
+        rest.get(branchAPIUrl, (_, res, ctx) => {
+          return res(ctx.status(200), ctx.body(branchAPIresponse));
+        }),
+      );
+
+      const response = await gerritProcessorWithGitiles.readTree(
+        `${treeUrlGitiles}/docs`,
+      );
+
+      expect(response.etag).toBe(etag);
+
+      const files = await response.files();
+      expect(files.length).toBe(1);
+
+      const mdFile = await files[0].content();
+      expect(mdFile.toString()).toBe('# Test\n');
+
+      expect(cloneMock).not.toHaveBeenCalled();
+    });
+
+    it('should returns wanted files with a subpath using git clone', async () => {
       worker.use(
         rest.get(branchAPIUrl, (_, res, ctx) => {
           return res(ctx.status(200), ctx.body(branchAPIresponse));
@@ -307,6 +410,8 @@ describe('GerritUrlReader', () => {
 
       const mdFile = await files[0].content();
       expect(mdFile.toString()).toBe(mdContent);
+
+      expect(cloneMock).toHaveBeenCalled();
     });
   });
 });
diff --git a/packages/backend-common/src/reading/GerritUrlReader.ts b/packages/backend-common/src/reading/GerritUrlReader.ts
index 8ac5452a4c..f4a5fdb9f5 100644
--- a/packages/backend-common/src/reading/GerritUrlReader.ts
+++ b/packages/backend-common/src/reading/GerritUrlReader.ts
@@ -14,16 +14,17 @@
  * limitations under the License.
  */
 
-import { Git } from '../scm';
 import { NotFoundError, NotModifiedError } from '@backstage/errors';
 import {
   GerritIntegration,
-  getGerritCloneRepoUrl,
+  ScmIntegrations,
+  buildGerritGitilesArchiveUrl,
   getGerritBranchApiUrl,
+  getGerritCloneRepoUrl,
   getGerritFileContentsApiUrl,
   getGerritRequestOptions,
-  parseGerritJsonResponse,
   parseGerritGitilesUrl,
+  parseGerritJsonResponse,
 } from '@backstage/integration';
 import { Base64Decode } from 'base64-stream';
 import concatStream from 'concat-stream';
@@ -31,20 +32,20 @@ import fs from 'fs-extra';
 import fetch, { Response } from 'node-fetch';
 import os from 'os';
 import { join as joinPath } from 'path';
+import { Readable, pipeline as pipelineCb } from 'stream';
 import tar from 'tar';
-import { pipeline as pipelineCb, Readable } from 'stream';
 import { promisify } from 'util';
+import { Git } from '../scm';
 import {
-  ReaderFactory,
   ReadTreeOptions,
   ReadTreeResponse,
   ReadTreeResponseFactory,
   ReadUrlOptions,
   ReadUrlResponse,
+  ReaderFactory,
   SearchResponse,
   UrlReader,
 } from './types';
-import { ScmIntegrations } from '@backstage/integration';
 
 const pipeline = promisify(pipelineCb);
 
@@ -59,6 +60,8 @@ const createTemporaryDirectory = async (workDir: string): Promise<string> =>
  * way we are depending on that there is a Gitiles installation somewhere
  * that we can link to. It is perfectly possible to integrate Gerrit with
  * Backstage without Gitiles since all API calls goes directly to Gerrit.
+ * However if Gitiles is configured, readTree will use it to fetch
+ * an archive instead of cloning the repository.
  *
  * The "host" variable in the config is the Gerrit host. The address where
  * Gitiles is installed may be on the same host but it could be on a
@@ -125,6 +128,7 @@ export class GerritUrlReader implements UrlReader {
     } catch (e) {
       throw new Error(`Unable to read gerrit file ${url}, ${e}`);
     }
+
     if (response.ok) {
       let responseBody: string;
       return {
@@ -152,7 +156,6 @@ export class GerritUrlReader implements UrlReader {
     url: string,
     options?: ReadTreeOptions,
   ): Promise<ReadTreeResponse> {
-    const { filePath } = parseGerritGitilesUrl(this.integration.config, url);
     const apiUrl = getGerritBranchApiUrl(this.integration.config, url);
     let response: Response;
     try {
@@ -180,6 +183,30 @@ export class GerritUrlReader implements UrlReader {
       throw new NotModifiedError();
     }
 
+    if (
+      this.integration.config.gitilesBaseUrl !== this.integration.config.baseUrl
+    ) {
+      return this.readTreeFromGitiles(url, branchInfo.revision, options);
+    }
+    return this.readTreeFromGitClone(url, branchInfo.revision, options);
+  }
+
+  async search(): Promise<SearchResponse> {
+    throw new Error('GerritReader does not implement search');
+  }
+
+  toString() {
+    const { host, password } = this.integration.config;
+    return `gerrit{host=${host},authed=${Boolean(password)}}`;
+  }
+
+  private async readTreeFromGitClone(
+    url: string,
+    revision: string,
+    options?: ReadTreeOptions,
+  ) {
+    const { filePath } = parseGerritGitilesUrl(this.integration.config, url);
+
     const git = Git.fromAuth({
       username: this.integration.config.username,
       password: this.integration.config.password,
@@ -192,7 +219,7 @@ export class GerritUrlReader implements UrlReader {
       await git.clone({
         url: cloneUrl,
         dir: joinPath(tempDir, 'repo'),
-        ref: branchInfo.revision,
+        ref: revision,
         depth: 1,
       });
 
@@ -206,7 +233,7 @@ export class GerritUrlReader implements UrlReader {
       return await this.deps.treeResponseFactory.fromTarArchive({
         stream: tarArchive,
         subpath: filePath === '/' ? undefined : filePath,
-        etag: branchInfo.revision,
+        etag: revision,
         filter: options?.filter,
       });
     } catch (error) {
@@ -216,12 +243,47 @@ export class GerritUrlReader implements UrlReader {
     }
   }
 
-  async search(): Promise<SearchResponse> {
-    throw new Error('GerritReader does not implement search');
-  }
+  private async readTreeFromGitiles(
+    url: string,
+    revision: string,
+    options?: ReadTreeOptions,
+  ) {
+    const { branch, filePath, project } = parseGerritGitilesUrl(
+      this.integration.config,
+      url,
+    );
+    const archiveUrl = buildGerritGitilesArchiveUrl(
+      this.integration.config,
+      project,
+      branch,
+      filePath,
+    );
+    const archiveResponse = await fetch(archiveUrl, {
+      ...getGerritRequestOptions(this.integration.config),
+      // TODO(freben): The signal cast is there because pre-3.x versions of
+      // node-fetch have a very slightly deviating AbortSignal type signature.
+      // The difference does not affect us in practice however. The cast can
+      // be removed after we support ESM for CLI dependencies and migrate to
+      // version 3 of node-fetch.
+      // https://github.com/backstage/backstage/issues/8242
+      signal: options?.signal as any,
+    });
 
-  toString() {
-    const { host, password } = this.integration.config;
-    return `gerrit{host=${host},authed=${Boolean(password)}}`;
+    if (archiveResponse.status === 404) {
+      throw new NotFoundError(`Not found: ${archiveUrl}`);
+    }
+
+    if (!archiveResponse.ok) {
+      throw new Error(
+        `${url} could not be read as ${archiveUrl}, ${archiveResponse.status} ${archiveResponse.statusText}`,
+      );
+    }
+
+    return await this.deps.treeResponseFactory.fromTarArchive({
+      stream: archiveResponse.body as unknown as Readable,
+      etag: revision,
+      filter: options?.filter,
+      stripFirstDirectory: false,
+    });
   }
 }
diff --git a/packages/backend-common/src/reading/__fixtures__/gerrit/gerrit-master-docs.tar.gz b/packages/backend-common/src/reading/__fixtures__/gerrit/gerrit-master-docs.tar.gz
new file mode 100644
index 0000000000..425cf0876b
Binary files /dev/null and b/packages/backend-common/src/reading/__fixtures__/gerrit/gerrit-master-docs.tar.gz differ
diff --git a/packages/backend-common/src/reading/__fixtures__/gerrit/gerrit-master.tar.gz b/packages/backend-common/src/reading/__fixtures__/gerrit/gerrit-master.tar.gz
new file mode 100644
index 0000000000..8a27502734
Binary files /dev/null and b/packages/backend-common/src/reading/__fixtures__/gerrit/gerrit-master.tar.gz differ
diff --git a/packages/backend-common/src/reading/tree/ReadTreeResponseFactory.ts b/packages/backend-common/src/reading/tree/ReadTreeResponseFactory.ts
index 11a5ef168a..90c58c0efa 100644
--- a/packages/backend-common/src/reading/tree/ReadTreeResponseFactory.ts
+++ b/packages/backend-common/src/reading/tree/ReadTreeResponseFactory.ts
@@ -37,7 +37,9 @@ export class DefaultReadTreeResponseFactory implements ReadTreeResponseFactory {
   constructor(private readonly workDir: string) {}
 
   async fromTarArchive(
-    options: ReadTreeResponseFactoryOptions,
+    options: ReadTreeResponseFactoryOptions & {
+      stripFirstDirectory?: boolean;
+    },
   ): Promise<ReadTreeResponse> {
     return new TarArchiveResponse(
       options.stream,
@@ -45,6 +47,7 @@ export class DefaultReadTreeResponseFactory implements ReadTreeResponseFactory {
       this.workDir,
       options.etag,
       options.filter,
+      options.stripFirstDirectory ?? true,
     );
   }
 
diff --git a/packages/backend-common/src/reading/tree/TarArchiveResponse.ts b/packages/backend-common/src/reading/tree/TarArchiveResponse.ts
index e1529c196a..294ec22609 100644
--- a/packages/backend-common/src/reading/tree/TarArchiveResponse.ts
+++ b/packages/backend-common/src/reading/tree/TarArchiveResponse.ts
@@ -44,6 +44,7 @@ export class TarArchiveResponse implements ReadTreeResponse {
     private readonly workDir: string,
     public readonly etag: string,
     private readonly filter?: (path: string, info: { size: number }) => boolean,
+    private readonly stripFirstDirectory: boolean = true,
   ) {
     if (subPath) {
       if (!subPath.endsWith('/')) {
@@ -81,7 +82,9 @@ export class TarArchiveResponse implements ReadTreeResponse {
 
       // File path relative to the root extracted directory. Will remove the
       // top level dir name from the path since its name is hard to predetermine.
-      const relativePath = stripFirstDirectoryFromPath(entry.path);
+      const relativePath = this.stripFirstDirectory
+        ? stripFirstDirectoryFromPath(entry.path)
+        : entry.path;
 
       if (this.subPath) {
         if (!relativePath.startsWith(this.subPath)) {
@@ -148,7 +151,10 @@ export class TarArchiveResponse implements ReadTreeResponse {
 
     // Equivalent of tar --strip-components=N
     // When no subPath is given, remove just 1 top level directory
-    const strip = this.subPath ? this.subPath.split('/').length : 1;
+    let strip = this.subPath ? this.subPath.split('/').length : 1;
+    if (!this.stripFirstDirectory) {
+      strip--;
+    }
 
     let filterError: Error | undefined = undefined;
     await pipeline(
@@ -164,7 +170,9 @@ export class TarArchiveResponse implements ReadTreeResponse {
 
           // File path relative to the root extracted directory. Will remove the
           // top level dir name from the path since its name is hard to predetermine.
-          const relativePath = stripFirstDirectoryFromPath(path);
+          const relativePath = this.stripFirstDirectory
+            ? stripFirstDirectoryFromPath(path)
+            : path;
           if (this.subPath && !relativePath.startsWith(this.subPath)) {
             return false;
           }
diff --git a/packages/backend-common/src/reading/types.ts b/packages/backend-common/src/reading/types.ts
index 7f4d407fd0..90a3c6287e 100644
--- a/packages/backend-common/src/reading/types.ts
+++ b/packages/backend-common/src/reading/types.ts
@@ -116,7 +116,13 @@ export type FromReadableArrayOptions = Array<{
  */
 export interface ReadTreeResponseFactory {
   fromTarArchive(
-    options: ReadTreeResponseFactoryOptions,
+    options: ReadTreeResponseFactoryOptions & {
+      /**
+       * Strip the first parent directory of a tar archive.
+       * Defaults to true.
+       */
+      stripFirstDirectory?: boolean;
+    },
   ): Promise<ReadTreeResponse>;
   fromZipArchive(
     options: ReadTreeResponseFactoryOptions,
diff --git a/packages/backend-defaults/CHANGELOG.md b/packages/backend-defaults/CHANGELOG.md
index 089f80d745..3176a34528 100644
--- a/packages/backend-defaults/CHANGELOG.md
+++ b/packages/backend-defaults/CHANGELOG.md
@@ -1,5 +1,67 @@
 # @backstage/backend-defaults
 
+## 0.2.3-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-app-api@0.5.3-next.2
+  - @backstage/backend-common@0.19.5-next.2
+  - @backstage/backend-plugin-api@0.6.3-next.2
+
+## 0.2.3-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-app-api@0.5.3-next.1
+  - @backstage/backend-common@0.19.5-next.1
+  - @backstage/backend-plugin-api@0.6.3-next.1
+
+## 0.2.2-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.19.4-next.0
+  - @backstage/backend-app-api@0.5.2-next.0
+  - @backstage/backend-plugin-api@0.6.2-next.0
+
+## 0.2.0
+
+### Minor Changes
+
+- d008aefef808: **BREAKING**: Removing shared environments concept from the new experimental backend system.
+- a6d7983f349c: **BREAKING**: Removed the `services` option from `createBackend`. Service factories are now `BackendFeature`s and should be installed with `backend.add(...)` instead. The following should be migrated:
+
+  ```ts
+  const backend = createBackend({ services: [myCustomServiceFactory] });
+  ```
+
+  To instead pass the service factory via `backend.add(...)`:
+
+  ```ts
+  const backend = createBackend();
+  backend.add(customRootLoggerServiceFactory);
+  ```
+
+### Patch Changes
+
+- 629cbd194a87: Use `coreServices.rootConfig` instead of `coreService.config`
+- Updated dependencies
+  - @backstage/backend-common@0.19.2
+  - @backstage/backend-app-api@0.5.0
+  - @backstage/backend-plugin-api@0.6.0
+
+## 0.2.0-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-app-api@0.5.0-next.2
+  - @backstage/backend-plugin-api@0.6.0-next.2
+  - @backstage/backend-common@0.19.2-next.2
+
 ## 0.2.0-next.1
 
 ### Minor Changes
diff --git a/packages/backend-defaults/api-report.md b/packages/backend-defaults/api-report.md
index 6cc58de663..ab9cc5775c 100644
--- a/packages/backend-defaults/api-report.md
+++ b/packages/backend-defaults/api-report.md
@@ -4,14 +4,7 @@
 
 ```ts
 import { Backend } from '@backstage/backend-app-api';
-import { ServiceFactoryOrFunction } from '@backstage/backend-plugin-api';
 
 // @public (undocumented)
-export function createBackend(options?: CreateBackendOptions): Backend;
-
-// @public (undocumented)
-export interface CreateBackendOptions {
-  // (undocumented)
-  services?: ServiceFactoryOrFunction[];
-}
+export function createBackend(): Backend;
 ```
diff --git a/packages/backend-defaults/catalog-info.yaml b/packages/backend-defaults/catalog-info.yaml
new file mode 100644
index 0000000000..d3d00cc3d2
--- /dev/null
+++ b/packages/backend-defaults/catalog-info.yaml
@@ -0,0 +1,10 @@
+apiVersion: backstage.io/v1alpha1
+kind: Component
+metadata:
+  name: backstage-backend-defaults
+  title: '@backstage/backend-defaults'
+  description: Backend defaults used by Backstage backend apps
+spec:
+  lifecycle: experimental
+  type: backstage-node-library
+  owner: maintainers
diff --git a/packages/backend-defaults/package.json b/packages/backend-defaults/package.json
index 5a89bb51f0..bdbbd26d3b 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.2.0-next.1",
+  "version": "0.2.3-next.2",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "publishConfig": {
diff --git a/packages/backend-defaults/src/CreateBackend.test.ts b/packages/backend-defaults/src/CreateBackend.test.ts
index de04d4e350..23e5c571bd 100644
--- a/packages/backend-defaults/src/CreateBackend.test.ts
+++ b/packages/backend-defaults/src/CreateBackend.test.ts
@@ -18,64 +18,59 @@ import {
   coreServices,
   createServiceFactory,
 } from '@backstage/backend-plugin-api';
+import { mockServices } from '@backstage/backend-test-utils';
 import { createBackend } from './CreateBackend';
 
 describe('createBackend', () => {
-  it('should not throw when overriding a default service implementation', () => {
-    expect(() =>
-      createBackend({
-        services: [
-          createServiceFactory({
-            service: coreServices.rootLifecycle,
-            deps: {},
-            factory: async () => ({
-              addStartupHook: () => {},
-              addShutdownHook: () => {},
-            }),
-          }),
-        ],
-      }),
-    ).not.toThrow();
+  it('should not throw when overriding a default service implementation', async () => {
+    const backend = createBackend();
+
+    backend.add(mockServices.rootConfig.factory());
+
+    await expect(backend.start()).resolves.toBe(undefined);
   });
 
-  it('should throw on duplicate service implementations', () => {
-    expect(() =>
-      createBackend({
-        services: [
-          createServiceFactory({
-            service: coreServices.rootLifecycle,
-            deps: {},
-            factory: async () => ({
-              addStartupHook: () => {},
-              addShutdownHook: () => {},
-            }),
-          }),
-          createServiceFactory({
-            service: coreServices.rootLifecycle,
-            deps: {},
-            factory: async () => ({
-              addStartupHook: () => {},
-              addShutdownHook: () => {},
-            }),
-          }),
-        ],
+  it('should throw on duplicate service implementations', async () => {
+    const backend = createBackend();
+
+    backend.add(
+      createServiceFactory({
+        service: coreServices.rootLifecycle,
+        deps: {},
+        factory: async () => ({
+          addStartupHook: () => {},
+          addShutdownHook: () => {},
+        }),
       }),
-    ).toThrow(
+    );
+    backend.add(
+      createServiceFactory({
+        service: coreServices.rootLifecycle,
+        deps: {},
+        factory: async () => ({
+          addStartupHook: () => {},
+          addShutdownHook: () => {},
+        }),
+      }),
+    );
+
+    await expect(backend.start()).rejects.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' }),
-          }),
-        ],
+  it('should throw when providing a plugin metadata service implementation', async () => {
+    const backend = createBackend();
+    backend.add(
+      createServiceFactory({
+        service: coreServices.pluginMetadata,
+        deps: {},
+        factory: () => ({ getId: () => 'test' }),
       }),
-    ).toThrow('The core.pluginMetadata service cannot be overridden');
+    );
+
+    await expect(backend.start()).rejects.toThrow(
+      'The core.pluginMetadata service cannot be overridden',
+    );
   });
 });
diff --git a/packages/backend-defaults/src/CreateBackend.ts b/packages/backend-defaults/src/CreateBackend.ts
index 3db013a290..c07d1cc38a 100644
--- a/packages/backend-defaults/src/CreateBackend.ts
+++ b/packages/backend-defaults/src/CreateBackend.ts
@@ -33,10 +33,6 @@ import {
   urlReaderServiceFactory,
   identityServiceFactory,
 } from '@backstage/backend-app-api';
-import {
-  ServiceFactory,
-  ServiceFactoryOrFunction,
-} from '@backstage/backend-plugin-api';
 
 export const defaultServiceFactories = [
   cacheServiceFactory(),
@@ -59,27 +55,6 @@ export const defaultServiceFactories = [
 /**
  * @public
  */
-export interface CreateBackendOptions {
-  services?: ServiceFactoryOrFunction[];
-}
-
-/**
- * @public
- */
-export function createBackend(options?: CreateBackendOptions): Backend {
-  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);
-
-  // 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 });
+export function createBackend(): Backend {
+  return createSpecializedBackend({ defaultServiceFactories });
 }
diff --git a/packages/backend-defaults/src/index.ts b/packages/backend-defaults/src/index.ts
index 833878744e..d3e36cf0fb 100644
--- a/packages/backend-defaults/src/index.ts
+++ b/packages/backend-defaults/src/index.ts
@@ -25,5 +25,4 @@
 // TODO(Rugvip): Remove this once backend-common is no longer used by backend-app-api
 import '@backstage/backend-common';
 
-export type { CreateBackendOptions } from './CreateBackend';
 export { createBackend } from './CreateBackend';
diff --git a/packages/backend-dev-utils/catalog-info.yaml b/packages/backend-dev-utils/catalog-info.yaml
new file mode 100644
index 0000000000..ecbcb4e0bb
--- /dev/null
+++ b/packages/backend-dev-utils/catalog-info.yaml
@@ -0,0 +1,9 @@
+apiVersion: backstage.io/v1alpha1
+kind: Component
+metadata:
+  name: backstage-backend-dev-utils
+  title: '@backstage/backend-dev-utils'
+spec:
+  lifecycle: experimental
+  type: backstage-node-library
+  owner: maintainers
diff --git a/packages/backend-next/.snyk b/packages/backend-next/.snyk
new file mode 100644
index 0000000000..ea5abd653d
--- /dev/null
+++ b/packages/backend-next/.snyk
@@ -0,0 +1,10 @@
+# Snyk (https://snyk.io) policy file, patches or ignores known vulnerabilities.
+version: v1.22.1
+# ignores vulnerabilities until expiry date; change duration by modifying expiry date
+ignore:
+  SNYK-JS-ISOLATEDVM-3037320:
+    - '*':
+        reason: We do not pass any V8 cache data, and are therefore unaffected by this vulnerability
+        expires: 2033-07-02T16:55:57.077Z
+        created: 2023-07-02T16:55:57.077Z
+patch: {}
diff --git a/packages/backend-next/CHANGELOG.md b/packages/backend-next/CHANGELOG.md
index a5eb6fe466..a7b2fb8b33 100644
--- a/packages/backend-next/CHANGELOG.md
+++ b/packages/backend-next/CHANGELOG.md
@@ -1,5 +1,170 @@
 # example-backend-next
 
+## 0.0.15-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-scaffolder-backend@1.16.6-next.2
+  - @backstage/plugin-permission-backend@0.5.26-next.2
+  - @backstage/plugin-catalog-backend@1.13.0-next.2
+  - @backstage/plugin-badges-backend@0.2.6-next.2
+  - @backstage/plugin-permission-backend-module-allow-all-policy@0.1.0-next.0
+  - @backstage/backend-tasks@0.5.8-next.2
+  - @backstage/backend-defaults@0.2.3-next.2
+  - @backstage/plugin-app-backend@0.3.51-next.2
+  - @backstage/plugin-auth-node@0.3.0-next.2
+  - @backstage/plugin-entity-feedback-backend@0.1.9-next.2
+  - @backstage/plugin-kubernetes-backend@0.11.6-next.2
+  - @backstage/plugin-linguist-backend@0.4.3-next.2
+  - @backstage/plugin-permission-node@0.7.14-next.2
+  - @backstage/plugin-proxy-backend@0.3.3-next.2
+  - @backstage/plugin-search-backend@1.4.3-next.2
+  - @backstage/plugin-search-backend-module-catalog@0.1.7-next.2
+  - @backstage/plugin-search-backend-module-explore@0.1.7-next.2
+  - @backstage/plugin-search-backend-module-techdocs@0.1.7-next.2
+  - @backstage/plugin-techdocs-backend@1.7.0-next.2
+  - @backstage/plugin-devtools-backend@0.1.6-next.2
+  - @backstage/backend-plugin-api@0.6.3-next.2
+  - @backstage/plugin-adr-backend@0.3.9-next.2
+  - @backstage/plugin-azure-devops-backend@0.3.30-next.2
+  - @backstage/plugin-lighthouse-backend@0.2.7-next.2
+  - @backstage/plugin-permission-common@0.7.8-next.1
+  - @backstage/plugin-search-backend-node@1.2.7-next.2
+  - @backstage/plugin-todo-backend@0.2.3-next.2
+  - @backstage/plugin-catalog-backend-module-unprocessed@0.2.3-next.2
+
+## 0.0.15-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-kubernetes-backend@0.11.6-next.1
+  - @backstage/plugin-catalog-backend@1.13.0-next.1
+  - @backstage/plugin-devtools-backend@0.1.6-next.1
+  - @backstage/backend-tasks@0.5.8-next.1
+  - @backstage/plugin-techdocs-backend@1.7.0-next.1
+  - @backstage/plugin-scaffolder-backend@1.16.6-next.1
+  - @backstage/backend-plugin-api@0.6.3-next.1
+  - @backstage/plugin-adr-backend@0.3.9-next.1
+  - @backstage/plugin-app-backend@0.3.51-next.1
+  - @backstage/plugin-auth-node@0.3.0-next.1
+  - @backstage/plugin-azure-devops-backend@0.3.30-next.1
+  - @backstage/plugin-badges-backend@0.2.6-next.1
+  - @backstage/plugin-entity-feedback-backend@0.1.9-next.1
+  - @backstage/plugin-lighthouse-backend@0.2.7-next.1
+  - @backstage/plugin-linguist-backend@0.4.3-next.1
+  - @backstage/plugin-permission-backend@0.5.26-next.1
+  - @backstage/plugin-permission-common@0.7.8-next.0
+  - @backstage/plugin-permission-node@0.7.14-next.1
+  - @backstage/plugin-proxy-backend@0.3.3-next.1
+  - @backstage/plugin-search-backend@1.4.3-next.1
+  - @backstage/plugin-search-backend-module-catalog@0.1.7-next.1
+  - @backstage/plugin-search-backend-module-explore@0.1.7-next.1
+  - @backstage/plugin-search-backend-module-techdocs@0.1.7-next.1
+  - @backstage/plugin-search-backend-node@1.2.7-next.1
+  - @backstage/plugin-todo-backend@0.2.3-next.1
+  - @backstage/backend-defaults@0.2.3-next.1
+  - @backstage/plugin-catalog-backend-module-unprocessed@0.2.3-next.1
+
+## 0.0.15-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-backend@1.12.2-next.0
+  - @backstage/plugin-scaffolder-backend@1.16.3-next.0
+  - @backstage/plugin-auth-node@0.3.0-next.0
+  - @backstage/plugin-linguist-backend@0.4.2-next.0
+  - @backstage/plugin-entity-feedback-backend@0.1.8-next.0
+  - @backstage/backend-tasks@0.5.7-next.0
+  - @backstage/plugin-app-backend@0.3.50-next.0
+  - @backstage/backend-defaults@0.2.2-next.0
+  - @backstage/backend-plugin-api@0.6.2-next.0
+  - @backstage/plugin-adr-backend@0.3.8-next.0
+  - @backstage/plugin-azure-devops-backend@0.3.29-next.0
+  - @backstage/plugin-badges-backend@0.2.5-next.0
+  - @backstage/plugin-catalog-backend-module-unprocessed@0.2.2-next.0
+  - @backstage/plugin-devtools-backend@0.1.5-next.0
+  - @backstage/plugin-kubernetes-backend@0.11.5-next.0
+  - @backstage/plugin-lighthouse-backend@0.2.6-next.0
+  - @backstage/plugin-permission-backend@0.5.25-next.0
+  - @backstage/plugin-permission-common@0.7.7
+  - @backstage/plugin-permission-node@0.7.13-next.0
+  - @backstage/plugin-proxy-backend@0.3.2-next.0
+  - @backstage/plugin-search-backend@1.4.2-next.0
+  - @backstage/plugin-search-backend-module-catalog@0.1.6-next.0
+  - @backstage/plugin-search-backend-module-explore@0.1.6-next.0
+  - @backstage/plugin-search-backend-module-techdocs@0.1.6-next.0
+  - @backstage/plugin-search-backend-node@1.2.6-next.0
+  - @backstage/plugin-techdocs-backend@1.6.7-next.0
+  - @backstage/plugin-todo-backend@0.2.2-next.0
+
+## 0.0.14
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-search-backend-module-techdocs@0.1.4
+  - @backstage/plugin-search-backend-module-catalog@0.1.4
+  - @backstage/plugin-search-backend-module-explore@0.1.4
+  - @backstage/plugin-azure-devops-backend@0.3.27
+  - @backstage/plugin-kubernetes-backend@0.11.3
+  - @backstage/plugin-lighthouse-backend@0.2.4
+  - @backstage/plugin-permission-backend@0.5.23
+  - @backstage/plugin-scaffolder-backend@1.16.0
+  - @backstage/backend-defaults@0.2.0
+  - @backstage/plugin-devtools-backend@0.1.3
+  - @backstage/plugin-techdocs-backend@1.6.5
+  - @backstage/plugin-catalog-backend@1.12.0
+  - @backstage/plugin-badges-backend@0.2.3
+  - @backstage/plugin-search-backend@1.4.0
+  - @backstage/plugin-proxy-backend@0.3.0
+  - @backstage/plugin-todo-backend@0.2.0
+  - @backstage/plugin-app-backend@0.3.48
+  - @backstage/backend-plugin-api@0.6.0
+  - @backstage/plugin-catalog-backend-module-unprocessed@0.2.0
+  - @backstage/plugin-entity-feedback-backend@0.1.6
+  - @backstage/plugin-search-backend-node@1.2.4
+  - @backstage/plugin-linguist-backend@0.4.0
+  - @backstage/plugin-auth-node@0.2.17
+  - @backstage/backend-tasks@0.5.5
+  - @backstage/plugin-adr-backend@0.3.6
+  - @backstage/plugin-permission-node@0.7.11
+  - @backstage/plugin-permission-common@0.7.7
+
+## 0.0.14-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-search-backend-module-techdocs@0.1.4-next.2
+  - @backstage/plugin-search-backend-module-catalog@0.1.4-next.2
+  - @backstage/plugin-search-backend-module-explore@0.1.4-next.2
+  - @backstage/plugin-scaffolder-backend@1.15.2-next.2
+  - @backstage/plugin-catalog-backend@1.12.0-next.2
+  - @backstage/backend-plugin-api@0.6.0-next.2
+  - @backstage/plugin-proxy-backend@0.3.0-next.2
+  - @backstage/backend-tasks@0.5.5-next.2
+  - @backstage/plugin-app-backend@0.3.48-next.2
+  - @backstage/plugin-linguist-backend@0.4.0-next.2
+  - @backstage/plugin-techdocs-backend@1.6.5-next.2
+  - @backstage/backend-defaults@0.2.0-next.2
+  - @backstage/plugin-adr-backend@0.3.6-next.2
+  - @backstage/plugin-azure-devops-backend@0.3.27-next.2
+  - @backstage/plugin-badges-backend@0.2.3-next.2
+  - @backstage/plugin-catalog-backend-module-unprocessed@0.2.0-next.2
+  - @backstage/plugin-devtools-backend@0.1.3-next.2
+  - @backstage/plugin-entity-feedback-backend@0.1.6-next.2
+  - @backstage/plugin-kubernetes-backend@0.11.3-next.2
+  - @backstage/plugin-lighthouse-backend@0.2.4-next.2
+  - @backstage/plugin-permission-backend@0.5.23-next.2
+  - @backstage/plugin-permission-node@0.7.11-next.2
+  - @backstage/plugin-search-backend@1.4.0-next.2
+  - @backstage/plugin-search-backend-node@1.2.4-next.2
+  - @backstage/plugin-todo-backend@0.2.0-next.2
+  - @backstage/plugin-auth-node@0.2.17-next.2
+
 ## 0.0.14-next.1
 
 ### Patch Changes
diff --git a/packages/backend-next/catalog-info.yaml b/packages/backend-next/catalog-info.yaml
new file mode 100644
index 0000000000..d297365e4b
--- /dev/null
+++ b/packages/backend-next/catalog-info.yaml
@@ -0,0 +1,9 @@
+apiVersion: backstage.io/v1alpha1
+kind: Component
+metadata:
+  name: example-backend-next
+  title: example-backend-next
+spec:
+  lifecycle: experimental
+  type: backstage-backend
+  owner: maintainers
diff --git a/packages/backend-next/package.json b/packages/backend-next/package.json
index af4f483db0..9b726fb307 100644
--- a/packages/backend-next/package.json
+++ b/packages/backend-next/package.json
@@ -1,6 +1,6 @@
 {
   "name": "example-backend-next",
-  "version": "0.0.14-next.1",
+  "version": "0.0.15-next.2",
   "main": "dist/index.cjs.js",
   "types": "src/index.ts",
   "license": "Apache-2.0",
@@ -26,6 +26,7 @@
   },
   "dependencies": {
     "@backstage/backend-defaults": "workspace:^",
+    "@backstage/backend-plugin-api": "workspace:^",
     "@backstage/backend-tasks": "workspace:^",
     "@backstage/plugin-adr-backend": "workspace:^",
     "@backstage/plugin-app-backend": "workspace:^",
@@ -40,6 +41,7 @@
     "@backstage/plugin-lighthouse-backend": "workspace:^",
     "@backstage/plugin-linguist-backend": "workspace:^",
     "@backstage/plugin-permission-backend": "workspace:^",
+    "@backstage/plugin-permission-backend-module-allow-all-policy": "workspace:^",
     "@backstage/plugin-permission-common": "workspace:^",
     "@backstage/plugin-permission-node": "workspace:^",
     "@backstage/plugin-proxy-backend": "workspace:^",
diff --git a/packages/backend-next/src/index.ts b/packages/backend-next/src/index.ts
index bbb7290c73..cf7734c089 100644
--- a/packages/backend-next/src/index.ts
+++ b/packages/backend-next/src/index.ts
@@ -15,97 +15,31 @@
  */
 
 import { createBackend } from '@backstage/backend-defaults';
-import { appPlugin } from '@backstage/plugin-app-backend/alpha';
-import { catalogPlugin } from '@backstage/plugin-catalog-backend/alpha';
-import { kubernetesPlugin } from '@backstage/plugin-kubernetes-backend/alpha';
-import {
-  permissionModuleAllowAllPolicy,
-  permissionPlugin,
-} from '@backstage/plugin-permission-backend/alpha';
-import { scaffolderPlugin } from '@backstage/plugin-scaffolder-backend/alpha';
-import { catalogModuleTemplateKind } from '@backstage/plugin-scaffolder-backend/alpha';
-import { searchModuleCatalogCollator } from '@backstage/plugin-search-backend-module-catalog/alpha';
-import { searchModuleExploreCollator } from '@backstage/plugin-search-backend-module-explore/alpha';
-import { searchModuleTechDocsCollator } from '@backstage/plugin-search-backend-module-techdocs/alpha';
-import { searchPlugin } from '@backstage/plugin-search-backend/alpha';
-import { techdocsPlugin } from '@backstage/plugin-techdocs-backend/alpha';
-import { todoPlugin } from '@backstage/plugin-todo-backend';
-import { entityFeedbackPlugin } from '@backstage/plugin-entity-feedback-backend';
-import { catalogModuleUnprocessedEntities } from '@backstage/plugin-catalog-backend-module-unprocessed';
-import { badgesPlugin } from '@backstage/plugin-badges-backend';
-import { azureDevOpsPlugin } from '@backstage/plugin-azure-devops-backend';
-import { linguistPlugin } from '@backstage/plugin-linguist-backend';
-import { devtoolsPlugin } from '@backstage/plugin-devtools-backend';
-import { TaskScheduleDefinition } from '@backstage/backend-tasks';
-import { adrPlugin } from '@backstage/plugin-adr-backend';
-import { lighthousePlugin } from '@backstage/plugin-lighthouse-backend';
-import { proxyPlugin } from '@backstage/plugin-proxy-backend';
 
 const backend = createBackend();
 
-backend.add(appPlugin());
-
-// Badges
-backend.add(badgesPlugin());
-
-// Azure DevOps
-backend.add(azureDevOpsPlugin());
-
-// DevTools
-backend.add(devtoolsPlugin());
-
-// Entity Feedback
-backend.add(entityFeedbackPlugin());
-
-// Linguist
-const linguistSchedule: TaskScheduleDefinition = {
-  frequency: { minutes: 2 },
-  timeout: { minutes: 15 },
-  initialDelay: { seconds: 15 },
-};
-
+backend.add(import('@backstage/plugin-adr-backend'));
+backend.add(import('@backstage/plugin-app-backend/alpha'));
+backend.add(import('@backstage/plugin-azure-devops-backend'));
+backend.add(import('@backstage/plugin-badges-backend'));
+backend.add(import('@backstage/plugin-catalog-backend-module-unprocessed'));
+backend.add(import('@backstage/plugin-catalog-backend/alpha'));
+backend.add(import('@backstage/plugin-devtools-backend'));
+backend.add(import('@backstage/plugin-entity-feedback-backend'));
+backend.add(import('@backstage/plugin-kubernetes-backend/alpha'));
+backend.add(import('@backstage/plugin-lighthouse-backend'));
+backend.add(import('@backstage/plugin-linguist-backend'));
 backend.add(
-  linguistPlugin({
-    schedule: linguistSchedule,
-    age: { days: 30 },
-    batchSize: 2,
-    useSourceLocation: false,
-  }),
+  import('@backstage/plugin-permission-backend-module-allow-all-policy'),
 );
-
-// Todo
-backend.add(todoPlugin());
-
-backend.add(adrPlugin());
-
-// Techdocs
-backend.add(techdocsPlugin());
-
-// Catalog
-backend.add(catalogPlugin());
-backend.add(catalogModuleTemplateKind());
-
-backend.add(scaffolderPlugin());
-
-// Search
-backend.add(searchPlugin());
-backend.add(searchModuleCatalogCollator());
-backend.add(searchModuleTechDocsCollator());
-backend.add(searchModuleExploreCollator());
-
-// Kubernetes
-backend.add(kubernetesPlugin());
-
-// Lighthouse
-backend.add(lighthousePlugin());
-
-// Proxy
-backend.add(proxyPlugin());
-
-// Permissions
-backend.add(permissionPlugin());
-backend.add(permissionModuleAllowAllPolicy());
-
-backend.add(catalogModuleUnprocessedEntities());
+backend.add(import('@backstage/plugin-permission-backend/alpha'));
+backend.add(import('@backstage/plugin-proxy-backend'));
+backend.add(import('@backstage/plugin-scaffolder-backend/alpha'));
+backend.add(import('@backstage/plugin-search-backend-module-catalog/alpha'));
+backend.add(import('@backstage/plugin-search-backend-module-explore/alpha'));
+backend.add(import('@backstage/plugin-search-backend-module-techdocs/alpha'));
+backend.add(import('@backstage/plugin-search-backend/alpha'));
+backend.add(import('@backstage/plugin-techdocs-backend/alpha'));
+backend.add(import('@backstage/plugin-todo-backend'));
 
 backend.start();
diff --git a/packages/backend-openapi-utils/CHANGELOG.md b/packages/backend-openapi-utils/CHANGELOG.md
index 3eb95afe95..fc3e52fa92 100644
--- a/packages/backend-openapi-utils/CHANGELOG.md
+++ b/packages/backend-openapi-utils/CHANGELOG.md
@@ -1,5 +1,14 @@
 # @backstage/backend-openapi-utils
 
+## 0.0.3
+
+### Patch Changes
+
+- ebeb77586975: Add a new `createRouter` method for generating an `express` router that validates against your spec. Also fixes a bug with the query parameters type resolution.
+- 12a8c94eda8d: Add package repository and homepage metadata
+- Updated dependencies
+  - @backstage/errors@1.2.1
+
 ## 0.0.3-next.1
 
 ### Patch Changes
diff --git a/packages/backend-openapi-utils/catalog-info.yaml b/packages/backend-openapi-utils/catalog-info.yaml
new file mode 100644
index 0000000000..ab0a4be883
--- /dev/null
+++ b/packages/backend-openapi-utils/catalog-info.yaml
@@ -0,0 +1,10 @@
+apiVersion: backstage.io/v1alpha1
+kind: Component
+metadata:
+  name: backstage-backend-openapi-utils
+  title: '@backstage/backend-openapi-utils'
+  description: OpenAPI typescript support.
+spec:
+  lifecycle: experimental
+  type: backstage-node-library
+  owner: maintainers
diff --git a/packages/backend-openapi-utils/package.json b/packages/backend-openapi-utils/package.json
index 9123d6dd77..102d8c36d6 100644
--- a/packages/backend-openapi-utils/package.json
+++ b/packages/backend-openapi-utils/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@backstage/backend-openapi-utils",
   "description": "OpenAPI typescript support.",
-  "version": "0.0.3-next.1",
+  "version": "0.0.3",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
diff --git a/packages/backend-plugin-api/CHANGELOG.md b/packages/backend-plugin-api/CHANGELOG.md
index 510797672c..678f05a787 100644
--- a/packages/backend-plugin-api/CHANGELOG.md
+++ b/packages/backend-plugin-api/CHANGELOG.md
@@ -1,5 +1,80 @@
 # @backstage/backend-plugin-api
 
+## 0.6.3-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config@1.1.0-next.1
+  - @backstage/backend-tasks@0.5.8-next.2
+  - @backstage/plugin-auth-node@0.3.0-next.2
+  - @backstage/plugin-permission-common@0.7.8-next.1
+  - @backstage/types@1.1.0
+
+## 0.6.3-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config@1.1.0-next.0
+  - @backstage/backend-tasks@0.5.8-next.1
+  - @backstage/plugin-auth-node@0.3.0-next.1
+  - @backstage/plugin-permission-common@0.7.8-next.0
+  - @backstage/types@1.1.0
+
+## 0.6.2-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-auth-node@0.3.0-next.0
+  - @backstage/backend-tasks@0.5.7-next.0
+  - @backstage/config@1.0.8
+  - @backstage/types@1.1.0
+  - @backstage/plugin-permission-common@0.7.7
+
+## 0.6.0
+
+### Minor Changes
+
+- c49785f00cab: **BREAKING**: It is no longer possible to declare options as being required with `createServiceFactory`.
+- 629cbd194a87: **BREAKING**: Renamed `coreServices.config` to `coreServices.rootConfig`.
+- 51987dbdaf87: **BREAKING**: Removed the ability to define options for plugins and modules. Existing options should be migrated to instead use either static configuration or extension points.
+- d008aefef808: **BREAKING**: Removing shared environments concept from the new experimental backend system.
+
+### Patch Changes
+
+- c7aa4ff1793c: Allow modules to register extension points.
+- cc9256a33bcc: Added new experimental `featureDiscoveryServiceRef`, available as an `/alpha` export.
+- a6d7983f349c: **BREAKING**: Removed the `services` option from `createBackend`. Service factories are now `BackendFeature`s and should be installed with `backend.add(...)` instead. The following should be migrated:
+
+  ```ts
+  const backend = createBackend({ services: [myCustomServiceFactory] });
+  ```
+
+  To instead pass the service factory via `backend.add(...)`:
+
+  ```ts
+  const backend = createBackend();
+  backend.add(customRootLoggerServiceFactory);
+  ```
+
+- Updated dependencies
+  - @backstage/plugin-auth-node@0.2.17
+  - @backstage/backend-tasks@0.5.5
+  - @backstage/config@1.0.8
+  - @backstage/types@1.1.0
+  - @backstage/plugin-permission-common@0.7.7
+
+## 0.6.0-next.2
+
+### Patch Changes
+
+- cc9256a33bcc: Added new experimental `featureDiscoveryServiceRef`, available as an `/alpha` export.
+- Updated dependencies
+  - @backstage/backend-tasks@0.5.5-next.2
+  - @backstage/plugin-auth-node@0.2.17-next.2
+
 ## 0.6.0-next.1
 
 ### Minor Changes
diff --git a/packages/backend-plugin-api/alpha-api-report.md b/packages/backend-plugin-api/alpha-api-report.md
new file mode 100644
index 0000000000..81b378a671
--- /dev/null
+++ b/packages/backend-plugin-api/alpha-api-report.md
@@ -0,0 +1,24 @@
+## API Report File for "@backstage/backend-plugin-api"
+
+> Do not edit this file. It is a report generated by [API Extractor](https://api-extractor.com/).
+
+```ts
+import { BackendFeature } from '@backstage/backend-plugin-api';
+import { ServiceRef } from '@backstage/backend-plugin-api';
+
+// @alpha (undocumented)
+export interface FeatureDiscoveryService {
+  // (undocumented)
+  getBackendFeatures(): Promise<{
+    features: Array<BackendFeature>;
+  }>;
+}
+
+// @alpha
+export const featureDiscoveryServiceRef: ServiceRef<
+  FeatureDiscoveryService,
+  'root'
+>;
+
+// (No @packageDocumentation comment for this package)
+```
diff --git a/packages/backend-plugin-api/api-report.md b/packages/backend-plugin-api/api-report.md
index a1ae6284c6..7807dd96c6 100644
--- a/packages/backend-plugin-api/api-report.md
+++ b/packages/backend-plugin-api/api-report.md
@@ -31,6 +31,11 @@ export interface BackendModuleConfig {
 
 // @public
 export interface BackendModuleRegistrationPoints {
+  // (undocumented)
+  registerExtensionPoint<TExtensionPoint>(
+    ref: ExtensionPoint<TExtensionPoint>,
+    impl: TExtensionPoint,
+  ): void;
   // (undocumented)
   registerInit<
     Deps extends {
@@ -114,14 +119,14 @@ export namespace coreServices {
 }
 
 // @public
-export function createBackendModule<TOptions extends [options?: object] = []>(
-  config: BackendModuleConfig | ((...params: TOptions) => BackendModuleConfig),
-): (...params: TOptions) => BackendFeature;
+export function createBackendModule(
+  config: BackendModuleConfig,
+): () => BackendFeature;
 
 // @public
-export function createBackendPlugin<TOptions extends [options?: object] = []>(
-  config: BackendPluginConfig | ((...params: TOptions) => BackendPluginConfig),
-): (...params: TOptions) => BackendFeature;
+export function createBackendPlugin(
+  config: BackendPluginConfig,
+): () => BackendFeature;
 
 // @public
 export function createExtensionPoint<T>(
@@ -133,7 +138,7 @@ export function createServiceFactory<
   TService,
   TImpl extends TService,
   TDeps extends {
-    [name in string]: ServiceRef<unknown>;
+    [name in string]: ServiceRef<unknown, 'root'>;
   },
   TOpts extends object | undefined = undefined,
 >(
@@ -145,25 +150,13 @@ export function createServiceFactory<
   TService,
   TImpl extends TService,
   TDeps extends {
-    [name in string]: ServiceRef<unknown>;
+    [name in string]: ServiceRef<unknown, 'root'>;
   },
   TOpts extends object | undefined = undefined,
 >(
   config: (options?: TOpts) => RootServiceFactoryConfig<TService, TImpl, TDeps>,
 ): (options?: TOpts) => ServiceFactory<TService, 'root'>;
 
-// @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, 'root'>;
-
 // @public
 export function createServiceFactory<
   TService,
@@ -192,23 +185,6 @@ export function createServiceFactory<
   ) => PluginServiceFactoryConfig<TService, TContext, TImpl, TDeps>,
 ): (options?: TOpts) => ServiceFactory<TService, 'plugin'>;
 
-// @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, 'plugin'>;
-
 // @public
 export function createServiceRef<TService>(
   config: ServiceRefConfig<TService, 'plugin'>,
@@ -433,9 +409,7 @@ export type SearchResponseFile = {
 export interface ServiceFactory<
   TService = unknown,
   TScope extends 'plugin' | 'root' = 'plugin' | 'root',
-> {
-  // (undocumented)
-  $$type: '@backstage/ServiceFactory';
+> extends BackendFeature {
   // (undocumented)
   service: ServiceRef<TService, TScope>;
 }
diff --git a/packages/backend-plugin-api/catalog-info.yaml b/packages/backend-plugin-api/catalog-info.yaml
new file mode 100644
index 0000000000..35ca9850fa
--- /dev/null
+++ b/packages/backend-plugin-api/catalog-info.yaml
@@ -0,0 +1,10 @@
+apiVersion: backstage.io/v1alpha1
+kind: Component
+metadata:
+  name: backstage-backend-plugin-api
+  title: '@backstage/backend-plugin-api'
+  description: Core API used by Backstage backend plugins
+spec:
+  lifecycle: experimental
+  type: backstage-node-library
+  owner: maintainers
diff --git a/packages/backend-plugin-api/package.json b/packages/backend-plugin-api/package.json
index 5d0bfe08fb..8e160f9311 100644
--- a/packages/backend-plugin-api/package.json
+++ b/packages/backend-plugin-api/package.json
@@ -1,17 +1,30 @@
 {
   "name": "@backstage/backend-plugin-api",
   "description": "Core API used by Backstage backend plugins",
-  "version": "0.6.0-next.1",
+  "version": "0.6.3-next.2",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "publishConfig": {
-    "access": "public",
-    "main": "dist/index.cjs.js",
-    "types": "dist/index.d.ts"
+    "access": "public"
   },
   "backstage": {
     "role": "node-library"
   },
+  "exports": {
+    ".": "./src/index.ts",
+    "./alpha": "./src/alpha.ts",
+    "./package.json": "./package.json"
+  },
+  "typesVersions": {
+    "*": {
+      "alpha": [
+        "src/alpha.ts"
+      ],
+      "package.json": [
+        "package.json"
+      ]
+    }
+  },
   "homepage": "https://backstage.io",
   "repository": {
     "type": "git",
diff --git a/packages/backend-plugin-api/src/alpha.ts b/packages/backend-plugin-api/src/alpha.ts
new file mode 100644
index 0000000000..baee739f49
--- /dev/null
+++ b/packages/backend-plugin-api/src/alpha.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 {
+  BackendFeature,
+  createServiceRef,
+} from '@backstage/backend-plugin-api';
+
+/** @alpha */
+export interface FeatureDiscoveryService {
+  getBackendFeatures(): Promise<{ features: Array<BackendFeature> }>;
+}
+
+/**
+ * An optional service that can be used to dynamically load in additional BackendFeatures at runtime.
+ * @alpha
+ */
+export const featureDiscoveryServiceRef =
+  createServiceRef<FeatureDiscoveryService>({
+    id: 'core.featureDiscovery',
+    scope: 'root',
+  });
diff --git a/packages/backend-plugin-api/src/index.ts b/packages/backend-plugin-api/src/index.ts
index 452fa046f9..8e0b23d20b 100644
--- a/packages/backend-plugin-api/src/index.ts
+++ b/packages/backend-plugin-api/src/index.ts
@@ -21,4 +21,5 @@
  */
 
 export * from './services';
+export type { BackendFeature } from './types';
 export * from './wiring';
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 d3e9b9dd4e..adf097761b 100644
--- a/packages/backend-plugin-api/src/services/system/types.test.ts
+++ b/packages/backend-plugin-api/src/services/system/types.test.ts
@@ -26,7 +26,7 @@ interface TestOptions {
 function unused(..._any: any[]) {}
 
 describe('createServiceFactory', () => {
-  it('should create a sync factory with no options', () => {
+  it('should create a sync factory', () => {
     const metaFactory = createServiceFactory({
       service: ref,
       deps: {},
@@ -51,7 +51,7 @@ describe('createServiceFactory', () => {
     metaFactory();
   });
 
-  it('should create a sync root factory with no options', () => {
+  it('should create a sync root factory', () => {
     const metaFactory = createServiceFactory({
       service: rootDep,
       deps: {},
@@ -75,7 +75,7 @@ describe('createServiceFactory', () => {
     metaFactory();
   });
 
-  it('should create a factory with no options', () => {
+  it('should create a factory', () => {
     const metaFactory = createServiceFactory({
       service: ref,
       deps: {},
@@ -100,7 +100,7 @@ describe('createServiceFactory', () => {
     metaFactory();
   });
 
-  it('should create a factory with optional options', () => {
+  it('should create a factory with options', () => {
     const metaFactory = createServiceFactory((_opts?: { x: number }) => ({
       service: ref,
       deps: {},
@@ -124,7 +124,8 @@ describe('createServiceFactory', () => {
     metaFactory();
   });
 
-  it('should create a factory with required options', () => {
+  it('should not be allowed to require options', () => {
+    // @ts-expect-error
     const metaFactory = createServiceFactory((_opts: { x: number }) => ({
       service: ref,
       deps: {},
@@ -134,23 +135,9 @@ describe('createServiceFactory', () => {
       },
     }));
     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 a factory with optional options as interface', () => {
+  it('should create a factory with options as interface', () => {
     const metaFactory = createServiceFactory((_opts?: TestOptions) => ({
       service: ref,
       deps: {},
@@ -174,38 +161,11 @@ describe('createServiceFactory', () => {
     metaFactory();
   });
 
-  it('should create a factory with required options as interface', () => {
-    const metaFactory = createServiceFactory((_opts: TestOptions) => ({
-      service: ref,
-      deps: {},
-      async createRootContext() {},
-      async factory() {
-        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 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;
@@ -226,12 +186,11 @@ describe('createServiceFactory', () => {
     metaFactory();
   });
 
-  it('should create root scoped factory with dependencies and optional options', () => {
+  it('should create root scoped factory with dependencies and options', () => {
     const metaFactory = createServiceFactory((_options?: TestOptions) => ({
       service: createServiceRef({ id: 'foo', scope: 'root' }),
       deps: {
         root: rootDep,
-        plugin: pluginDep,
       },
       async factory({ root }) {
         const root1: number = root;
@@ -325,49 +284,7 @@ describe('createServiceFactory', () => {
     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', () => {
+  it('should create factory with options and dependencies', () => {
     const metaFactory = createServiceFactory((_opts?: TestOptions) => ({
       service: ref,
       deps: {
diff --git a/packages/backend-plugin-api/src/services/system/types.ts b/packages/backend-plugin-api/src/services/system/types.ts
index 190ef7c13e..329502369e 100644
--- a/packages/backend-plugin-api/src/services/system/types.ts
+++ b/packages/backend-plugin-api/src/services/system/types.ts
@@ -14,6 +14,8 @@
  * limitations under the License.
  */
 
+import { BackendFeature } from '../../types';
+
 /**
  * TODO
  *
@@ -51,9 +53,7 @@ export type ServiceRef<
 export interface ServiceFactory<
   TService = unknown,
   TScope extends 'plugin' | 'root' = 'plugin' | 'root',
-> {
-  $$type: '@backstage/ServiceFactory';
-
+> extends BackendFeature {
   service: ServiceRef<TService, TScope>;
 }
 
@@ -172,7 +172,7 @@ export interface PluginServiceFactoryConfig<
 export function createServiceFactory<
   TService,
   TImpl extends TService,
-  TDeps extends { [name in string]: ServiceRef<unknown> },
+  TDeps extends { [name in string]: ServiceRef<unknown, 'root'> },
   TOpts extends object | undefined = undefined,
 >(
   config: RootServiceFactoryConfig<TService, TImpl, TDeps>,
@@ -186,25 +186,11 @@ export function createServiceFactory<
 export function createServiceFactory<
   TService,
   TImpl extends TService,
-  TDeps extends { [name in string]: ServiceRef<unknown> },
+  TDeps extends { [name in string]: ServiceRef<unknown, 'root'> },
   TOpts extends object | undefined = undefined,
 >(
   config: (options?: TOpts) => RootServiceFactoryConfig<TService, TImpl, TDeps>,
 ): (options?: TOpts) => ServiceFactory<TService, 'root'>;
-/**
- * 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, 'root'>;
 /**
  * Creates a plugin scoped service factory without options.
  *
@@ -237,25 +223,6 @@ export function createServiceFactory<
     options?: TOpts,
   ) => PluginServiceFactoryConfig<TService, TContext, TImpl, TDeps>,
 ): (options?: TOpts) => ServiceFactory<TService, 'plugin'>;
-/**
- * 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, 'plugin'>;
 export function createServiceFactory<
   TService,
   TImpl extends TService,
@@ -274,14 +241,14 @@ export function createServiceFactory<
     | (() => PluginServiceFactoryConfig<TService, TContext, TImpl, TDeps>),
 ): (options: TOpts) => ServiceFactory {
   const configCallback = typeof config === 'function' ? config : () => config;
-  return (
+  const factory = (
     options: TOpts,
   ): InternalServiceFactory<TService, 'plugin' | 'root'> => {
     const anyConf = configCallback(options);
     if (anyConf.service.scope === 'root') {
       const c = anyConf as RootServiceFactoryConfig<TService, TImpl, TDeps>;
       return {
-        $$type: '@backstage/ServiceFactory',
+        $$type: '@backstage/BackendFeature',
         version: 'v1',
         service: c.service,
         deps: c.deps,
@@ -295,7 +262,7 @@ export function createServiceFactory<
       TDeps
     >;
     return {
-      $$type: '@backstage/ServiceFactory',
+      $$type: '@backstage/BackendFeature',
       version: 'v1',
       service: c.service,
       ...('createRootContext' in c
@@ -308,4 +275,8 @@ export function createServiceFactory<
       factory: async (deps: TDeps, ctx: TContext) => c.factory(deps, ctx),
     };
   };
+
+  factory.$$type = '@backstage/BackendFeatureFactory';
+
+  return factory;
 }
diff --git a/packages/backend-plugin-api/src/types.ts b/packages/backend-plugin-api/src/types.ts
new file mode 100644
index 0000000000..59f1106fab
--- /dev/null
+++ b/packages/backend-plugin-api/src/types.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.
+ */
+
+/** @internal */
+export interface BackendFeatureFactory<
+  TOptions extends [options?: object] = [],
+> {
+  (...options: TOptions): BackendFeature;
+  $$type: '@backstage/BackendFeatureFactory';
+}
+
+/** @public */
+export interface BackendFeature {
+  // NOTE: This type is opaque in order to simplify future API evolution.
+  $$type: '@backstage/BackendFeature';
+}
diff --git a/packages/backend-plugin-api/src/wiring/factories.test.ts b/packages/backend-plugin-api/src/wiring/factories.test.ts
index ae199d84e4..1fd05a1605 100644
--- a/packages/backend-plugin-api/src/wiring/factories.test.ts
+++ b/packages/backend-plugin-api/src/wiring/factories.test.ts
@@ -33,22 +33,19 @@ describe('createExtensionPoint', () => {
 
 describe('createBackendPlugin', () => {
   it('should create a BackendPlugin', () => {
-    const plugin = createBackendPlugin((_options: { a: string }) => ({
+    const plugin = createBackendPlugin({
       pluginId: 'x',
       register(r) {
         r.registerInit({ deps: {}, async init() {} });
       },
-    }));
+    });
     expect(plugin).toBeDefined();
-    expect(plugin({ a: 'a' })).toBeDefined();
-    expect(plugin({ a: 'a' })).toEqual({
+    expect(plugin()).toEqual({
       $$type: '@backstage/BackendFeature',
       version: 'v1',
       getRegistrations: expect.any(Function),
     });
-    expect(
-      (plugin({ a: 'a' }) as InternalBackendFeature).getRegistrations(),
-    ).toEqual([
+    expect((plugin() as InternalBackendFeature).getRegistrations()).toEqual([
       {
         type: 'plugin',
         pluginId: 'x',
@@ -60,95 +57,32 @@ describe('createBackendPlugin', () => {
       },
     ]);
     // @ts-expect-error
-    expect(plugin()).toBeDefined();
-    // @ts-expect-error
-    expect(plugin({ b: 'b' })).toBeDefined();
-  });
-
-  it('should create plugins with optional options', () => {
-    const plugin = createBackendPlugin((_options?: { a: string }) => ({
-      pluginId: 'x',
-      register() {},
-    }));
-    expect(plugin).toBeDefined();
     expect(plugin({ a: 'a' })).toBeDefined();
-    expect(plugin()).toBeDefined();
-    // @ts-expect-error
-    expect(plugin({ b: 'b' })).toBeDefined();
-  });
-
-  it('should create plugins without options', () => {
-    const plugin = createBackendPlugin({
-      pluginId: 'x',
-      register() {},
-    });
-    expect(plugin).toBeDefined();
-    // @ts-expect-error
-    expect(plugin({ a: 'a' })).toBeDefined();
-    // @ts-expect-error
-    expect(plugin({})).toBeDefined();
-  });
-
-  it('should create a BackendPlugin with options as interface', () => {
-    interface TestOptions {
-      a: string;
-    }
-    const plugin = createBackendPlugin((_options: TestOptions) => ({
-      pluginId: 'x',
-      register() {},
-    }));
-    expect(plugin).toBeDefined();
-    expect(plugin({ a: 'a' })).toBeDefined();
-    expect(plugin({ a: 'a' })).toEqual({
-      $$type: '@backstage/BackendFeature',
-      version: 'v1',
-      getRegistrations: expect.any(Function),
-    });
-    // @ts-expect-error
-    expect(plugin()).toBeDefined();
-    // @ts-expect-error
-    expect(plugin({ b: 'b' })).toBeDefined();
-  });
-
-  it('should create plugins with optional options as interface', () => {
-    interface TestOptions {
-      a: string;
-    }
-    const plugin = createBackendPlugin((_options?: TestOptions) => ({
-      pluginId: 'x',
-      register() {},
-    }));
-    expect(plugin).toBeDefined();
-    expect(plugin({ a: 'a' })).toBeDefined();
-    expect(plugin()).toBeDefined();
-    // @ts-expect-error
-    expect(plugin({ b: 'b' })).toBeDefined();
   });
 });
 
 describe('createBackendModule', () => {
   it('should create a BackendModule', () => {
-    const mod = createBackendModule((_options: { a: string }) => ({
+    const mod = createBackendModule({
       pluginId: 'x',
       moduleId: 'y',
       register(r) {
         r.registerInit({ deps: {}, async init() {} });
       },
-    }));
+    });
     expect(mod).toBeDefined();
-    expect(mod({ a: 'a' })).toBeDefined();
-    expect(mod({ a: 'a' })).toEqual({
+    expect(mod()).toBeDefined();
+    expect(mod()).toEqual({
       $$type: '@backstage/BackendFeature',
       version: 'v1',
       getRegistrations: expect.any(Function),
     });
-    expect(
-      (mod({ a: 'a' }) as InternalBackendFeature).getRegistrations(),
-    ).toEqual([
+    expect((mod() as InternalBackendFeature).getRegistrations()).toEqual([
       {
         type: 'module',
         pluginId: 'x',
         moduleId: 'y',
+        extensionPoints: [],
         init: {
           deps: expect.any(Object),
           func: expect.any(Function),
@@ -156,72 +90,6 @@ describe('createBackendModule', () => {
       },
     ]);
     // @ts-expect-error
-    expect(mod()).toBeDefined();
-    // @ts-expect-error
-    expect(mod({ b: 'b' })).toBeDefined();
-  });
-
-  it('should create modules with optional options', () => {
-    const mod = createBackendModule((_options?: { a: string }) => ({
-      pluginId: 'x',
-      moduleId: 'y',
-      register() {},
-    }));
-    expect(mod).toBeDefined();
     expect(mod({ a: 'a' })).toBeDefined();
-    expect(mod()).toBeDefined();
-    // @ts-expect-error
-    expect(mod({ b: 'b' })).toBeDefined();
-  });
-
-  it('should create modules without options', () => {
-    const mod = createBackendModule({
-      pluginId: 'x',
-      moduleId: 'y',
-      register() {},
-    });
-    expect(mod).toBeDefined();
-    // @ts-expect-error
-    expect(mod({ a: 'a' })).toBeDefined();
-    // @ts-expect-error
-    expect(mod({})).toBeDefined();
-  });
-
-  it('should create a BackendModule as interface', () => {
-    interface TestOptions {
-      a: string;
-    }
-    const mod = createBackendModule((_options: TestOptions) => ({
-      pluginId: 'x',
-      moduleId: 'y',
-      register() {},
-    }));
-    expect(mod).toBeDefined();
-    expect(mod({ a: 'a' })).toBeDefined();
-    expect(mod({ a: 'a' })).toEqual({
-      $$type: '@backstage/BackendFeature',
-      version: 'v1',
-      getRegistrations: expect.any(Function),
-    });
-    // @ts-expect-error
-    expect(mod()).toBeDefined();
-    // @ts-expect-error
-    expect(mod({ b: 'b' })).toBeDefined();
-  });
-
-  it('should create modules with optional options as interface', () => {
-    interface TestOptions {
-      a: string;
-    }
-    const mod = createBackendModule((_options?: TestOptions) => ({
-      pluginId: 'x',
-      moduleId: 'y',
-      register() {},
-    }));
-    expect(mod).toBeDefined();
-    expect(mod({ a: 'a' })).toBeDefined();
-    expect(mod()).toBeDefined();
-    // @ts-expect-error
-    expect(mod({ b: 'b' })).toBeDefined();
   });
 });
diff --git a/packages/backend-plugin-api/src/wiring/factories.ts b/packages/backend-plugin-api/src/wiring/factories.ts
index 928c933af0..9fa0f87bab 100644
--- a/packages/backend-plugin-api/src/wiring/factories.ts
+++ b/packages/backend-plugin-api/src/wiring/factories.ts
@@ -14,12 +14,11 @@
  * limitations under the License.
  */
 
+import { BackendFeature, BackendFeatureFactory } from '../types';
 import {
   BackendModuleRegistrationPoints,
   BackendPluginRegistrationPoints,
-  BackendFeature,
   ExtensionPoint,
-  InternalBackendFeature,
   InternalBackendModuleRegistration,
   InternalBackendPluginRegistration,
 } from './types';
@@ -85,13 +84,10 @@ export interface BackendPluginConfig {
  * @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 {
-  const configCallback = typeof config === 'function' ? config : () => config;
-  return (...options: TOptions): InternalBackendFeature => {
-    const c = configCallback(...options);
-
+export function createBackendPlugin(
+  config: BackendPluginConfig,
+): () => BackendFeature {
+  const factory: BackendFeatureFactory = () => {
     let registrations: InternalBackendPluginRegistration[];
 
     return {
@@ -106,7 +102,7 @@ export function createBackendPlugin<TOptions extends [options?: object] = []>(
         let init: InternalBackendPluginRegistration['init'] | undefined =
           undefined;
 
-        c.register({
+        config.register({
           registerExtensionPoint(ext, impl) {
             if (init) {
               throw new Error(
@@ -128,14 +124,14 @@ export function createBackendPlugin<TOptions extends [options?: object] = []>(
 
         if (!init) {
           throw new Error(
-            `registerInit was not called by register in ${c.pluginId}`,
+            `registerInit was not called by register in ${config.pluginId}`,
           );
         }
 
         registrations = [
           {
             type: 'plugin',
-            pluginId: c.pluginId,
+            pluginId: config.pluginId,
             extensionPoints,
             init,
           },
@@ -144,6 +140,9 @@ export function createBackendPlugin<TOptions extends [options?: object] = []>(
       },
     };
   };
+  factory.$$type = '@backstage/BackendFeatureFactory';
+
+  return factory;
 }
 
 /**
@@ -155,13 +154,14 @@ export function createBackendPlugin<TOptions extends [options?: object] = []>(
  */
 export interface BackendModuleConfig {
   /**
-   * The ID of this plugin.
+   * Should exactly match the `id` of the plugin that the module extends.
    *
    * @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.
+   * The ID of this module, used to identify the module and ensure that it is not installed twice.
    */
   moduleId: string;
   register(reg: BackendModuleRegistrationPoints): void;
@@ -174,13 +174,10 @@ export interface BackendModuleConfig {
  * @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 [options?: object] = []>(
-  config: BackendModuleConfig | ((...params: TOptions) => BackendModuleConfig),
-): (...params: TOptions) => BackendFeature {
-  const configCallback = typeof config === 'function' ? config : () => config;
-  return (...options: TOptions): InternalBackendFeature => {
-    const c = configCallback(...options);
-
+export function createBackendModule(
+  config: BackendModuleConfig,
+): () => BackendFeature {
+  const factory: BackendFeatureFactory = () => {
     let registrations: InternalBackendModuleRegistration[];
 
     return {
@@ -190,10 +187,20 @@ export function createBackendModule<TOptions extends [options?: object] = []>(
         if (registrations) {
           return registrations;
         }
+        const extensionPoints: InternalBackendPluginRegistration['extensionPoints'] =
+          [];
         let init: InternalBackendModuleRegistration['init'] | undefined =
           undefined;
 
-        c.register({
+        config.register({
+          registerExtensionPoint(ext, impl) {
+            if (init) {
+              throw new Error(
+                'registerExtensionPoint called after registerInit',
+              );
+            }
+            extensionPoints.push([ext, impl]);
+          },
           registerInit(regInit) {
             if (init) {
               throw new Error('registerInit must only be called once');
@@ -207,15 +214,16 @@ export function createBackendModule<TOptions extends [options?: object] = []>(
 
         if (!init) {
           throw new Error(
-            `registerInit was not called by register in ${c.moduleId} module for ${c.pluginId}`,
+            `registerInit was not called by register in ${config.moduleId} module for ${config.pluginId}`,
           );
         }
 
         registrations = [
           {
             type: 'module',
-            pluginId: c.pluginId,
-            moduleId: c.moduleId,
+            pluginId: config.pluginId,
+            moduleId: config.moduleId,
+            extensionPoints,
             init,
           },
         ];
@@ -223,4 +231,7 @@ export function createBackendModule<TOptions extends [options?: object] = []>(
       },
     };
   };
+  factory.$$type = '@backstage/BackendFeatureFactory';
+
+  return factory;
 }
diff --git a/packages/backend-plugin-api/src/wiring/index.ts b/packages/backend-plugin-api/src/wiring/index.ts
index 9cb767b8ac..49f15c0b55 100644
--- a/packages/backend-plugin-api/src/wiring/index.ts
+++ b/packages/backend-plugin-api/src/wiring/index.ts
@@ -27,6 +27,5 @@ export {
 export type {
   BackendModuleRegistrationPoints,
   BackendPluginRegistrationPoints,
-  BackendFeature,
   ExtensionPoint,
 } from './types';
diff --git a/packages/backend-plugin-api/src/wiring/types.ts b/packages/backend-plugin-api/src/wiring/types.ts
index c81ee3ceb7..55d43ccb7c 100644
--- a/packages/backend-plugin-api/src/wiring/types.ts
+++ b/packages/backend-plugin-api/src/wiring/types.ts
@@ -15,6 +15,7 @@
  */
 
 import { ServiceRef } from '../services/system/types';
+import { BackendFeature } from '../types';
 
 /**
  * TODO
@@ -59,6 +60,10 @@ export interface BackendPluginRegistrationPoints {
  * @public
  */
 export interface BackendModuleRegistrationPoints {
+  registerExtensionPoint<TExtensionPoint>(
+    ref: ExtensionPoint<TExtensionPoint>,
+    impl: TExtensionPoint,
+  ): void;
   registerInit<Deps extends { [name in string]: unknown }>(options: {
     deps: {
       [name in keyof Deps]: ServiceRef<Deps[name]> | ExtensionPoint<Deps[name]>;
@@ -67,12 +72,6 @@ export interface BackendModuleRegistrationPoints {
   }): void;
 }
 
-/** @public */
-export interface BackendFeature {
-  // NOTE: This type is opaque in order to simplify future API evolution.
-  $$type: '@backstage/BackendFeature';
-}
-
 /** @internal */
 export interface InternalBackendFeature extends BackendFeature {
   version: 'v1';
@@ -97,6 +96,7 @@ export interface InternalBackendModuleRegistration {
   pluginId: string;
   moduleId: string;
   type: 'module';
+  extensionPoints: Array<readonly [ExtensionPoint<unknown>, unknown]>;
   init: {
     deps: Record<string, ServiceRef<unknown> | ExtensionPoint<unknown>>;
     func(deps: Record<string, unknown>): Promise<void>;
diff --git a/packages/backend-plugin-manager/.eslintrc.js b/packages/backend-plugin-manager/.eslintrc.js
new file mode 100644
index 0000000000..e2a53a6ad2
--- /dev/null
+++ b/packages/backend-plugin-manager/.eslintrc.js
@@ -0,0 +1 @@
+module.exports = require('@backstage/cli/config/eslint-factory')(__dirname);
diff --git a/packages/backend-plugin-manager/CHANGELOG.md b/packages/backend-plugin-manager/CHANGELOG.md
new file mode 100644
index 0000000000..7822f30008
--- /dev/null
+++ b/packages/backend-plugin-manager/CHANGELOG.md
@@ -0,0 +1,24 @@
+# @backstage/backend-plugin-manager
+
+## 0.0.1-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-backend@1.13.0-next.2
+  - @backstage/config@1.1.0-next.1
+  - @backstage/backend-tasks@0.5.8-next.2
+  - @backstage/backend-common@0.19.5-next.2
+  - @backstage/plugin-auth-node@0.3.0-next.2
+  - @backstage/plugin-events-backend@0.2.12-next.2
+  - @backstage/plugin-permission-node@0.7.14-next.2
+  - @backstage/backend-plugin-api@0.6.3-next.2
+  - @backstage/plugin-permission-common@0.7.8-next.1
+  - @backstage/plugin-scaffolder-node@0.2.3-next.2
+  - @backstage/plugin-search-backend-node@1.2.7-next.2
+  - @backstage/cli-common@0.1.12
+  - @backstage/cli-node@0.1.3
+  - @backstage/errors@1.2.1
+  - @backstage/types@1.1.0
+  - @backstage/plugin-events-node@0.2.12-next.2
+  - @backstage/plugin-search-common@1.2.6-next.1
diff --git a/packages/backend-plugin-manager/README.md b/packages/backend-plugin-manager/README.md
new file mode 100644
index 0000000000..c9fd666fb3
--- /dev/null
+++ b/packages/backend-plugin-manager/README.md
@@ -0,0 +1,52 @@
+# @backstage/backend-plugin-manager
+
+This package adds experimental support for **dynamic backend plugins**, according to the content of the proposal in [RFC 18390](https://github.com/backstage/backstage/issues/18390)
+
+## Status
+
+**This package is EXPERIMENTAL, and is subject to change according to the discussions and conclusions that happen around the RFC mentioned above.**
+
+## Testing the backend dynamic plugins feature
+
+In order to test the dynamic backend plugins feature provided by this package, example applications, as well as example dynamic plugins have been provided in provided in the [showcase repository](https://github.com/janus-idp/dynamic-backend-plugins-showcase), and instructions are provided in the [related Readme](https://github.com/janus-idp/dynamic-backend-plugins-showcase#readme).
+
+## How it works
+
+The backend plugin manager is a service that scans a configured root directory (`dynamicPlugins.rootDirectory` in the app config) for dynamic plugin packages, and loads them dynamically.
+
+In the `backend-next` application, it can be enabled by adding the `backend-plugin-manager` as a dependency in the `package.json` and the following lines in the `src/index.ts` file:
+
+```ts
+const backend = createBackend();
++
++ backend.add(dynamicPluginsFeatureDiscoveryServiceFactory()) // overridden version of the FeatureDiscoveryService which provides features loaded by dynamic plugins
++ backend.add(dynamicPluginsServiceFactory())
++
+```
+
+### About the expected dynamic plugin structure
+
+Due to some limitations of the current backstage codebase, the plugins need to be completed and repackaged to by used as dynamic plugins:
+
+1. they must provide a named entry point (`dynamicPluginInstaller`) of a specific type (`BackendDynamicPluginInstaller`), as can be found in the `src/dynamic` sub-folder of each dynamic plugin example provided in the [showcase repository](https://github.com/janus-idp/dynamic-backend-plugins-showcase).
+2. they would have a modified `package.json` file in which dependencies are updated to share `@backstage` dependencies with the main application.
+3. they may embed some dependency whose code is then merged with the plugin code.
+
+Points 2 and 3 can be done by the `export-dynamic-plugin` CLI command used to perform the repackaging
+
+### About the `export-dynamic-plugin` command
+
+The `export-dynamic-plugin` CLI command, used the dynamic plugin examples provided in the [showcase repository](https://github.com/janus-idp/dynamic-backend-plugins-showcase), is part of a `@backstage/cli` fork (`@dfatwork-pkgs/backstage-cli@0.22.9-next.6`), and can be used to help packaging the dynamic plugins according to the constraints mentioned above, in order to allow straightforward testing of the dynamic plugins feature.
+
+However the `backend-plugin-manager` experimental package does **not** depend on the use of this additional CLI command, and in future steps of this backend dynamic plugin work, the use of such a dedicated command might not even be necessary.
+
+### About the support of the legacy backend system
+
+The backend dynamic plugins feature clearly targets the new backend system.
+However some level of compatibility is provided with current backstage codebase, which still uses the legacy backend system, in order to allow testing and exploring dynamic backend plugin support on the widest range of contexts and installations.
+However, this is temporary and will be removed once the next backend is ready to be used and has completely replaced the old one.
+This is why the API related to the old backend is already marked as deprecated.
+
+### Future work
+
+The current implementation of the backend plugin manager is a first step towards the final implementation of the dynamic backend plugins feature, which will be completed / simplified in future steps, as the status of the backstage codebase allows it.
diff --git a/packages/backend-plugin-manager/api-report.md b/packages/backend-plugin-manager/api-report.md
new file mode 100644
index 0000000000..9617dc1096
--- /dev/null
+++ b/packages/backend-plugin-manager/api-report.md
@@ -0,0 +1,199 @@
+## API Report File for "@backstage/backend-plugin-manager"
+
+> Do not edit this file. It is a report generated by [API Extractor](https://api-extractor.com/).
+
+```ts
+import { BackendFeature } from '@backstage/backend-plugin-api';
+import { BackstagePackageJson } from '@backstage/cli-node';
+import { CatalogBuilder } from '@backstage/plugin-catalog-backend';
+import { Config } from '@backstage/config';
+import { EventBroker } from '@backstage/plugin-events-node';
+import { EventsBackend } from '@backstage/plugin-events-backend';
+import { FeatureDiscoveryService } from '@backstage/backend-plugin-api/alpha';
+import { HttpPostIngressOptions } from '@backstage/plugin-events-node';
+import { IdentityApi } from '@backstage/plugin-auth-node';
+import { IndexBuilder } from '@backstage/plugin-search-backend-node';
+import { Logger } from 'winston';
+import { LoggerService } from '@backstage/backend-plugin-api';
+import { PackagePlatform } from '@backstage/cli-node';
+import { PackageRole } from '@backstage/cli-node';
+import { PermissionEvaluator } from '@backstage/plugin-permission-common';
+import { PermissionPolicy } from '@backstage/plugin-permission-node';
+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 { Router } from 'express';
+import { ServiceFactory } from '@backstage/backend-plugin-api';
+import { ServiceRef } from '@backstage/backend-plugin-api';
+import { TaskRunner } from '@backstage/backend-tasks';
+import { TemplateAction } from '@backstage/plugin-scaffolder-node';
+import { TokenManager } from '@backstage/backend-common';
+import { UrlReader } from '@backstage/backend-common';
+
+// @public (undocumented)
+export interface BackendDynamicPlugin extends BaseDynamicPlugin {
+  // (undocumented)
+  installer: BackendDynamicPluginInstaller;
+  // (undocumented)
+  platform: 'node';
+}
+
+// @public (undocumented)
+export type BackendDynamicPluginInstaller =
+  | LegacyBackendPluginInstaller
+  | NewBackendPluginInstaller;
+
+// @public (undocumented)
+export interface BackendPluginProvider {
+  // (undocumented)
+  backendPlugins(): BackendDynamicPlugin[];
+}
+
+// @public (undocumented)
+export interface BaseDynamicPlugin {
+  // (undocumented)
+  name: string;
+  // (undocumented)
+  platform: PackagePlatform;
+  // (undocumented)
+  role: PackageRole;
+  // (undocumented)
+  version: string;
+}
+
+// @public (undocumented)
+export type DynamicPlugin = FrontendDynamicPlugin | BackendDynamicPlugin;
+
+// @public (undocumented)
+export interface DynamicPluginsFactoryOptions {
+  // (undocumented)
+  moduleLoader?(logger: LoggerService): ModuleLoader;
+}
+
+// @public (undocumented)
+export const dynamicPluginsFeatureDiscoveryServiceFactory: () => ServiceFactory<
+  FeatureDiscoveryService,
+  'root'
+>;
+
+// @public (undocumented)
+export const dynamicPluginsServiceFactory: (
+  options?: DynamicPluginsFactoryOptions | undefined,
+) => ServiceFactory<BackendPluginProvider, 'root'>;
+
+// @public (undocumented)
+export const dynamicPluginsServiceRef: ServiceRef<
+  BackendPluginProvider,
+  'root'
+>;
+
+// @public (undocumented)
+export interface FrontendDynamicPlugin extends BaseDynamicPlugin {
+  // (undocumented)
+  platform: 'web';
+}
+
+// @public (undocumented)
+export function isBackendDynamicPluginInstaller(
+  obj: any,
+): obj is BackendDynamicPluginInstaller;
+
+// @public @deprecated (undocumented)
+export interface LegacyBackendPluginInstaller {
+  // (undocumented)
+  catalog?(builder: CatalogBuilder, env: LegacyPluginEnvironment): void;
+  // (undocumented)
+  events?(
+    eventsBackend: EventsBackend,
+    env: LegacyPluginEnvironment,
+  ): HttpPostIngressOptions[];
+  // (undocumented)
+  kind: 'legacy';
+  // (undocumented)
+  permissions?: {
+    policy?: PermissionPolicy;
+  };
+  // (undocumented)
+  router?: {
+    pluginID: string;
+    createPlugin(env: LegacyPluginEnvironment): Promise<Router>;
+  };
+  // (undocumented)
+  scaffolder?(env: LegacyPluginEnvironment): TemplateAction<any>[];
+  // (undocumented)
+  search?(
+    indexBuilder: IndexBuilder,
+    schedule: TaskRunner,
+    env: LegacyPluginEnvironment,
+  ): void;
+}
+
+// @public @deprecated (undocumented)
+export type LegacyPluginEnvironment = {
+  logger: Logger;
+  cache: PluginCacheManager;
+  database: PluginDatabaseManager;
+  config: Config;
+  reader: UrlReader;
+  discovery: PluginEndpointDiscovery;
+  tokenManager: TokenManager;
+  permissions: PermissionEvaluator;
+  scheduler: PluginTaskScheduler;
+  identity: IdentityApi;
+  eventBroker: EventBroker;
+  pluginProvider: BackendPluginProvider;
+};
+
+// @public (undocumented)
+export interface ModuleLoader {
+  // (undocumented)
+  bootstrap(backstageRoot: string, dynamicPluginPaths: string[]): Promise<void>;
+  // (undocumented)
+  load(id: string): Promise<any>;
+}
+
+// @public (undocumented)
+export interface NewBackendPluginInstaller {
+  // (undocumented)
+  install(): BackendFeature | BackendFeature[];
+  // (undocumented)
+  kind: 'new';
+}
+
+// @public (undocumented)
+export class PluginManager implements BackendPluginProvider {
+  // (undocumented)
+  addBackendPlugin(plugin: BackendDynamicPlugin): void;
+  // (undocumented)
+  get availablePackages(): ScannedPluginPackage[];
+  // (undocumented)
+  backendPlugins(): BackendDynamicPlugin[];
+  // (undocumented)
+  static fromConfig(
+    config: Config,
+    logger: LoggerService,
+    preferAlpha?: boolean,
+    mooduleLoader?: ModuleLoader,
+  ): Promise<PluginManager>;
+  // (undocumented)
+  readonly plugins: DynamicPlugin[];
+}
+
+// @public (undocumented)
+export type ScannedPluginManifest = BackstagePackageJson &
+  Required<Pick<BackstagePackageJson, 'main'>> &
+  Required<Pick<BackstagePackageJson, 'backstage'>> & {
+    backstage: Required<BackstagePackageJson['backstage']>;
+  };
+
+// @public (undocumented)
+export interface ScannedPluginPackage {
+  // (undocumented)
+  location: URL;
+  // (undocumented)
+  manifest: ScannedPluginManifest;
+}
+
+// (No @packageDocumentation comment for this package)
+```
diff --git a/packages/backend-plugin-manager/config.d.ts b/packages/backend-plugin-manager/config.d.ts
new file mode 100644
index 0000000000..9427458a23
--- /dev/null
+++ b/packages/backend-plugin-manager/config.d.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.
+ */
+
+export interface Config {
+  dynamicPlugins?: {
+    /**
+     * The local path, relative to the backstage root, that contains dynamic plugins.
+     */
+    rootDirectory: string;
+  };
+}
diff --git a/packages/backend-plugin-manager/package.json b/packages/backend-plugin-manager/package.json
new file mode 100644
index 0000000000..f98ab5270a
--- /dev/null
+++ b/packages/backend-plugin-manager/package.json
@@ -0,0 +1,64 @@
+{
+  "name": "@backstage/backend-plugin-manager",
+  "description": "Backstage plugin management backend",
+  "version": "0.0.1-next.0",
+  "private": true,
+  "main": "src/index.ts",
+  "types": "src/index.ts",
+  "publishConfig": {
+    "access": "public",
+    "main": "dist/index.cjs.js",
+    "types": "dist/index.d.ts"
+  },
+  "backstage": {
+    "role": "node-library"
+  },
+  "keywords": [
+    "backstage"
+  ],
+  "license": "Apache-2.0",
+  "scripts": {
+    "build": "backstage-cli package 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/backend-common": "workspace:^",
+    "@backstage/backend-plugin-api": "workspace:^",
+    "@backstage/backend-tasks": "workspace:^",
+    "@backstage/cli-common": "workspace:^",
+    "@backstage/cli-node": "workspace:^",
+    "@backstage/config": "workspace:^",
+    "@backstage/errors": "workspace:^",
+    "@backstage/plugin-auth-node": "workspace:^",
+    "@backstage/plugin-catalog-backend": "workspace:^",
+    "@backstage/plugin-events-backend": "workspace:^",
+    "@backstage/plugin-events-node": "workspace:^",
+    "@backstage/plugin-permission-common": "workspace:^",
+    "@backstage/plugin-permission-node": "workspace:^",
+    "@backstage/plugin-scaffolder-node": "workspace:^",
+    "@backstage/plugin-search-backend-node": "workspace:^",
+    "@backstage/plugin-search-common": "workspace:^",
+    "@backstage/types": "workspace:^",
+    "@types/express": "^4.17.6",
+    "chokidar": "^3.5.3",
+    "express": "^4.17.1",
+    "lodash": "^4.17.21",
+    "winston": "^3.2.1"
+  },
+  "devDependencies": {
+    "@backstage/backend-app-api": "workspace:^",
+    "@backstage/backend-test-utils": "workspace:^",
+    "@backstage/cli": "workspace:^",
+    "@backstage/config-loader": "workspace:^",
+    "mock-fs": "^5.2.0",
+    "wait-for-expect": "^3.0.2"
+  },
+  "files": [
+    "dist"
+  ]
+}
diff --git a/packages/backend-plugin-manager/src/__testUtils__/testUtils.ts b/packages/backend-plugin-manager/src/__testUtils__/testUtils.ts
new file mode 100644
index 0000000000..11a4421239
--- /dev/null
+++ b/packages/backend-plugin-manager/src/__testUtils__/testUtils.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 } from '@backstage/backend-plugin-api';
+import { JsonObject } from '@backstage/types';
+
+export type LogContent = { message: string; meta?: Error | JsonObject };
+
+export type Logs = {
+  errors?: LogContent[];
+  warns?: LogContent[];
+  infos?: LogContent[];
+  debugs?: LogContent[];
+};
+
+export class MockedLogger implements LoggerService {
+  logs: Logs = {};
+
+  error(message: string, meta?: Error | JsonObject): void {
+    if (!this.logs.errors) {
+      this.logs.errors = [];
+    }
+    this.logs.errors!.push(toLogContent(message, meta));
+  }
+  warn(message: string, meta?: Error | JsonObject): void {
+    if (!this.logs.warns) {
+      this.logs.warns = [];
+    }
+    this.logs.warns!.push(toLogContent(message, meta));
+  }
+  info(message: string, meta?: Error | JsonObject): void {
+    if (!this.logs.infos) {
+      this.logs.infos = [];
+    }
+    this.logs.infos!.push(toLogContent(message, meta));
+  }
+  debug(message: string, meta?: Error | JsonObject): void {
+    if (!this.logs.debugs) {
+      this.logs.debugs = [];
+    }
+    this.logs.debugs!.push(toLogContent(message, meta));
+  }
+
+  child(_: JsonObject): LoggerService {
+    return this;
+  }
+}
+
+function toLogContent(message: string, meta?: Error | JsonObject): LogContent {
+  if (!meta) {
+    return { message };
+  }
+  const jsonObject = Object.fromEntries(Object.entries(meta));
+  if ('name' in meta) {
+    jsonObject.name = meta.name;
+  }
+  if ('message' in meta) {
+    jsonObject.message = meta.message;
+  }
+  return {
+    message,
+    meta: jsonObject,
+  };
+}
diff --git a/packages/backend-plugin-manager/src/index.ts b/packages/backend-plugin-manager/src/index.ts
new file mode 100644
index 0000000000..5570d8ee29
--- /dev/null
+++ b/packages/backend-plugin-manager/src/index.ts
@@ -0,0 +1,19 @@
+/*
+ * Copyright 2023 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+export * from './loader';
+export * from './scanner';
+export * from './manager';
diff --git a/packages/backend-plugin-manager/src/loader/CommonJSModuleLoader.ts b/packages/backend-plugin-manager/src/loader/CommonJSModuleLoader.ts
new file mode 100644
index 0000000000..dd64dc78f3
--- /dev/null
+++ b/packages/backend-plugin-manager/src/loader/CommonJSModuleLoader.ts
@@ -0,0 +1,50 @@
+/*
+ * Copyright 2023 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+import { ModuleLoader } from './types';
+import { LoggerService } from '@backstage/backend-plugin-api';
+import path from 'path';
+
+export class CommonJSModuleLoader implements ModuleLoader {
+  constructor(public readonly logger: LoggerService) {}
+
+  async bootstrap(
+    backstageRoot: string,
+    dynamicPluginsPaths: string[],
+  ): Promise<void> {
+    const allowedNodeModulesPaths = [
+      `${backstageRoot}/node_modules`,
+      ...dynamicPluginsPaths.map(p => path.resolve(p, 'node_modules')),
+    ];
+    const Module = require('module');
+    const oldNodeModulePaths = Module._nodeModulePaths;
+    Module._nodeModulePaths = (from: string): string[] => {
+      const result: string[] = oldNodeModulePaths(from);
+      if (!dynamicPluginsPaths.some(p => from.startsWith(p))) {
+        return result;
+      }
+
+      const filtered = result.filter(p => allowedNodeModulesPaths.includes(p));
+      this.logger.debug(
+        `Overriding node_modules search path for dynamic plugin ${from} to: ${filtered}`,
+      );
+      return filtered;
+    };
+  }
+
+  async load(packagePath: string): Promise<any> {
+    return await import(/* webpackIgnore: true */ packagePath);
+  }
+}
diff --git a/packages/backend-plugin-manager/src/loader/index.ts b/packages/backend-plugin-manager/src/loader/index.ts
new file mode 100644
index 0000000000..ff0892e66d
--- /dev/null
+++ b/packages/backend-plugin-manager/src/loader/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 { ModuleLoader } from './types';
diff --git a/plugins/catalog-backend/src/service/request/parseFullTextFilterFields.ts b/packages/backend-plugin-manager/src/loader/types.ts
similarity index 64%
rename from plugins/catalog-backend/src/service/request/parseFullTextFilterFields.ts
rename to packages/backend-plugin-manager/src/loader/types.ts
index 02ba5864fc..12a051e482 100644
--- a/plugins/catalog-backend/src/service/request/parseFullTextFilterFields.ts
+++ b/packages/backend-plugin-manager/src/loader/types.ts
@@ -1,5 +1,3 @@
-import { parseStringParam } from './common';
-
 /*
  * Copyright 2023 The Backstage Authors
  *
@@ -15,14 +13,12 @@ import { parseStringParam } from './common';
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-export function parseFullTextFilterFields(params: Record<string, unknown>) {
-  const fullTextFilterFields = parseStringParam(
-    params.fullTextFilterFields,
-    'fullTextFilterFields',
-  );
-  if (!fullTextFilterFields) {
-    return undefined;
-  }
 
-  return fullTextFilterFields.split(',');
+/**
+ * @public
+ */
+export interface ModuleLoader {
+  bootstrap(backstageRoot: string, dynamicPluginPaths: string[]): Promise<void>;
+
+  load(id: string): Promise<any>;
 }
diff --git a/packages/backend-plugin-manager/src/manager/index.ts b/packages/backend-plugin-manager/src/manager/index.ts
new file mode 100644
index 0000000000..a9cd163617
--- /dev/null
+++ b/packages/backend-plugin-manager/src/manager/index.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.
+ */
+
+export { isBackendDynamicPluginInstaller } from './types';
+
+export type {
+  BaseDynamicPlugin,
+  DynamicPlugin,
+  FrontendDynamicPlugin,
+  BackendDynamicPlugin,
+  BackendDynamicPluginInstaller,
+  NewBackendPluginInstaller,
+  LegacyBackendPluginInstaller,
+  LegacyPluginEnvironment,
+  BackendPluginProvider,
+} from './types';
+
+export {
+  PluginManager,
+  dynamicPluginsFeatureDiscoveryServiceFactory,
+  dynamicPluginsServiceFactory,
+  dynamicPluginsServiceRef,
+} from './plugin-manager';
+
+export type { DynamicPluginsFactoryOptions } from './plugin-manager';
diff --git a/packages/backend-plugin-manager/src/manager/plugin-manager.test.ts b/packages/backend-plugin-manager/src/manager/plugin-manager.test.ts
new file mode 100644
index 0000000000..8a17fe082a
--- /dev/null
+++ b/packages/backend-plugin-manager/src/manager/plugin-manager.test.ts
@@ -0,0 +1,538 @@
+/*
+ * 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 { PluginManager, dynamicPluginsServiceFactory } from './plugin-manager';
+import {
+  BackendFeature,
+  coreServices,
+  createServiceFactory,
+} from '@backstage/backend-plugin-api';
+import mockFs, { directory, symlink } from 'mock-fs';
+import * as path from 'path';
+import * as url from 'url';
+
+import {
+  BackendDynamicPlugin,
+  BaseDynamicPlugin,
+  DynamicPlugin,
+  LegacyBackendPluginInstaller,
+  NewBackendPluginInstaller,
+  LegacyPluginEnvironment,
+} from './types';
+import { ScannedPluginManifest, ScannedPluginPackage } from '../scanner/types';
+import { randomUUID } from 'crypto';
+import { TemplateAction } from '@backstage/plugin-scaffolder-node';
+import {
+  createSpecializedBackend,
+  rootLifecycleServiceFactory,
+} from '@backstage/backend-app-api';
+import { ConfigSources } from '@backstage/config-loader';
+import { Logs, MockedLogger, LogContent } from '../__testUtils__/testUtils';
+import { PluginScanner } from '../scanner/plugin-scanner';
+import { findPaths } from '@backstage/cli-common';
+
+describe('backend-plugin-manager', () => {
+  describe('loadPlugins', () => {
+    afterEach(() => {
+      mockFs.restore();
+      jest.resetModules();
+    });
+
+    type TestCase = {
+      name: string;
+      packageManifest: ScannedPluginManifest;
+      indexFile?: {
+        retativePath: string[];
+        content?: string;
+      };
+      expectedLogs?(location: URL): {
+        errors?: LogContent[];
+        warns?: LogContent[];
+        infos?: LogContent[];
+        debugs?: LogContent[];
+      };
+      checkLoadedPlugins: (loadedPlugins: BaseDynamicPlugin[]) => void;
+    };
+
+    it.each<TestCase>([
+      {
+        name: 'should successfully load a new backend plugin',
+        packageManifest: {
+          name: 'backend-dynamic-plugin-test',
+          version: '0.0.0',
+          backstage: {
+            role: 'backend-plugin',
+          },
+          main: 'dist/index.cjs.js',
+        },
+        indexFile: {
+          retativePath: ['dist', 'index.cjs.js'],
+          content:
+            'exports.dynamicPluginInstaller={ kind: "new", install: () => [] }',
+        },
+        expectedLogs(location) {
+          return {
+            infos: [
+              {
+                message: `loaded dynamic backend plugin 'backend-dynamic-plugin-test' from '${location}'`,
+              },
+            ],
+          };
+        },
+        checkLoadedPlugins(plugins) {
+          expect(plugins).toMatchObject([
+            {
+              name: 'backend-dynamic-plugin-test',
+              version: '0.0.0',
+              role: 'backend-plugin',
+              platform: 'node',
+              installer: {
+                kind: 'new',
+              },
+            },
+          ]);
+          const installer: NewBackendPluginInstaller = (
+            plugins[0] as BackendDynamicPlugin
+          ).installer as NewBackendPluginInstaller;
+          expect(installer.install()).toEqual<
+            BackendFeature | BackendFeature[]
+          >([]);
+        },
+      },
+      {
+        name: 'should successfully load a new backend plugin module',
+        packageManifest: {
+          name: 'backend-dynamic-plugin-test',
+          version: '0.0.0',
+          backstage: {
+            role: 'backend-plugin-module',
+          },
+          main: 'dist/index.cjs.js',
+        },
+        indexFile: {
+          retativePath: ['dist', 'index.cjs.js'],
+          content:
+            'exports.dynamicPluginInstaller={ kind: "new", install: () => [] }',
+        },
+        expectedLogs(location) {
+          return {
+            infos: [
+              {
+                message: `loaded dynamic backend plugin 'backend-dynamic-plugin-test' from '${location}'`,
+              },
+            ],
+          };
+        },
+        checkLoadedPlugins(plugins) {
+          expect(plugins).toMatchObject([
+            {
+              name: 'backend-dynamic-plugin-test',
+              version: '0.0.0',
+              role: 'backend-plugin-module',
+              platform: 'node',
+              installer: {
+                kind: 'new',
+              },
+            },
+          ]);
+          const installer: NewBackendPluginInstaller = (
+            plugins[0] as BackendDynamicPlugin
+          ).installer as NewBackendPluginInstaller;
+          expect(installer.install()).toEqual<
+            BackendFeature | BackendFeature[]
+          >([]);
+        },
+      },
+      {
+        name: 'should fail when no index file',
+        packageManifest: {
+          name: 'backend-dynamic-plugin-test',
+          version: '0.0.0',
+          backstage: {
+            role: 'backend-plugin',
+          },
+          main: 'dist/index.cjs.js',
+        },
+        expectedLogs(location) {
+          return {
+            errors: [
+              {
+                message: `an error occured while loading dynamic backend plugin 'backend-dynamic-plugin-test' from '${location}'`,
+                meta: {
+                  name: 'Error',
+                  message: expect.stringContaining(
+                    `Cannot find module '${url.fileURLToPath(
+                      location,
+                    )}/dist/index.cjs.js' from `,
+                  ),
+                  _originalMessage: expect.stringContaining(
+                    `Cannot find module '${url.fileURLToPath(
+                      location,
+                    )}/dist/index.cjs.js' from `,
+                  ),
+                  code: 'MODULE_NOT_FOUND',
+                  hint: '',
+                  moduleName: `${url.fileURLToPath(
+                    location,
+                  )}/dist/index.cjs.js`,
+                  siblingWithSimilarExtensionFound: false,
+                  requireStack: undefined,
+                },
+              },
+            ],
+          };
+        },
+        checkLoadedPlugins(plugins) {
+          expect(plugins).toMatchObject([]);
+        },
+      },
+      {
+        name: 'should fail when the expected entry point is not in the index file',
+        packageManifest: {
+          name: 'backend-dynamic-plugin-test',
+          version: '0.0.0',
+          backstage: {
+            role: 'backend-plugin',
+          },
+          main: 'dist/index.cjs.js',
+        },
+        indexFile: {
+          retativePath: ['dist', 'index.cjs.js'],
+          content: '',
+        },
+        expectedLogs(location) {
+          return {
+            errors: [
+              {
+                message: `dynamic backend plugin 'backend-dynamic-plugin-test' could not be loaded from '${location}': the module should export a 'const dynamicPluginInstaller: BackendDynamicPluginInstaller' field.`,
+              },
+            ],
+          };
+        },
+        checkLoadedPlugins(plugins) {
+          expect(plugins).toMatchObject([]);
+        },
+      },
+      {
+        name: 'should fail when the expected entry point is not of the expected type',
+        packageManifest: {
+          name: 'backend-dynamic-plugin-test',
+          version: '0.0.0',
+          backstage: {
+            role: 'backend-plugin',
+          },
+          main: 'dist/index.cjs.js',
+        },
+        indexFile: {
+          retativePath: ['dist', 'index.cjs.js'],
+          content:
+            'exports.dynamicPluginInstaller={ something: "else", unexpectedMethod() {} }',
+        },
+        expectedLogs(location) {
+          return {
+            errors: [
+              {
+                message: `dynamic backend plugin 'backend-dynamic-plugin-test' could not be loaded from '${location}': the module should export a 'const dynamicPluginInstaller: BackendDynamicPluginInstaller' field.`,
+              },
+            ],
+          };
+        },
+        checkLoadedPlugins(plugins) {
+          expect(plugins).toMatchObject([]);
+        },
+      },
+      {
+        name: 'should fail when the index file has a syntax error',
+        packageManifest: {
+          name: 'backend-dynamic-plugin-test',
+          version: '0.0.0',
+          backstage: {
+            role: 'backend-plugin',
+          },
+          main: 'dist/index.cjs.js',
+        },
+        indexFile: {
+          retativePath: ['dist', 'index.cjs.js'],
+          content: 'strange text with syntax error',
+        },
+        expectedLogs(location) {
+          return {
+            errors: [
+              {
+                message: `an error occured while loading dynamic backend plugin 'backend-dynamic-plugin-test' from '${location}'`,
+                meta: {
+                  message: 'Unexpected identifier',
+                  name: 'SyntaxError',
+                },
+              },
+            ],
+          };
+        },
+        checkLoadedPlugins(plugins) {
+          expect(plugins).toMatchObject([]);
+        },
+      },
+      {
+        name: 'should successfully load a legacy backend plugin',
+        packageManifest: {
+          name: 'backend-dynamic-plugin-test',
+          version: '0.0.0',
+          backstage: {
+            role: 'backend-plugin',
+          },
+          main: 'dist/index.cjs.js',
+        },
+        indexFile: {
+          retativePath: ['dist', 'index.cjs.js'],
+          content:
+            'exports.dynamicPluginInstaller={ kind: "legacy", scaffolder: (env)=>[] }',
+        },
+        expectedLogs(location) {
+          return {
+            infos: [
+              {
+                message: `loaded dynamic backend plugin 'backend-dynamic-plugin-test' from '${location}'`,
+              },
+            ],
+          };
+        },
+        checkLoadedPlugins(plugins) {
+          expect(plugins).toMatchObject([
+            {
+              name: 'backend-dynamic-plugin-test',
+              version: '0.0.0',
+              role: 'backend-plugin',
+              platform: 'node',
+              installer: {
+                kind: 'legacy',
+              },
+            },
+          ]);
+          const installer = (plugins[0] as BackendDynamicPlugin)
+            .installer as LegacyBackendPluginInstaller;
+          expect(installer.scaffolder!({} as LegacyPluginEnvironment)).toEqual<
+            TemplateAction<any>[]
+          >([]);
+        },
+      },
+      {
+        name: 'should successfully load a frontend plugin',
+        packageManifest: {
+          name: 'frontend-dynamic-plugin-test',
+          version: '0.0.0',
+          backstage: {
+            role: 'frontend-plugin',
+          },
+          main: 'dist/index.esm.js',
+        },
+        checkLoadedPlugins(plugins) {
+          expect(plugins).toMatchObject([
+            {
+              name: 'frontend-dynamic-plugin-test',
+              version: '0.0.0',
+              role: 'frontend-plugin',
+              platform: 'web',
+            },
+          ]);
+        },
+      },
+    ])('$name', async (tc: TestCase): Promise<void> => {
+      const plugin: ScannedPluginPackage = {
+        location: new URL(`file:///node_modules/jest-tests/${randomUUID()}`),
+        manifest: tc.packageManifest,
+      };
+
+      const mockedFiles = {
+        [path.join(url.fileURLToPath(plugin.location), 'package.json')]:
+          mockFs.file({
+            content: JSON.stringify(plugin),
+          }),
+      };
+      if (tc.indexFile) {
+        mockedFiles[
+          path.join(
+            url.fileURLToPath(plugin.location),
+            ...tc.indexFile.retativePath,
+          )
+        ] = mockFs.file({
+          content: tc.indexFile.content,
+        });
+      }
+      mockFs(mockedFiles);
+
+      const logger = new MockedLogger();
+      const pluginManager = new (PluginManager as any)(logger, [plugin], {
+        logger,
+        async bootstrap(_: string, __: string[]): Promise<void> {},
+        load: async (packagePath: string) =>
+          await import(/* webpackIgnore: true */ packagePath),
+      });
+
+      const loadedPlugins: DynamicPlugin[] = await pluginManager.loadPlugins();
+
+      const expectedLogs = tc.expectedLogs
+        ? tc.expectedLogs(plugin.location)
+        : {};
+      expect(logger.logs).toEqual<Logs>(expectedLogs);
+
+      tc.checkLoadedPlugins(loadedPlugins);
+    });
+  });
+
+  describe('backendPlugins', () => {
+    it('should return only backend plugins and modules', async () => {
+      const logger = new MockedLogger();
+      const pluginManager = new (PluginManager as any)(logger, '', []);
+      const plugins: BaseDynamicPlugin[] = [
+        {
+          name: 'a-frontend-plugin',
+          platform: 'web',
+          role: 'frontend-plugin',
+          version: '0.0.0',
+        },
+        {
+          name: 'a-backend-plugin',
+          platform: 'node',
+          role: 'backend-plugin',
+          version: '0.0.0',
+        },
+        {
+          name: 'a-backend-module',
+          platform: 'node',
+          role: 'backend-plugin-module',
+          version: '0.0.0',
+        },
+      ];
+      pluginManager.plugins = plugins;
+      expect(pluginManager.backendPlugins()).toEqual([
+        {
+          name: 'a-backend-plugin',
+          platform: 'node',
+          role: 'backend-plugin',
+          version: '0.0.0',
+        },
+        {
+          name: 'a-backend-module',
+          platform: 'node',
+          role: 'backend-plugin-module',
+          version: '0.0.0',
+        },
+      ]);
+    });
+  });
+
+  describe('dynamicPluginsServiceFactory', () => {
+    afterEach(() => {
+      mockFs.restore();
+      jest.resetModules();
+    });
+
+    it('should call PluginManager.fromConfig', async () => {
+      const logger = new MockedLogger();
+      const rootLogger = new MockedLogger();
+
+      mockFs({
+        [findPaths(__dirname).resolveTargetRoot('package.json')]: mockFs.load(
+          findPaths(__dirname).resolveTargetRoot('package.json'),
+        ),
+        '/somewhere/dynamic-plugins-root/a-dynamic-plugin': symlink({
+          path: '/somewhere-else/a-dynamic-plugin',
+        }),
+        '/somewhere-else/a-dynamic-plugin': directory({}),
+      });
+
+      const fromConfigSpier = jest.spyOn(PluginManager, 'fromConfig');
+      const applyConfigSpier = jest
+        .spyOn(PluginScanner.prototype as any, 'applyConfig')
+        .mockImplementation(() => {});
+      const scanRootSpier = jest
+        .spyOn(PluginScanner.prototype, 'scanRoot')
+        .mockImplementation(async () => [
+          {
+            location: new URL(
+              'file:///somewhere/dynamic-plugins-root/a-dynamic-plugin',
+            ),
+            manifest: {
+              name: 'test',
+              version: '0.0.0',
+              main: 'dist/index.cjs.js',
+              backstage: {
+                role: 'backend-plugin',
+              },
+            },
+          },
+        ]);
+      const mockedModuleLoader = {
+        logger,
+        bootstrap: jest.fn(),
+        load: jest.fn(),
+      };
+
+      const backend = createSpecializedBackend({
+        defaultServiceFactories: [
+          rootLifecycleServiceFactory(),
+          createServiceFactory({
+            service: coreServices.rootConfig,
+            deps: {},
+            async factory({}) {
+              return await ConfigSources.toConfig({
+                async *readConfigData() {
+                  yield {
+                    configs: [
+                      {
+                        context: 'test',
+                        data: {},
+                      },
+                    ],
+                  };
+                },
+              });
+            },
+          }),
+          createServiceFactory({
+            service: coreServices.logger,
+            deps: {},
+            async factory({}) {
+              return logger;
+            },
+          }),
+          createServiceFactory({
+            service: coreServices.rootLogger,
+            deps: {},
+            async factory({}) {
+              return rootLogger;
+            },
+          }),
+          dynamicPluginsServiceFactory({
+            moduleLoader: _ => mockedModuleLoader,
+          }),
+        ],
+      });
+
+      await backend.start();
+      expect(fromConfigSpier).toHaveBeenCalled();
+      expect(applyConfigSpier).toHaveBeenCalled();
+      expect(scanRootSpier).toHaveBeenCalled();
+      expect(mockedModuleLoader.bootstrap).toHaveBeenCalledWith(
+        findPaths(__dirname).targetRoot,
+        ['/somewhere-else/a-dynamic-plugin'],
+      );
+      expect(mockedModuleLoader.load).toHaveBeenCalledWith(
+        '/somewhere/dynamic-plugins-root/a-dynamic-plugin/dist/index.cjs.js',
+      );
+    });
+  });
+});
diff --git a/packages/backend-plugin-manager/src/manager/plugin-manager.ts b/packages/backend-plugin-manager/src/manager/plugin-manager.ts
new file mode 100644
index 0000000000..89ea144426
--- /dev/null
+++ b/packages/backend-plugin-manager/src/manager/plugin-manager.ts
@@ -0,0 +1,265 @@
+/*
+ * 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 {
+  BackendPluginProvider,
+  BackendDynamicPlugin,
+  isBackendDynamicPluginInstaller,
+  DynamicPlugin,
+} from './types';
+import { ScannedPluginPackage } from '../scanner';
+import { PluginScanner } from '../scanner/plugin-scanner';
+import { ModuleLoader } from '../loader';
+import { CommonJSModuleLoader } from '../loader/CommonJSModuleLoader';
+import * as url from 'url';
+import {
+  BackendFeature,
+  LoggerService,
+  coreServices,
+  createServiceFactory,
+  createServiceRef,
+} from '@backstage/backend-plugin-api';
+import { PackageRoles } from '@backstage/cli-node';
+import { findPaths } from '@backstage/cli-common';
+import path from 'path';
+import * as fs from 'fs';
+import {
+  FeatureDiscoveryService,
+  featureDiscoveryServiceRef,
+} from '@backstage/backend-plugin-api/alpha';
+
+/**
+ * @public
+ */
+export class PluginManager implements BackendPluginProvider {
+  static async fromConfig(
+    config: Config,
+    logger: LoggerService,
+    preferAlpha: boolean = false,
+    mooduleLoader: ModuleLoader = new CommonJSModuleLoader(logger),
+  ): Promise<PluginManager> {
+    /* eslint-disable-next-line no-restricted-syntax */
+    const backstageRoot = findPaths(__dirname).targetRoot;
+    const scanner = new PluginScanner(
+      config,
+      logger,
+      backstageRoot,
+      preferAlpha,
+    );
+    const scannedPlugins = await scanner.scanRoot();
+    scanner.trackChanges();
+    const manager = new PluginManager(logger, scannedPlugins, mooduleLoader);
+
+    const dynamicPluginsPaths = scannedPlugins.map(p =>
+      fs.realpathSync(
+        path.dirname(
+          path.dirname(
+            path.resolve(url.fileURLToPath(p.location), p.manifest.main),
+          ),
+        ),
+      ),
+    );
+
+    mooduleLoader.bootstrap(backstageRoot, dynamicPluginsPaths);
+
+    scanner.subscribeToRootDirectoryChange(async () => {
+      manager._availablePackages = await scanner.scanRoot();
+      // TODO: do not store _scannedPlugins again, but instead store a diff of the changes
+    });
+    manager.plugins.push(...(await manager.loadPlugins()));
+
+    return manager;
+  }
+
+  readonly plugins: DynamicPlugin[];
+  private _availablePackages: ScannedPluginPackage[];
+
+  private constructor(
+    private readonly logger: LoggerService,
+    private packages: ScannedPluginPackage[],
+    private readonly moduleLoader: ModuleLoader,
+  ) {
+    this.plugins = [];
+    this._availablePackages = packages;
+  }
+
+  get availablePackages(): ScannedPluginPackage[] {
+    return this._availablePackages;
+  }
+
+  addBackendPlugin(plugin: BackendDynamicPlugin): void {
+    this.plugins.push(plugin);
+  }
+
+  private async loadPlugins(): Promise<DynamicPlugin[]> {
+    const loadedPlugins: DynamicPlugin[] = [];
+
+    for (const scannedPlugin of this.packages) {
+      const platform = PackageRoles.getRoleInfo(
+        scannedPlugin.manifest.backstage.role,
+      ).platform;
+
+      if (
+        platform === 'node' &&
+        scannedPlugin.manifest.backstage.role.includes('-plugin')
+      ) {
+        const plugin = await this.loadBackendPlugin(scannedPlugin);
+        if (plugin !== undefined) {
+          loadedPlugins.push(plugin);
+        }
+      } else {
+        loadedPlugins.push({
+          name: scannedPlugin.manifest.name,
+          version: scannedPlugin.manifest.version,
+          role: scannedPlugin.manifest.backstage.role,
+          platform: 'web',
+          // TODO(davidfestal): add required front-end plugin information here.
+        });
+      }
+    }
+    return loadedPlugins;
+  }
+
+  private async loadBackendPlugin(
+    plugin: ScannedPluginPackage,
+  ): Promise<BackendDynamicPlugin | undefined> {
+    const packagePath = url.fileURLToPath(
+      `${plugin.location}/${plugin.manifest.main}`,
+    );
+    try {
+      const { dynamicPluginInstaller } = await this.moduleLoader.load(
+        packagePath,
+      );
+      if (!isBackendDynamicPluginInstaller(dynamicPluginInstaller)) {
+        this.logger.error(
+          `dynamic backend plugin '${plugin.manifest.name}' could not be loaded from '${plugin.location}': the module should export a 'const dynamicPluginInstaller: BackendDynamicPluginInstaller' field.`,
+        );
+        return undefined;
+      }
+      this.logger.info(
+        `loaded dynamic backend plugin '${plugin.manifest.name}' from '${plugin.location}'`,
+      );
+      return {
+        name: plugin.manifest.name,
+        version: plugin.manifest.version,
+        platform: 'node',
+        role: plugin.manifest.backstage.role,
+        installer: dynamicPluginInstaller,
+      };
+    } catch (error) {
+      this.logger.error(
+        `an error occured while loading dynamic backend plugin '${plugin.manifest.name}' from '${plugin.location}'`,
+        error,
+      );
+      return undefined;
+    }
+  }
+
+  backendPlugins(): BackendDynamicPlugin[] {
+    return this.plugins.filter(
+      (p): p is BackendDynamicPlugin => p.platform === 'node',
+    );
+  }
+}
+
+/**
+ * @public
+ */
+export const dynamicPluginsServiceRef = createServiceRef<BackendPluginProvider>(
+  {
+    id: 'core.dynamicplugins',
+    scope: 'root',
+  },
+);
+
+/**
+ * @public
+ */
+export interface DynamicPluginsFactoryOptions {
+  moduleLoader?(logger: LoggerService): ModuleLoader;
+}
+
+/**
+ * @public
+ */
+export const dynamicPluginsServiceFactory = createServiceFactory(
+  (options?: DynamicPluginsFactoryOptions) => ({
+    service: dynamicPluginsServiceRef,
+    deps: {
+      config: coreServices.rootConfig,
+      logger: coreServices.rootLogger,
+    },
+    async factory({ config, logger }) {
+      if (options?.moduleLoader) {
+        return await PluginManager.fromConfig(
+          config,
+          logger,
+          true,
+          options.moduleLoader(logger),
+        );
+      }
+      return await PluginManager.fromConfig(config, logger, true);
+    },
+  }),
+);
+
+class DynamicPluginsEnabledFeatureDiscoveryService
+  implements FeatureDiscoveryService
+{
+  constructor(
+    private readonly dynamicPlugins: BackendPluginProvider,
+    private readonly featureDiscoveryService?: FeatureDiscoveryService,
+  ) {}
+
+  async getBackendFeatures(): Promise<{ features: Array<BackendFeature> }> {
+    const staticFeatures =
+      (await this.featureDiscoveryService?.getBackendFeatures())?.features ??
+      [];
+
+    return {
+      features: [
+        ...this.dynamicPlugins
+          .backendPlugins()
+          .flatMap((plugin): BackendFeature[] => {
+            if (plugin.installer.kind === 'new') {
+              const installed = plugin.installer.install();
+              if (Array.isArray(installed)) {
+                return installed;
+              }
+              return [installed];
+            }
+            return [];
+          }),
+        ...staticFeatures,
+      ],
+    };
+  }
+}
+
+/**
+ * @public
+ */
+export const dynamicPluginsFeatureDiscoveryServiceFactory =
+  createServiceFactory({
+    service: featureDiscoveryServiceRef,
+    deps: {
+      config: coreServices.rootConfig,
+      dynamicPlugins: dynamicPluginsServiceRef,
+    },
+    factory({ dynamicPlugins }) {
+      return new DynamicPluginsEnabledFeatureDiscoveryService(dynamicPlugins);
+    },
+  });
diff --git a/packages/backend-plugin-manager/src/manager/types.ts b/packages/backend-plugin-manager/src/manager/types.ts
new file mode 100644
index 0000000000..201941292d
--- /dev/null
+++ b/packages/backend-plugin-manager/src/manager/types.ts
@@ -0,0 +1,169 @@
+/*
+ * 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 { Logger } from 'winston';
+import { Config } from '@backstage/config';
+import {
+  PluginCacheManager,
+  PluginDatabaseManager,
+  PluginEndpointDiscovery,
+  TokenManager,
+  UrlReader,
+} from '@backstage/backend-common';
+import { Router } from 'express';
+import { PluginTaskScheduler, TaskRunner } from '@backstage/backend-tasks';
+import { IdentityApi } from '@backstage/plugin-auth-node';
+import { PermissionEvaluator } from '@backstage/plugin-permission-common';
+import {
+  EventBroker,
+  HttpPostIngressOptions,
+} from '@backstage/plugin-events-node';
+
+import { BackendFeature } from '@backstage/backend-plugin-api';
+import { PackagePlatform, PackageRole } from '@backstage/cli-node';
+import { CatalogBuilder } from '@backstage/plugin-catalog-backend';
+import { TemplateAction } from '@backstage/plugin-scaffolder-node';
+import { IndexBuilder } from '@backstage/plugin-search-backend-node';
+import { EventsBackend } from '@backstage/plugin-events-backend';
+import { PermissionPolicy } from '@backstage/plugin-permission-node';
+
+/**
+ * @public
+ *
+ * @deprecated
+ *
+ * Support for the legacy backend system will be removed in the future.
+ *
+ * When adding a legacy plugin installer entrypoint in your plugin,
+ * you should always take the opportunity to also implement support
+ * for the new backend system if not already done.
+ *
+ */
+export type LegacyPluginEnvironment = {
+  logger: Logger;
+  cache: PluginCacheManager;
+  database: PluginDatabaseManager;
+  config: Config;
+  reader: UrlReader;
+  discovery: PluginEndpointDiscovery;
+  tokenManager: TokenManager;
+  permissions: PermissionEvaluator;
+  scheduler: PluginTaskScheduler;
+  identity: IdentityApi;
+  eventBroker: EventBroker;
+  pluginProvider: BackendPluginProvider;
+};
+
+/**
+ * @public
+ */
+export interface BackendPluginProvider {
+  backendPlugins(): BackendDynamicPlugin[];
+}
+
+/**
+ * @public
+ */
+export interface BaseDynamicPlugin {
+  name: string;
+  version: string;
+  role: PackageRole;
+  platform: PackagePlatform;
+}
+
+/**
+ * @public
+ */
+export type DynamicPlugin = FrontendDynamicPlugin | BackendDynamicPlugin;
+
+/**
+ * @public
+ */
+export interface FrontendDynamicPlugin extends BaseDynamicPlugin {
+  platform: 'web';
+}
+
+/**
+ * @public
+ */
+export interface BackendDynamicPlugin extends BaseDynamicPlugin {
+  platform: 'node';
+  installer: BackendDynamicPluginInstaller;
+}
+
+/**
+ * @public
+ */
+export type BackendDynamicPluginInstaller =
+  | LegacyBackendPluginInstaller
+  | NewBackendPluginInstaller;
+
+/**
+ * @public
+ */
+export interface NewBackendPluginInstaller {
+  kind: 'new';
+
+  install(): BackendFeature | BackendFeature[];
+}
+
+/**
+ * @public
+ * @deprecated
+ *
+ * Support for the legacy backend system will be removed in the future.
+ *
+ * When adding a legacy plugin installer entrypoint in your plugin,
+ * you should always take the opportunity to also implement support
+ * for the new backend system if not already done.
+ *
+ */
+export interface LegacyBackendPluginInstaller {
+  kind: 'legacy';
+
+  router?: {
+    pluginID: string;
+    createPlugin(env: LegacyPluginEnvironment): Promise<Router>;
+  };
+
+  catalog?(builder: CatalogBuilder, env: LegacyPluginEnvironment): void;
+  scaffolder?(env: LegacyPluginEnvironment): TemplateAction<any>[];
+  search?(
+    indexBuilder: IndexBuilder,
+    schedule: TaskRunner,
+    env: LegacyPluginEnvironment,
+  ): void;
+  events?(
+    eventsBackend: EventsBackend,
+    env: LegacyPluginEnvironment,
+  ): HttpPostIngressOptions[];
+  permissions?: {
+    policy?: PermissionPolicy;
+  };
+}
+
+/**
+ * @public
+ */
+export function isBackendDynamicPluginInstaller(
+  obj: any,
+): obj is BackendDynamicPluginInstaller {
+  return (
+    obj !== undefined &&
+    'kind' in obj &&
+    (obj.kind === 'new' || obj.kind === 'legacy')
+  );
+}
diff --git a/packages/backend-plugin-manager/src/scanner/index.ts b/packages/backend-plugin-manager/src/scanner/index.ts
new file mode 100644
index 0000000000..c5574cc38e
--- /dev/null
+++ b/packages/backend-plugin-manager/src/scanner/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 { ScannedPluginManifest, ScannedPluginPackage } from './types';
diff --git a/packages/backend-plugin-manager/src/scanner/plugin-scanner-watcher.test.ts b/packages/backend-plugin-manager/src/scanner/plugin-scanner-watcher.test.ts
new file mode 100644
index 0000000000..5ced3cfbab
--- /dev/null
+++ b/packages/backend-plugin-manager/src/scanner/plugin-scanner-watcher.test.ts
@@ -0,0 +1,365 @@
+/*
+ * 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 { PluginScanner } from './plugin-scanner';
+import { Logs, MockedLogger } from '../__testUtils__/testUtils';
+import { Config, ConfigReader } from '@backstage/config';
+import path, { join } from 'path';
+import { ScannedPluginPackage } from './types';
+import { mkdtempSync, rmSync } from 'fs';
+import { mkdir, writeFile, rm } from 'fs/promises';
+import { tmpdir } from 'os';
+import waitForExpect from 'wait-for-expect';
+
+describe('plugin-scanner', () => {
+  describe('rootDirectoryWatcher', () => {
+    let backstageRootDirectory: string;
+    beforeEach(() => {
+      backstageRootDirectory = mkdtempSync(
+        path.join(tmpdir(), 'backstage-plugin-scanner-test'),
+      );
+    });
+    afterEach(() => {
+      if (backstageRootDirectory) {
+        rmSync(backstageRootDirectory, { recursive: true, force: true });
+      }
+    });
+    process.on('beforeExit', () => {
+      if (backstageRootDirectory) {
+        rmSync(backstageRootDirectory, { recursive: true, force: true });
+      }
+    });
+
+    it('watch for config and file system changes', async () => {
+      const logger = new MockedLogger();
+
+      await mkdir(join(backstageRootDirectory, 'first-dir'));
+      await mkdir(join(backstageRootDirectory, 'second-dir'));
+
+      const config: Config = new ConfigReader({
+        dynamicPlugins: {
+          rootDirectory: 'first-dir',
+        },
+      });
+      const getOptional = jest.spyOn(config, 'getOptional');
+
+      let onConfigChange: (() => Promise<void>) | undefined;
+      const configUnsubscribe = jest.fn();
+      config.subscribe = onChange => {
+        onConfigChange = onChange as any;
+        return {
+          unsubscribe: configUnsubscribe,
+        };
+      };
+      const pluginScanner = new PluginScanner(
+        config,
+        logger,
+        backstageRootDirectory,
+        false,
+      );
+      await pluginScanner.trackChanges();
+
+      expect(onConfigChange).toBeDefined();
+
+      let scannedPlugins: ScannedPluginPackage[] =
+        await pluginScanner.scanRoot();
+      expect(scannedPlugins).toEqual([]);
+
+      const rootDirectorySubscriber = jest.fn(async () => {
+        scannedPlugins = await pluginScanner.scanRoot();
+      });
+      pluginScanner.subscribeToRootDirectoryChange(rootDirectorySubscriber);
+
+      await mkdir(
+        join(backstageRootDirectory, 'first-dir', 'test-backend-plugin'),
+      );
+      await writeFile(
+        join(
+          backstageRootDirectory,
+          'first-dir',
+          'test-backend-plugin',
+          'package.json',
+        ),
+        JSON.stringify({
+          name: 'test-backend-plugin-dynamic',
+          version: '0.0.0',
+          main: 'dist/index.cjs.js',
+          backstage: { role: 'backend-plugin' },
+        }),
+      );
+
+      await waitForExpect(() => {
+        expect(rootDirectorySubscriber).toHaveBeenCalledTimes(1);
+      });
+      rootDirectorySubscriber.mockClear();
+      await waitForExpect(() => {
+        expect(scannedPlugins).toEqual([
+          {
+            location: new URL(
+              `file://${backstageRootDirectory}/first-dir/test-backend-plugin`,
+            ),
+            manifest: {
+              backstage: {
+                role: 'backend-plugin',
+              },
+              main: 'dist/index.cjs.js',
+              name: 'test-backend-plugin-dynamic',
+              version: '0.0.0',
+            },
+          },
+        ]);
+      });
+
+      expect(logger.logs).toEqual<Logs>({
+        infos: [
+          {
+            message: `rootDirectory changed (addDir - ${backstageRootDirectory}/first-dir/test-backend-plugin): scanning plugins again`,
+          },
+          {
+            message: `rootDirectory changed (add - ${backstageRootDirectory}/first-dir/test-backend-plugin/package.json): scanning plugins again`,
+          },
+        ],
+      });
+      logger.logs = {};
+
+      getOptional.mockReturnValue({
+        rootDirectory: 'second-dir',
+      });
+      await onConfigChange!();
+
+      await waitForExpect(() => {
+        expect(rootDirectorySubscriber).toHaveBeenCalledTimes(1);
+      });
+      rootDirectorySubscriber.mockClear();
+      await waitForExpect(() => {
+        expect(scannedPlugins).toEqual([]);
+      });
+
+      expect(logger.logs).toEqual<Logs>({
+        infos: [
+          {
+            message: `rootDirectory changed in Config from '${backstageRootDirectory}/first-dir' to '${backstageRootDirectory}/second-dir'`,
+          },
+        ],
+      });
+      logger.logs = {};
+
+      await mkdir(
+        join(
+          backstageRootDirectory,
+          'second-dir',
+          'second-test-backend-plugin',
+        ),
+      );
+      await writeFile(
+        join(
+          backstageRootDirectory,
+          'second-dir',
+          'second-test-backend-plugin',
+          'package.json',
+        ),
+        JSON.stringify({
+          name: 'second-test-backend-plugin-dynamic',
+          version: '1.0.3',
+          main: 'dist/index.cjs.js',
+          backstage: { role: 'backend-plugin' },
+        }),
+      );
+
+      await waitForExpect(() => {
+        expect(rootDirectorySubscriber).toHaveBeenCalledTimes(1);
+      });
+      rootDirectorySubscriber.mockClear();
+      await waitForExpect(() => {
+        expect(scannedPlugins).toEqual([
+          {
+            location: new URL(
+              `file://${backstageRootDirectory}/second-dir/second-test-backend-plugin`,
+            ),
+            manifest: {
+              backstage: {
+                role: 'backend-plugin',
+              },
+              main: 'dist/index.cjs.js',
+              name: 'second-test-backend-plugin-dynamic',
+              version: '1.0.3',
+            },
+          },
+        ]);
+      });
+
+      expect(logger.logs).toEqual<Logs>({
+        infos: [
+          {
+            message: `rootDirectory changed (addDir - ${backstageRootDirectory}/second-dir/second-test-backend-plugin): scanning plugins again`,
+          },
+          {
+            message: `rootDirectory changed (add - ${backstageRootDirectory}/second-dir/second-test-backend-plugin/package.json): scanning plugins again`,
+          },
+        ],
+      });
+      logger.logs = {};
+
+      const debug = jest.spyOn(logger, 'debug');
+
+      // Check that not all file changes trigger a new scan of plugins
+      await mkdir(
+        join(
+          backstageRootDirectory,
+          'second-dir',
+          'second-test-backend-plugin',
+          'sub-directory',
+        ),
+      );
+      await waitForExpect(() => {
+        expect(debug).toHaveBeenCalledTimes(1);
+      });
+      await writeFile(
+        join(
+          backstageRootDirectory,
+          'second-dir',
+          'second-test-backend-plugin',
+          'not-package.json',
+        ),
+        'content',
+      );
+      await waitForExpect(() => {
+        expect(debug).toHaveBeenCalledTimes(2);
+      });
+      await rm(
+        join(
+          backstageRootDirectory,
+          'second-dir',
+          'second-test-backend-plugin',
+          'not-package.json',
+        ),
+      );
+      await waitForExpect(() => {
+        expect(debug).toHaveBeenCalledTimes(3);
+      });
+      await rm(
+        join(
+          backstageRootDirectory,
+          'second-dir',
+          'second-test-backend-plugin',
+          'sub-directory',
+        ),
+        { recursive: true },
+      );
+      await waitForExpect(() => {
+        expect(debug).toHaveBeenCalledTimes(4);
+      });
+
+      expect(logger.logs).toEqual<Logs>({
+        debugs: [
+          {
+            message: `rootDirectory changed (addDir - ${backstageRootDirectory}/second-dir/second-test-backend-plugin/sub-directory): no need to scan plugins again`,
+          },
+          {
+            message: `rootDirectory changed (add - ${backstageRootDirectory}/second-dir/second-test-backend-plugin/not-package.json): no need to scan plugins again`,
+          },
+          {
+            message: `rootDirectory changed (unlink - ${backstageRootDirectory}/second-dir/second-test-backend-plugin/not-package.json): no need to scan plugins again`,
+          },
+          {
+            message: `rootDirectory changed (unlinkDir - ${backstageRootDirectory}/second-dir/second-test-backend-plugin/sub-directory): no need to scan plugins again`,
+          },
+        ],
+      });
+      logger.logs = {};
+
+      // Now check that removal of some plugin home directory triggers a new scan of plugins
+
+      await rm(
+        join(
+          backstageRootDirectory,
+          'second-dir',
+          'second-test-backend-plugin',
+          'package.json',
+        ),
+      );
+      await waitForExpect(() => {
+        expect(rootDirectorySubscriber).toHaveBeenCalledTimes(1);
+      });
+      rootDirectorySubscriber.mockClear();
+      await waitForExpect(() => {
+        expect(scannedPlugins).toEqual([]);
+      });
+
+      expect(logger.logs).toEqual<Logs>({
+        infos: [
+          {
+            message: `rootDirectory changed (unlink - ${backstageRootDirectory}/second-dir/second-test-backend-plugin/package.json): scanning plugins again`,
+          },
+        ],
+        errors: [
+          {
+            message: `failed to load dynamic plugin manifest from '${backstageRootDirectory}/second-dir/second-test-backend-plugin'`,
+            meta: {
+              code: 'ENOENT',
+              errno: -2,
+              message: `ENOENT: no such file or directory, open '${backstageRootDirectory}/second-dir/second-test-backend-plugin/package.json'`,
+              name: 'Error',
+              path: `${backstageRootDirectory}/second-dir/second-test-backend-plugin/package.json`,
+              syscall: 'open',
+            },
+          },
+        ],
+      });
+      logger.logs = {};
+
+      await rm(
+        join(
+          backstageRootDirectory,
+          'second-dir',
+          'second-test-backend-plugin',
+        ),
+        { recursive: true },
+      );
+      await waitForExpect(() => {
+        expect(rootDirectorySubscriber).toHaveBeenCalledTimes(1);
+      });
+      rootDirectorySubscriber.mockClear();
+
+      expect(logger.logs).toEqual<Logs>({
+        infos: [
+          {
+            message: `rootDirectory changed (unlinkDir - ${backstageRootDirectory}/second-dir/second-test-backend-plugin): scanning plugins again`,
+          },
+        ],
+      });
+      logger.logs = {};
+
+      getOptional.mockReturnValue({
+        rootDirectory: '/somewhere-else/second-dir',
+      });
+      await onConfigChange!();
+
+      expect(logger.logs).toEqual<Logs>({
+        errors: [
+          {
+            message: 'failed to apply new config for dynamic plugins',
+            meta: {
+              message: `Dynamic plugins under '/somewhere-else/second-dir' cannot access backstage modules in '${backstageRootDirectory}/node_modules'.
+Please add '${backstageRootDirectory}/node_modules' to the 'NODE_PATH' when running the backstage backend.`,
+              name: 'Error',
+            },
+          },
+        ],
+      });
+    }, 120000);
+  });
+});
diff --git a/packages/backend-plugin-manager/src/scanner/plugin-scanner.test.ts b/packages/backend-plugin-manager/src/scanner/plugin-scanner.test.ts
new file mode 100644
index 0000000000..25f07baeaa
--- /dev/null
+++ b/packages/backend-plugin-manager/src/scanner/plugin-scanner.test.ts
@@ -0,0 +1,720 @@
+/*
+ * 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 { PluginScanner } from './plugin-scanner';
+import mockFs from 'mock-fs';
+import { JsonObject } from '@backstage/types';
+import { Logs, MockedLogger } from '../__testUtils__/testUtils';
+import { ConfigReader } from '@backstage/config';
+import path from 'path';
+import { ScannedPluginPackage } from './types';
+
+describe('plugin-scanner', () => {
+  const env = process.env;
+  beforeEach(() => {
+    jest.resetModules();
+  });
+
+  afterEach(() => {
+    mockFs.restore();
+    process.env = env;
+  });
+
+  describe('applyConfig', () => {
+    type TestCase = {
+      name: string;
+      backstageRoot?: string;
+      fileSystem?: any;
+      config: JsonObject;
+      environment?: { [key: string]: string };
+      expectedLogs?: Logs;
+      expectedRootDirectory?: string;
+      expectedError?: string;
+    };
+
+    it.each<TestCase>([
+      {
+        name: 'no dynamic plugins',
+        config: {},
+        expectedRootDirectory: undefined,
+        expectedLogs: {
+          infos: [
+            {
+              message: "'dynamicPlugins' config entry not found.",
+            },
+          ],
+        },
+      },
+      {
+        name: 'valid config with relative root directory path',
+        backstageRoot: '/backstageRoot',
+        fileSystem: {
+          '/backstageRoot': mockFs.directory({
+            items: {
+              'dist-dynamic': mockFs.directory(),
+            },
+          }),
+        },
+        config: {
+          dynamicPlugins: {
+            rootDirectory: 'dist-dynamic',
+          },
+        },
+        expectedRootDirectory: '/backstageRoot/dist-dynamic',
+      },
+      {
+        name: 'valid config with absolute root directory path inside the backstage root',
+        backstageRoot: '/backstageRoot',
+        fileSystem: {
+          '/backstageRoot': mockFs.directory({
+            items: {
+              'dist-dynamic': mockFs.directory(),
+            },
+          }),
+        },
+        config: {
+          dynamicPlugins: {
+            rootDirectory: '/backstageRoot/dist-dynamic',
+          },
+        },
+        expectedRootDirectory: '/backstageRoot/dist-dynamic',
+      },
+      {
+        name: 'valid config with absolute root directory path outside the backstage root',
+        backstageRoot: '/backstageRoot',
+        fileSystem: {
+          '/somewhere': mockFs.directory({
+            items: {
+              'dist-dynamic': mockFs.directory(),
+            },
+          }),
+        },
+        config: {
+          dynamicPlugins: {
+            rootDirectory: '/somewhere/dist-dynamic',
+          },
+        },
+        expectedError: `Dynamic plugins under '/somewhere/dist-dynamic' cannot access backstage modules in '/backstageRoot/node_modules'.
+Please add '/backstageRoot/node_modules' to the 'NODE_PATH' when running the backstage backend.`,
+      },
+      {
+        name: 'valid config with absolute root directory path outside the backstage root but with backstage root included in NODE_PATH',
+        backstageRoot: '/backstageRoot',
+        fileSystem: {
+          '/somewhere': mockFs.directory({
+            items: {
+              'dist-dynamic': mockFs.directory(),
+            },
+          }),
+        },
+        config: {
+          dynamicPlugins: {
+            rootDirectory: '/somewhere/dist-dynamic',
+          },
+        },
+        environment: {
+          NODE_PATH: `/somewhere-else${path.delimiter}/backstageRoot/node_modules${path.delimiter}/anywhere-else`,
+        },
+        expectedRootDirectory: '/somewhere/dist-dynamic',
+      },
+      {
+        name: 'invalid config: dynamicPlugins not an object',
+        config: {
+          dynamicPlugins: 1,
+        },
+        expectedLogs: {
+          warns: [
+            {
+              message: "'dynamicPlugins' config entry should be an object.",
+            },
+          ],
+        },
+      },
+      {
+        name: 'invalid config: rootDirectory not a string',
+        config: {
+          dynamicPlugins: {
+            rootDirectory: 1,
+          },
+        },
+        expectedLogs: {
+          warns: [
+            {
+              message:
+                "'dynamicPlugins.rootDirectory' config entry should be a string.",
+            },
+          ],
+        },
+      },
+      {
+        name: 'invalid config: no rootDirectory entry',
+        config: {
+          dynamicPlugins: {},
+        },
+        expectedLogs: {
+          warns: [
+            {
+              message:
+                "'dynamicPlugins' config entry does not contain the 'rootDirectory' field.",
+            },
+          ],
+        },
+      },
+      {
+        name: 'valid config pointing to a file instead of a directory',
+        backstageRoot: '/backstageRoot',
+        fileSystem: {
+          '/backstageRoot': mockFs.directory({
+            items: {
+              'dist-dynamic': mockFs.file(),
+            },
+          }),
+        },
+        config: {
+          dynamicPlugins: {
+            rootDirectory: 'dist-dynamic',
+          },
+        },
+        expectedError: 'Not a directory',
+      },
+    ])('$name', (tc: TestCase): void => {
+      if (tc.environment) {
+        process.env = {
+          ...env,
+          ...tc.environment,
+        };
+      }
+      const logger = new MockedLogger();
+      const backstageRoot = tc.backstageRoot ? tc.backstageRoot : '';
+      function toTest(): PluginScanner {
+        return new PluginScanner(
+          new ConfigReader(tc.config),
+          logger,
+          backstageRoot,
+        );
+      }
+      if (tc.fileSystem) {
+        mockFs(tc.fileSystem);
+      }
+      if (tc.expectedError) {
+        /* eslint-disable-next-line jest/no-conditional-expect */
+        expect(toTest).toThrow(tc.expectedError);
+        return;
+      }
+      const pluginScanner = toTest();
+      if (tc.expectedLogs) {
+        /* eslint-disable-next-line jest/no-conditional-expect */
+        expect(logger.logs).toEqual<Logs>(tc.expectedLogs);
+      } else {
+        /* eslint-disable-next-line jest/no-conditional-expect */
+        expect(logger.logs).toEqual<Logs>({});
+      }
+      expect(pluginScanner.rootDirectory).toEqual(tc.expectedRootDirectory);
+    });
+  });
+  describe('scanRoot', () => {
+    type TestCase = {
+      name: string;
+      preferAlpha?: boolean;
+      fileSystem?: any;
+      expectedLogs?: Logs;
+      expectedPluginPackages?: ScannedPluginPackage[];
+      expectedError?: string;
+    };
+
+    it.each<TestCase>([
+      {
+        name: 'dynamic plugins disabled',
+        expectedPluginPackages: [],
+        expectedLogs: {
+          infos: [
+            {
+              message: "'dynamicPlugins' config entry not found.",
+            },
+          ],
+        },
+      },
+      {
+        name: 'manifest found in directory',
+        fileSystem: {
+          '/backstageRoot': mockFs.directory({
+            items: {
+              'dist-dynamic': mockFs.directory({
+                items: {
+                  'test-backend-plugin': mockFs.directory({
+                    items: {
+                      'package.json': mockFs.file({
+                        content: JSON.stringify({
+                          name: 'test-backend-plugin-dynamic',
+                          version: '0.0.0',
+                          main: 'dist/index.cjs.js',
+                          backstage: { role: 'backend-plugin' },
+                        }),
+                      }),
+                    },
+                  }),
+                },
+              }),
+            },
+          }),
+        },
+        expectedPluginPackages: [
+          {
+            location: new URL(
+              'file:///backstageRoot/dist-dynamic/test-backend-plugin',
+            ),
+            manifest: {
+              name: 'test-backend-plugin-dynamic',
+              version: '0.0.0',
+              main: 'dist/index.cjs.js',
+              backstage: { role: 'backend-plugin' },
+            },
+          },
+        ],
+      },
+      {
+        name: 'backend plugin found in symlink',
+        fileSystem: {
+          '/backstageRoot': mockFs.directory({
+            items: {
+              'dist-dynamic': mockFs.directory({
+                items: {
+                  'test-backend-plugin': mockFs.symlink({
+                    path: '/somewhere-else/test-backend-plugin-target',
+                  }),
+                },
+              }),
+            },
+          }),
+          '/somewhere-else': mockFs.directory({
+            items: {
+              'test-backend-plugin-target': mockFs.directory({
+                items: {
+                  'package.json': mockFs.file({
+                    content: JSON.stringify({
+                      name: 'test-backend-plugin-dynamic',
+                      version: '0.0.0',
+                      main: 'dist/index.cjs.js',
+                      backstage: { role: 'backend-plugin' },
+                    }),
+                  }),
+                },
+              }),
+            },
+          }),
+        },
+        expectedPluginPackages: [
+          {
+            location: new URL(
+              'file:///backstageRoot/dist-dynamic/test-backend-plugin',
+            ),
+            manifest: {
+              name: 'test-backend-plugin-dynamic',
+              version: '0.0.0',
+              main: 'dist/index.cjs.js',
+              backstage: { role: 'backend-plugin' },
+            },
+          },
+        ],
+      },
+      {
+        name: 'ignored folder child: not a directory',
+        fileSystem: {
+          '/backstageRoot': mockFs.directory({
+            items: {
+              'dist-dynamic': mockFs.directory({
+                items: {
+                  'test-backend-plugin': mockFs.file({}),
+                },
+              }),
+            },
+          }),
+        },
+        expectedPluginPackages: [],
+        expectedLogs: {
+          infos: [
+            {
+              message:
+                "skipping '/backstageRoot/dist-dynamic/test-backend-plugin' since it is not a directory",
+            },
+          ],
+        },
+      },
+      {
+        name: 'ignored folder child symlink: target is not a directory',
+        fileSystem: {
+          '/backstageRoot': mockFs.directory({
+            items: {
+              'dist-dynamic': mockFs.directory({
+                items: {
+                  'test-backend-plugin': mockFs.symlink({
+                    path: '/somewhere-else/test-backend-plugin-target',
+                  }),
+                },
+              }),
+            },
+          }),
+          '/somewhere-else': mockFs.directory({
+            items: {
+              'test-backend-plugin-target': mockFs.file({}),
+            },
+          }),
+        },
+        expectedPluginPackages: [],
+        expectedLogs: {
+          infos: [
+            {
+              message:
+                "skipping '/backstageRoot/dist-dynamic/test-backend-plugin' since it is not a directory",
+            },
+          ],
+        },
+      },
+      {
+        name: 'alpha manifest available but not preferred',
+        preferAlpha: false,
+        fileSystem: {
+          '/backstageRoot': mockFs.directory({
+            items: {
+              'dist-dynamic': mockFs.directory({
+                items: {
+                  'test-backend-plugin': mockFs.directory({
+                    items: {
+                      'package.json': mockFs.file({
+                        content: JSON.stringify({
+                          name: 'test-backend-plugin-dynamic',
+                          version: '0.0.0',
+                          main: 'dist/index.cjs.js',
+                          backstage: { role: 'backend-plugin' },
+                        }),
+                      }),
+                      alpha: mockFs.directory({
+                        items: {
+                          'package.json': mockFs.file({
+                            content: JSON.stringify({
+                              name: 'test-backend-plugin-dynamic',
+                              version: '0.0.0',
+                              main: '../dist/alpha.cjs.js',
+                            }),
+                          }),
+                        },
+                      }),
+                    },
+                  }),
+                },
+              }),
+            },
+          }),
+        },
+        expectedPluginPackages: [
+          {
+            location: new URL(
+              'file:///backstageRoot/dist-dynamic/test-backend-plugin',
+            ),
+            manifest: {
+              name: 'test-backend-plugin-dynamic',
+              version: '0.0.0',
+              main: 'dist/index.cjs.js',
+              backstage: { role: 'backend-plugin' },
+            },
+          },
+        ],
+      },
+      {
+        name: 'alpha manifest preferred and found in directory',
+        preferAlpha: true,
+        fileSystem: {
+          '/backstageRoot': mockFs.directory({
+            items: {
+              'dist-dynamic': mockFs.directory({
+                items: {
+                  'test-backend-plugin': mockFs.directory({
+                    items: {
+                      'package.json': mockFs.file({
+                        content: JSON.stringify({
+                          name: 'test-backend-plugin-dynamic',
+                          version: '0.0.0',
+                          main: 'dist/index.cjs.js',
+                          backstage: { role: 'backend-plugin' },
+                        }),
+                      }),
+                      alpha: mockFs.directory({
+                        items: {
+                          'package.json': mockFs.file({
+                            content: JSON.stringify({
+                              name: 'test-backend-plugin-dynamic',
+                              version: '0.0.0',
+                              main: '../dist/alpha.cjs.js',
+                            }),
+                          }),
+                        },
+                      }),
+                    },
+                  }),
+                },
+              }),
+            },
+          }),
+        },
+        expectedPluginPackages: [
+          {
+            location: new URL(
+              'file:///backstageRoot/dist-dynamic/test-backend-plugin/alpha',
+            ),
+            manifest: {
+              name: 'test-backend-plugin-dynamic',
+              version: '0.0.0',
+              main: '../dist/alpha.cjs.js',
+              backstage: { role: 'backend-plugin' },
+            },
+          },
+        ],
+      },
+      {
+        name: 'alpha manifest preferred but skipped because not a directory',
+        preferAlpha: true,
+        fileSystem: {
+          '/backstageRoot': mockFs.directory({
+            items: {
+              'dist-dynamic': mockFs.directory({
+                items: {
+                  'test-backend-plugin': mockFs.directory({
+                    items: {
+                      'package.json': mockFs.file({
+                        content: JSON.stringify({
+                          name: 'test-backend-plugin-dynamic',
+                          version: '0.0.0',
+                          main: 'dist/index.cjs.js',
+                          backstage: { role: 'backend-plugin' },
+                        }),
+                      }),
+                      alpha: mockFs.file({}),
+                    },
+                  }),
+                },
+              }),
+            },
+          }),
+        },
+        expectedPluginPackages: [
+          {
+            location: new URL(
+              'file:///backstageRoot/dist-dynamic/test-backend-plugin',
+            ),
+            manifest: {
+              name: 'test-backend-plugin-dynamic',
+              version: '0.0.0',
+              main: 'dist/index.cjs.js',
+              backstage: { role: 'backend-plugin' },
+            },
+          },
+        ],
+        expectedLogs: {
+          warns: [
+            {
+              message:
+                "skipping '/backstageRoot/dist-dynamic/test-backend-plugin/alpha' since it is not a directory",
+            },
+          ],
+        },
+      },
+      {
+        name: 'invalid alpha package.json',
+        preferAlpha: true,
+        fileSystem: {
+          '/backstageRoot': mockFs.directory({
+            items: {
+              'dist-dynamic': mockFs.directory({
+                items: {
+                  'test-backend-plugin': mockFs.directory({
+                    items: {
+                      'package.json': mockFs.file({
+                        content: JSON.stringify({
+                          name: 'test-backend-plugin-dynamic',
+                          version: '0.0.0',
+                          main: 'dist/index.cjs.js',
+                          backstage: { role: 'backend-plugin' },
+                        }),
+                      }),
+                      alpha: mockFs.directory({
+                        items: {
+                          'package.json': mockFs.file({
+                            content: "invalid json content, 1, '",
+                          }),
+                        },
+                      }),
+                    },
+                  }),
+                },
+              }),
+            },
+          }),
+        },
+        expectedPluginPackages: [],
+        expectedLogs: {
+          errors: [
+            {
+              message:
+                "failed to load dynamic plugin manifest from '/backstageRoot/dist-dynamic/test-backend-plugin/alpha'",
+              meta: {
+                name: 'SyntaxError',
+                message: 'Unexpected token i in JSON at position 0',
+              },
+            },
+          ],
+        },
+      },
+      {
+        name: 'invalid package.json',
+        fileSystem: {
+          '/backstageRoot': mockFs.directory({
+            items: {
+              'dist-dynamic': mockFs.directory({
+                items: {
+                  'test-backend-plugin': mockFs.directory({
+                    items: {
+                      'package.json': mockFs.file({
+                        content: "invalid json content, 1, '",
+                      }),
+                    },
+                  }),
+                },
+              }),
+            },
+          }),
+        },
+        expectedPluginPackages: [],
+        expectedLogs: {
+          errors: [
+            {
+              message:
+                "failed to load dynamic plugin manifest from '/backstageRoot/dist-dynamic/test-backend-plugin'",
+              meta: {
+                name: 'SyntaxError',
+                message: 'Unexpected token i in JSON at position 0',
+              },
+            },
+          ],
+        },
+      },
+      {
+        name: 'missing backstage role in package.json',
+        fileSystem: {
+          '/backstageRoot': mockFs.directory({
+            items: {
+              'dist-dynamic': mockFs.directory({
+                items: {
+                  'test-backend-plugin': mockFs.directory({
+                    items: {
+                      'package.json': mockFs.file({
+                        content: JSON.stringify({
+                          name: 'test-backend-plugin-dynamic',
+                          version: '0.0.0',
+                          main: 'dist/index.cjs.js',
+                        }),
+                      }),
+                    },
+                  }),
+                },
+              }),
+            },
+          }),
+        },
+        expectedPluginPackages: [],
+        expectedLogs: {
+          errors: [
+            {
+              message:
+                "failed to load dynamic plugin manifest from '/backstageRoot/dist-dynamic/test-backend-plugin'",
+              meta: {
+                name: 'Error',
+                message: "field 'backstage.role' not found in 'package.json'",
+              },
+            },
+          ],
+        },
+      },
+      {
+        name: 'missing main field in package.json',
+        fileSystem: {
+          '/backstageRoot': mockFs.directory({
+            items: {
+              'dist-dynamic': mockFs.directory({
+                items: {
+                  'test-backend-plugin': mockFs.directory({
+                    items: {
+                      'package.json': mockFs.file({
+                        content: JSON.stringify({
+                          name: 'test-backend-plugin-dynamic',
+                          version: '0.0.0',
+                          backstage: { role: 'backend-plugin' },
+                        }),
+                      }),
+                    },
+                  }),
+                },
+              }),
+            },
+          }),
+        },
+        expectedPluginPackages: [],
+        expectedLogs: {
+          errors: [
+            {
+              message:
+                "failed to load dynamic plugin manifest from '/backstageRoot/dist-dynamic/test-backend-plugin'",
+              meta: {
+                name: 'Error',
+                message: "field 'main' not found in 'package.json'",
+              },
+            },
+          ],
+        },
+      },
+    ])('$name', async (tc: TestCase): Promise<void> => {
+      const logger = new MockedLogger();
+      const backstageRoot = '/backstageRoot';
+      async function toTest(): Promise<ScannedPluginPackage[]> {
+        const pluginScanner = new PluginScanner(
+          new ConfigReader(
+            tc.fileSystem
+              ? {
+                  dynamicPlugins: {
+                    rootDirectory: 'dist-dynamic',
+                  },
+                }
+              : {},
+          ),
+          logger,
+          backstageRoot,
+          tc.preferAlpha === undefined ? false : tc.preferAlpha,
+        );
+        return await pluginScanner.scanRoot();
+      }
+      if (tc.fileSystem) {
+        mockFs(tc.fileSystem);
+      }
+      if (tc.expectedError) {
+        /* eslint-disable-next-line jest/no-conditional-expect */
+        expect(toTest).toThrow(tc.expectedError);
+        return;
+      }
+      const plugins = await toTest();
+      expect(logger.logs).toEqual<Logs>(tc.expectedLogs ? tc.expectedLogs : {});
+      expect(plugins).toEqual(tc.expectedPluginPackages);
+    });
+  });
+});
diff --git a/packages/backend-plugin-manager/src/scanner/plugin-scanner.ts b/packages/backend-plugin-manager/src/scanner/plugin-scanner.ts
new file mode 100644
index 0000000000..bdcf786619
--- /dev/null
+++ b/packages/backend-plugin-manager/src/scanner/plugin-scanner.ts
@@ -0,0 +1,304 @@
+/*
+ * 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 { ScannedPluginPackage, ScannedPluginManifest } from './types';
+import * as fs from 'fs/promises';
+import { Stats, lstatSync } from 'fs';
+import * as chokidar from 'chokidar';
+import * as path from 'path';
+import * as url from 'url';
+import debounce from 'lodash/debounce';
+import { PackagePlatform, PackageRoles } from '@backstage/cli-node';
+import { LoggerService } from '@backstage/backend-plugin-api';
+
+export class PluginScanner {
+  private readonly logger: LoggerService;
+  private backstageRoot: string;
+  readonly #config: Config;
+  private _rootDirectory?: string;
+  private readonly preferAlpha: boolean;
+  private configUnsubscribe?: () => void;
+  private rootDirectoryWatcher?: chokidar.FSWatcher;
+  private subscribers: (() => void)[] = [];
+
+  constructor(
+    config: Config,
+    logger: LoggerService,
+    backstageRoot: string,
+    preferAlpha: boolean = false,
+  ) {
+    this.backstageRoot = backstageRoot;
+    this.logger = logger;
+    this.preferAlpha = preferAlpha;
+    this.#config = config;
+
+    this.applyConfig();
+  }
+
+  subscribeToRootDirectoryChange(subscriber: () => void) {
+    this.subscribers.push(subscriber);
+  }
+
+  get rootDirectory(): string | undefined {
+    return this._rootDirectory;
+  }
+
+  private applyConfig(): void | never {
+    const dynamicPlugins = this.#config.getOptional('dynamicPlugins');
+    if (!dynamicPlugins) {
+      this.logger.info("'dynamicPlugins' config entry not found.");
+      this._rootDirectory = undefined;
+      return;
+    }
+    if (typeof dynamicPlugins !== 'object') {
+      this.logger.warn("'dynamicPlugins' config entry should be an object.");
+      this._rootDirectory = undefined;
+      return;
+    }
+    if (!('rootDirectory' in dynamicPlugins)) {
+      this.logger.warn(
+        "'dynamicPlugins' config entry does not contain the 'rootDirectory' field.",
+      );
+      this._rootDirectory = undefined;
+      return;
+    }
+    if (typeof dynamicPlugins.rootDirectory !== 'string') {
+      this.logger.warn(
+        "'dynamicPlugins.rootDirectory' config entry should be a string.",
+      );
+      this._rootDirectory = undefined;
+      return;
+    }
+
+    const dynamicPluginsRootPath = path.isAbsolute(dynamicPlugins.rootDirectory)
+      ? dynamicPlugins.rootDirectory
+      : path.resolve(this.backstageRoot, dynamicPlugins.rootDirectory);
+
+    if (
+      !path
+        .dirname(path.normalize(dynamicPluginsRootPath))
+        .startsWith(path.normalize(this.backstageRoot))
+    ) {
+      const nodePath = process.env.NODE_PATH;
+      const backstageNodeModules = path.resolve(
+        this.backstageRoot,
+        'node_modules',
+      );
+      if (
+        !nodePath ||
+        !nodePath.split(path.delimiter).includes(backstageNodeModules)
+      ) {
+        throw new Error(
+          `Dynamic plugins under '${dynamicPluginsRootPath}' cannot access backstage modules in '${backstageNodeModules}'.\n` +
+            `Please add '${backstageNodeModules}' to the 'NODE_PATH' when running the backstage backend.`,
+        );
+      }
+    }
+    if (!lstatSync(dynamicPluginsRootPath).isDirectory()) {
+      throw new Error('Not a directory');
+    }
+
+    this._rootDirectory = dynamicPluginsRootPath;
+  }
+
+  async scanRoot(): Promise<ScannedPluginPackage[]> {
+    if (!this._rootDirectory) {
+      return [];
+    }
+
+    const dynamicPluginsLocation = this._rootDirectory;
+    const scannedPlugins: ScannedPluginPackage[] = [];
+    for (const dirEnt of await fs.readdir(dynamicPluginsLocation, {
+      withFileTypes: true,
+    })) {
+      const pluginDir = dirEnt;
+      const pluginHome = path.normalize(
+        path.resolve(dynamicPluginsLocation, pluginDir.name),
+      );
+      if (dirEnt.isSymbolicLink()) {
+        if (!(await fs.lstat(await fs.readlink(pluginHome))).isDirectory()) {
+          this.logger.info(
+            `skipping '${pluginHome}' since it is not a directory`,
+          );
+          continue;
+        }
+      } else if (!dirEnt.isDirectory()) {
+        this.logger.info(
+          `skipping '${pluginHome}' since it is not a directory`,
+        );
+        continue;
+      }
+
+      let scannedPlugin: ScannedPluginPackage;
+      let platform: PackagePlatform;
+      try {
+        scannedPlugin = await this.scanDir(pluginHome);
+        if (!scannedPlugin.manifest.main) {
+          throw new Error("field 'main' not found in 'package.json'");
+        }
+        if (scannedPlugin.manifest.backstage?.role) {
+          platform = PackageRoles.getRoleInfo(
+            scannedPlugin.manifest.backstage.role,
+          ).platform;
+        } else {
+          throw new Error("field 'backstage.role' not found in 'package.json'");
+        }
+      } catch (e) {
+        this.logger.error(
+          `failed to load dynamic plugin manifest from '${pluginHome}'`,
+          e,
+        );
+        continue;
+      }
+
+      if (platform === 'node') {
+        if (this.preferAlpha) {
+          const pluginHomeAlpha = path.resolve(pluginHome, 'alpha');
+          if ((await fs.lstat(pluginHomeAlpha)).isDirectory()) {
+            const backstage = scannedPlugin.manifest.backstage;
+            try {
+              scannedPlugin = await this.scanDir(pluginHomeAlpha);
+            } catch (e) {
+              this.logger.error(
+                `failed to load dynamic plugin manifest from '${pluginHomeAlpha}'`,
+                e,
+              );
+              continue;
+            }
+            scannedPlugin.manifest.backstage = backstage;
+          } else {
+            this.logger.warn(
+              `skipping '${pluginHomeAlpha}' since it is not a directory`,
+            );
+          }
+        }
+      }
+
+      scannedPlugins.push(scannedPlugin);
+    }
+    return scannedPlugins;
+  }
+
+  private async scanDir(pluginHome: string): Promise<ScannedPluginPackage> {
+    const manifestFile = path.resolve(pluginHome, 'package.json');
+    const content = await fs.readFile(manifestFile);
+    const manifest: ScannedPluginManifest = JSON.parse(content.toString());
+    return {
+      location: url.pathToFileURL(pluginHome),
+      manifest: manifest,
+    };
+  }
+
+  async trackChanges(): Promise<void> {
+    const setupRootDirectoryWatcher = async (): Promise<void> => {
+      return new Promise((resolve, reject) => {
+        if (!this._rootDirectory) {
+          resolve();
+          return;
+        }
+        const callSubscribers = debounce(() => {
+          this.subscribers.forEach(s => s());
+        }, 500);
+        let ready = false;
+        this.rootDirectoryWatcher = chokidar
+          .watch(this._rootDirectory, {
+            ignoreInitial: true,
+            followSymlinks: true,
+          })
+          .on(
+            'all',
+            (
+              event: 'add' | 'addDir' | 'change' | 'unlink' | 'unlinkDir',
+              eventPath: string,
+              _: Stats | undefined,
+            ): void => {
+              if (
+                (['addDir', 'unlinkDir'].includes(event) &&
+                  path.dirname(eventPath) === this._rootDirectory) ||
+                (['add', 'unlink', 'change'].includes(event) &&
+                  path.dirname(path.dirname(eventPath)) ===
+                    this._rootDirectory &&
+                  path.basename(eventPath) === 'package.json')
+              ) {
+                this.logger.info(
+                  `rootDirectory changed (${event} - ${eventPath}): scanning plugins again`,
+                );
+                callSubscribers();
+              } else {
+                this.logger.debug(
+                  `rootDirectory changed (${event} - ${eventPath}): no need to scan plugins again`,
+                );
+              }
+            },
+          )
+          .on('error', (error: Error) => {
+            this.logger.error(
+              `error while watching '${this.rootDirectory}'`,
+              error,
+            );
+            if (!ready) {
+              reject(error);
+            }
+          })
+          .on('ready', () => {
+            ready = true;
+            resolve();
+          });
+      });
+    };
+
+    await setupRootDirectoryWatcher();
+    if (this.#config.subscribe) {
+      const { unsubscribe } = this.#config.subscribe(
+        async (): Promise<void> => {
+          const oldRootDirectory = this._rootDirectory;
+          try {
+            this.applyConfig();
+          } catch (e) {
+            this.logger.error(
+              'failed to apply new config for dynamic plugins',
+              e,
+            );
+          }
+          if (oldRootDirectory !== this._rootDirectory) {
+            this.logger.info(
+              `rootDirectory changed in Config from '${oldRootDirectory}' to '${this._rootDirectory}'`,
+            );
+            this.subscribers.forEach(s => s());
+            if (this.rootDirectoryWatcher) {
+              await this.rootDirectoryWatcher.close();
+            }
+            await setupRootDirectoryWatcher();
+          }
+        },
+      );
+      this.configUnsubscribe = unsubscribe;
+    }
+  }
+
+  async untrackChanges() {
+    if (this.rootDirectoryWatcher) {
+      this.rootDirectoryWatcher.close();
+    }
+    if (this.configUnsubscribe) {
+      this.configUnsubscribe();
+    }
+  }
+
+  destructor() {
+    this.untrackChanges();
+  }
+}
diff --git a/packages/backend-plugin-manager/src/scanner/types.ts b/packages/backend-plugin-manager/src/scanner/types.ts
new file mode 100644
index 0000000000..b456ffeea1
--- /dev/null
+++ b/packages/backend-plugin-manager/src/scanner/types.ts
@@ -0,0 +1,34 @@
+/*
+ * 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 { BackstagePackageJson } from '@backstage/cli-node';
+
+/**
+ * @public
+ */
+export interface ScannedPluginPackage {
+  location: URL;
+  manifest: ScannedPluginManifest;
+}
+
+/**
+ * @public
+ */
+export type ScannedPluginManifest = BackstagePackageJson &
+  Required<Pick<BackstagePackageJson, 'main'>> &
+  Required<Pick<BackstagePackageJson, 'backstage'>> & {
+    backstage: Required<BackstagePackageJson['backstage']>;
+  };
diff --git a/packages/backend-tasks/CHANGELOG.md b/packages/backend-tasks/CHANGELOG.md
index 05e51c661c..f3cd349f9f 100644
--- a/packages/backend-tasks/CHANGELOG.md
+++ b/packages/backend-tasks/CHANGELOG.md
@@ -1,5 +1,57 @@
 # @backstage/backend-tasks
 
+## 0.5.8-next.2
+
+### Patch Changes
+
+- 814feeed7343: Update to handle invalid luxon values
+- Updated dependencies
+  - @backstage/config@1.1.0-next.1
+  - @backstage/backend-common@0.19.5-next.2
+  - @backstage/errors@1.2.1
+  - @backstage/types@1.1.0
+
+## 0.5.8-next.1
+
+### Patch Changes
+
+- 62f448edb0b5: Use `readDurationFromConfig` from the config package
+- Updated dependencies
+  - @backstage/config@1.1.0-next.0
+  - @backstage/backend-common@0.19.5-next.1
+  - @backstage/errors@1.2.1
+  - @backstage/types@1.1.0
+
+## 0.5.7-next.0
+
+### Patch Changes
+
+- cfc3ca6ce060: Changes needed to support MySQL
+- Updated dependencies
+  - @backstage/backend-common@0.19.4-next.0
+  - @backstage/config@1.0.8
+  - @backstage/errors@1.2.1
+  - @backstage/types@1.1.0
+
+## 0.5.5
+
+### Patch Changes
+
+- dfd1b6b2fc33: Make `readTaskScheduleDefinitionFromConfig` properly handle bad inputs
+- Updated dependencies
+  - @backstage/backend-common@0.19.2
+  - @backstage/config@1.0.8
+  - @backstage/errors@1.2.1
+  - @backstage/types@1.1.0
+
+## 0.5.5-next.2
+
+### Patch Changes
+
+- dfd1b6b2fc33: Make `readTaskScheduleDefinitionFromConfig` properly handle bad inputs
+- Updated dependencies
+  - @backstage/backend-common@0.19.2-next.2
+
 ## 0.5.5-next.1
 
 ### Patch Changes
diff --git a/packages/backend-tasks/catalog-info.yaml b/packages/backend-tasks/catalog-info.yaml
new file mode 100644
index 0000000000..f9b81066e6
--- /dev/null
+++ b/packages/backend-tasks/catalog-info.yaml
@@ -0,0 +1,10 @@
+apiVersion: backstage.io/v1alpha1
+kind: Component
+metadata:
+  name: backstage-backend-tasks
+  title: '@backstage/backend-tasks'
+  description: Common distributed task management library for Backstage backends
+spec:
+  lifecycle: experimental
+  type: backstage-node-library
+  owner: maintainers
diff --git a/packages/backend-tasks/migrations/20210928160613_init.js b/packages/backend-tasks/migrations/20210928160613_init.js
index 21d80ae24c..f9900cab11 100644
--- a/packages/backend-tasks/migrations/20210928160613_init.js
+++ b/packages/backend-tasks/migrations/20210928160613_init.js
@@ -26,7 +26,7 @@ exports.up = async function up(knex) {
   await knex.schema.createTable('backstage_backend_tasks__tasks', table => {
     table.comment('Tasks used for scheduling work on multiple workers');
     table
-      .text('id')
+      .string('id')
       .primary()
       .notNullable()
       .comment('The unique ID of this particular task');
diff --git a/packages/backend-tasks/package.json b/packages/backend-tasks/package.json
index 9dd2c9e557..ecc4bf3d35 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.5.5-next.1",
+  "version": "0.5.8-next.2",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "publishConfig": {
diff --git a/packages/backend-tasks/src/migrations.test.ts b/packages/backend-tasks/src/migrations.test.ts
index 7e471a1c16..1d701c971d 100644
--- a/packages/backend-tasks/src/migrations.test.ts
+++ b/packages/backend-tasks/src/migrations.test.ts
@@ -43,7 +43,7 @@ jest.setTimeout(60_000);
 
 describe('migrations', () => {
   const databases = TestDatabases.create({
-    ids: ['POSTGRES_13', 'POSTGRES_9', 'SQLITE_3'],
+    ids: ['POSTGRES_13', 'POSTGRES_9', 'MYSQL_8', 'SQLITE_3'],
   });
 
   it.each(databases.eachSupportedId())(
diff --git a/packages/backend-tasks/src/setupTests.ts b/packages/backend-tasks/src/setupTests.ts
index d3232290a7..5245d37c26 100644
--- a/packages/backend-tasks/src/setupTests.ts
+++ b/packages/backend-tasks/src/setupTests.ts
@@ -14,4 +14,7 @@
  * limitations under the License.
  */
 
-export {};
+import { Settings } from 'luxon';
+
+// TS still thinks that methods can return null / placeholders, but we still want to throw as soon as possible when things go wrong
+Settings.throwOnInvalid = true;
diff --git a/packages/backend-tasks/src/tasks/PluginTaskSchedulerImpl.ts b/packages/backend-tasks/src/tasks/PluginTaskSchedulerImpl.ts
index 253d7869df..b9ac80cb47 100644
--- a/packages/backend-tasks/src/tasks/PluginTaskSchedulerImpl.ts
+++ b/packages/backend-tasks/src/tasks/PluginTaskSchedulerImpl.ts
@@ -112,9 +112,15 @@ export function parseDuration(
     return frequency.cron;
   }
 
-  if (Duration.isDuration(frequency)) {
-    return frequency.toISO();
+  const parsed = Duration.isDuration(frequency)
+    ? frequency
+    : Duration.fromObject(frequency);
+
+  if (!parsed.isValid) {
+    throw new Error(
+      `Invalid duration, ${parsed.invalidReason}: ${parsed.invalidExplanation}`,
+    );
   }
 
-  return Duration.fromObject(frequency).toISO();
+  return parsed.toISO()!;
 }
diff --git a/packages/backend-tasks/src/tasks/PluginTaskSchedulerJanitor.test.ts b/packages/backend-tasks/src/tasks/PluginTaskSchedulerJanitor.test.ts
index 5b5d592b7b..efbad2e8b6 100644
--- a/packages/backend-tasks/src/tasks/PluginTaskSchedulerJanitor.test.ts
+++ b/packages/backend-tasks/src/tasks/PluginTaskSchedulerJanitor.test.ts
@@ -42,6 +42,7 @@ describe('PluginTaskSchedulerJanitor', () => {
       'POSTGRES_13',
       'POSTGRES_9',
       'SQLITE_3',
+      'MYSQL_8',
     ],
   });
 
diff --git a/packages/backend-tasks/src/tasks/TaskScheduler.test.ts b/packages/backend-tasks/src/tasks/TaskScheduler.test.ts
index 89eff433db..6aa77dd7fe 100644
--- a/packages/backend-tasks/src/tasks/TaskScheduler.test.ts
+++ b/packages/backend-tasks/src/tasks/TaskScheduler.test.ts
@@ -25,7 +25,7 @@ jest.setTimeout(60_000);
 describe('TaskScheduler', () => {
   const logger = getVoidLogger();
   const databases = TestDatabases.create({
-    ids: ['POSTGRES_13', 'POSTGRES_9', 'SQLITE_3'],
+    ids: ['POSTGRES_13', 'POSTGRES_9', 'SQLITE_3', 'MYSQL_8'],
   });
 
   async function createDatabase(
diff --git a/packages/backend-tasks/src/tasks/TaskWorker.test.ts b/packages/backend-tasks/src/tasks/TaskWorker.test.ts
index fa2577ce53..70be2bf415 100644
--- a/packages/backend-tasks/src/tasks/TaskWorker.test.ts
+++ b/packages/backend-tasks/src/tasks/TaskWorker.test.ts
@@ -28,7 +28,7 @@ jest.setTimeout(60_000);
 describe('TaskWorker', () => {
   const logger = getVoidLogger();
   const databases = TestDatabases.create({
-    ids: ['POSTGRES_13', 'POSTGRES_9', 'SQLITE_3'],
+    ids: ['POSTGRES_13', 'POSTGRES_9', 'SQLITE_3', 'MYSQL_8'],
   });
 
   beforeEach(() => {
@@ -47,8 +47,8 @@ describe('TaskWorker', () => {
       const settings: TaskSettingsV2 = {
         version: 2,
         cadence: '*/2 * * * * *',
-        initialDelayDuration: Duration.fromObject({ seconds: 1 }).toISO(),
-        timeoutAfterDuration: Duration.fromObject({ minutes: 1 }).toISO(),
+        initialDelayDuration: Duration.fromObject({ seconds: 1 }).toISO()!,
+        timeoutAfterDuration: Duration.fromObject({ minutes: 1 }).toISO()!,
       };
 
       const worker = new TaskWorker('task1', fn, knex, logger);
@@ -131,7 +131,7 @@ describe('TaskWorker', () => {
         version: 2,
         initialDelayDuration: undefined,
         cadence: '* * * * * *',
-        timeoutAfterDuration: Duration.fromMillis(60000).toISO(),
+        timeoutAfterDuration: Duration.fromMillis(60000).toISO()!,
       };
       const checkFrequency = Duration.fromObject({ milliseconds: 100 });
       const worker = new TaskWorker('task1', fn, knex, logger, checkFrequency);
@@ -154,7 +154,7 @@ describe('TaskWorker', () => {
         version: 2,
         initialDelayDuration: undefined,
         cadence: '* * * * * *',
-        timeoutAfterDuration: Duration.fromMillis(60000).toISO(),
+        timeoutAfterDuration: Duration.fromMillis(60000).toISO()!,
       };
       const checkFrequency = Duration.fromObject({ milliseconds: 100 });
       const worker = new TaskWorker('task1', fn, knex, logger, checkFrequency);
@@ -179,7 +179,7 @@ describe('TaskWorker', () => {
         version: 2,
         initialDelayDuration: undefined,
         cadence: '* * * * * *',
-        timeoutAfterDuration: Duration.fromMillis(60000).toISO(),
+        timeoutAfterDuration: Duration.fromMillis(60000).toISO()!,
       };
 
       const worker = new TaskWorker('task1', fn, knex, logger);
@@ -235,7 +235,7 @@ describe('TaskWorker', () => {
         version: 2,
         initialDelayDuration: undefined,
         cadence: '* * * * * *',
-        timeoutAfterDuration: Duration.fromMillis(60000).toISO(),
+        timeoutAfterDuration: Duration.fromMillis(60000).toISO()!,
       };
 
       const worker1 = new TaskWorker('task1', fn, knex, logger);
diff --git a/packages/backend-tasks/src/tasks/TaskWorker.ts b/packages/backend-tasks/src/tasks/TaskWorker.ts
index 483fb1a02d..a03d1ec058 100644
--- a/packages/backend-tasks/src/tasks/TaskWorker.ts
+++ b/packages/backend-tasks/src/tasks/TaskWorker.ts
@@ -175,11 +175,15 @@ export class TaskWorker {
       const time = new CronTime(settings.cadence)
         .sendAt()
         .minus({ seconds: 1 }) // immediately, if "* * * * * *"
-        .toUTC()
-        .toISO();
-      startAt = this.knex.client.config.client.includes('sqlite3')
-        ? this.knex.raw('datetime(?)', [time])
-        : this.knex.raw(`?`, [time]);
+        .toUTC();
+
+      if (this.knex.client.config.client.includes('sqlite3')) {
+        startAt = this.knex.raw('datetime(?)', [time.toISO()]);
+      } else if (this.knex.client.config.client.includes('mysql')) {
+        startAt = this.knex.raw(`?`, [time.toSQL({ includeOffset: false })]);
+      } else {
+        startAt = this.knex.raw(`?`, [time.toISO()]);
+      }
     } else {
       startAt = this.knex.fn.now();
     }
@@ -279,11 +283,16 @@ export class TaskWorker {
 
     let nextRun: Knex.Raw;
     if (isCron) {
-      const time = new CronTime(settings.cadence).sendAt().toUTC().toISO();
+      const time = new CronTime(settings.cadence).sendAt().toUTC();
       this.logger.debug(`task: ${this.taskId} will next occur around ${time}`);
-      nextRun = this.knex.client.config.client.includes('sqlite3')
-        ? this.knex.raw('datetime(?)', [time])
-        : this.knex.raw(`?`, [time]);
+
+      if (this.knex.client.config.client.includes('sqlite3')) {
+        nextRun = this.knex.raw('datetime(?)', [time.toISO()]);
+      } else if (this.knex.client.config.client.includes('mysql')) {
+        nextRun = this.knex.raw(`?`, [time.toSQL({ includeOffset: false })]);
+      } else {
+        nextRun = this.knex.raw(`?`, [time.toISO()]);
+      }
     } else {
       const dt = Duration.fromISO(settings.cadence).as('seconds');
       this.logger.debug(
diff --git a/packages/backend-tasks/src/tasks/readTaskScheduleDefinitionFromConfig.test.ts b/packages/backend-tasks/src/tasks/readTaskScheduleDefinitionFromConfig.test.ts
index 21f51954b5..c52d59b016 100644
--- a/packages/backend-tasks/src/tasks/readTaskScheduleDefinitionFromConfig.test.ts
+++ b/packages/backend-tasks/src/tasks/readTaskScheduleDefinitionFromConfig.test.ts
@@ -85,7 +85,7 @@ describe('readTaskScheduleDefinitionFromConfig', () => {
     });
 
     expect(() => readTaskScheduleDefinitionFromConfig(config)).toThrow(
-      'HumanDuration needs at least one of',
+      "Failed to read duration from config at 'frequency', Error: Needs one or more of 'years', 'months', 'weeks', 'days', 'hours', 'minutes', 'seconds', 'milliseconds'",
     );
   });
 
@@ -98,7 +98,7 @@ describe('readTaskScheduleDefinitionFromConfig', () => {
     });
 
     expect(() => readTaskScheduleDefinitionFromConfig(config)).toThrow(
-      "Unable to convert config value for key 'frequency.minutes' in 'mock-config' to a number",
+      "Failed to read duration from config, Error: Unable to convert config value for key 'frequency.minutes' in 'mock-config' to a number",
     );
   });
 
@@ -112,7 +112,7 @@ describe('readTaskScheduleDefinitionFromConfig', () => {
     });
 
     expect(() => readTaskScheduleDefinitionFromConfig(config)).toThrow(
-      'HumanDuration does not contain properties: invalid',
+      "Failed to read duration from config at 'frequency', Error: Unknown property 'invalid'; expected one or more of 'years', 'months', 'weeks', 'days', 'hours', 'minutes', 'seconds', 'milliseconds'",
     );
   });
 
diff --git a/packages/backend-tasks/src/tasks/readTaskScheduleDefinitionFromConfig.ts b/packages/backend-tasks/src/tasks/readTaskScheduleDefinitionFromConfig.ts
index b31cf68f74..8053936263 100644
--- a/packages/backend-tasks/src/tasks/readTaskScheduleDefinitionFromConfig.ts
+++ b/packages/backend-tasks/src/tasks/readTaskScheduleDefinitionFromConfig.ts
@@ -14,54 +14,11 @@
  * limitations under the License.
  */
 
-import { Config } from '@backstage/config';
+import { Config, readDurationFromConfig } from '@backstage/config';
 import { HumanDuration } from '@backstage/types';
 import { TaskScheduleDefinition } from './types';
 import { Duration } from 'luxon';
 
-const propsOfHumanDuration = [
-  'years',
-  'months',
-  'weeks',
-  'days',
-  'hours',
-  'minutes',
-  'seconds',
-  'milliseconds',
-];
-
-function convertToHumanDuration(config: Config, key: string): HumanDuration {
-  // Ensures that the root is an object
-  const root = config.getConfig(key);
-
-  const result: Record<string, number> = {};
-  let found = false;
-  for (const prop of propsOfHumanDuration) {
-    const value = root.getOptionalNumber(prop);
-    if (value !== undefined) {
-      result[prop] = value;
-      found = true;
-    }
-  }
-
-  if (!found) {
-    throw new Error(
-      `HumanDuration needs at least one of: ${propsOfHumanDuration}`,
-    );
-  }
-
-  const invalidProps = root
-    .keys()
-    .filter(prop => !propsOfHumanDuration.includes(prop));
-  if (invalidProps.length > 0) {
-    throw new Error(
-      `HumanDuration does not contain properties: ${invalidProps}`,
-    );
-  }
-
-  return result as HumanDuration;
-}
-
 function readDuration(config: Config, key: string): Duration | HumanDuration {
   if (typeof config.get(key) === 'string') {
     const value = config.getString(key);
@@ -72,7 +29,7 @@ function readDuration(config: Config, key: string): Duration | HumanDuration {
     return duration;
   }
 
-  return convertToHumanDuration(config, key);
+  return readDurationFromConfig(config, { key });
 }
 
 function readCronOrDuration(
diff --git a/packages/backend-test-utils/CHANGELOG.md b/packages/backend-test-utils/CHANGELOG.md
index 78a8e7cd6d..ea0ffee7c8 100644
--- a/packages/backend-test-utils/CHANGELOG.md
+++ b/packages/backend-test-utils/CHANGELOG.md
@@ -1,5 +1,82 @@
 # @backstage/backend-test-utils
 
+## 0.2.3-next.2
+
+### Patch Changes
+
+- 58cb5e5cea7b: Introduced a new utility for testing service factories, `ServiceFactoryTester`.
+- Updated dependencies
+  - @backstage/backend-app-api@0.5.3-next.2
+  - @backstage/config@1.1.0-next.1
+  - @backstage/backend-common@0.19.5-next.2
+  - @backstage/plugin-auth-node@0.3.0-next.2
+  - @backstage/backend-plugin-api@0.6.3-next.2
+  - @backstage/types@1.1.0
+
+## 0.2.3-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config@1.1.0-next.0
+  - @backstage/backend-app-api@0.5.3-next.1
+  - @backstage/backend-common@0.19.5-next.1
+  - @backstage/backend-plugin-api@0.6.3-next.1
+  - @backstage/plugin-auth-node@0.3.0-next.1
+  - @backstage/types@1.1.0
+
+## 0.2.2-next.0
+
+### Patch Changes
+
+- 9fb3b5373c45: Extended `mockService` to also include mocked variants, for example `mockServices.lifecycle.mock()`. The returned mocked implementation will have a `factory` property which is a service factory for itself. You can also pass a partial implementation of the service to the mock function to use a mock implementation of specific methods.
+- Updated dependencies
+  - @backstage/plugin-auth-node@0.3.0-next.0
+  - @backstage/backend-common@0.19.4-next.0
+  - @backstage/backend-app-api@0.5.2-next.0
+  - @backstage/backend-plugin-api@0.6.2-next.0
+  - @backstage/config@1.0.8
+  - @backstage/types@1.1.0
+
+## 0.2.0
+
+### Minor Changes
+
+- b9c57a4f857e: **BREAKING**: Renamed `mockServices.config` to `mockServices.rootConfig`.
+- a6d7983f349c: **BREAKING**: Removed the `services` option from `createBackend`. Service factories are now `BackendFeature`s and should be installed with `backend.add(...)` instead. The following should be migrated:
+
+  ```ts
+  const backend = createBackend({ services: [myCustomServiceFactory] });
+  ```
+
+  To instead pass the service factory via `backend.add(...)`:
+
+  ```ts
+  const backend = createBackend();
+  backend.add(customRootLoggerServiceFactory);
+  ```
+
+### Patch Changes
+
+- ae9304818136: Add needed constants and constructs to support PostgreSQL version 14 as test database
+- Updated dependencies
+  - @backstage/backend-common@0.19.2
+  - @backstage/backend-app-api@0.5.0
+  - @backstage/backend-plugin-api@0.6.0
+  - @backstage/plugin-auth-node@0.2.17
+  - @backstage/config@1.0.8
+  - @backstage/types@1.1.0
+
+## 0.2.0-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-app-api@0.5.0-next.2
+  - @backstage/backend-plugin-api@0.6.0-next.2
+  - @backstage/backend-common@0.19.2-next.2
+  - @backstage/plugin-auth-node@0.2.17-next.2
+
 ## 0.2.0-next.1
 
 ### Minor Changes
diff --git a/packages/backend-test-utils/api-report.md b/packages/backend-test-utils/api-report.md
index 1cb7a83a0e..43e671e440 100644
--- a/packages/backend-test-utils/api-report.md
+++ b/packages/backend-test-utils/api-report.md
@@ -3,6 +3,8 @@
 > Do not edit this file. It is a report generated by [API Extractor](https://api-extractor.com/).
 
 ```ts
+/// <reference types="jest" />
+
 import { Backend } from '@backstage/backend-app-api';
 import { BackendFeature } from '@backstage/backend-plugin-api';
 import { CacheService } from '@backstage/backend-plugin-api';
@@ -18,7 +20,10 @@ import { LifecycleService } from '@backstage/backend-plugin-api';
 import { LoggerService } from '@backstage/backend-plugin-api';
 import { PermissionsService } from '@backstage/backend-plugin-api';
 import { RootConfigService } from '@backstage/backend-plugin-api';
+import { RootHttpRouterFactoryOptions } from '@backstage/backend-app-api';
+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 { ServiceRef } from '@backstage/backend-plugin-api';
@@ -34,11 +39,19 @@ export namespace mockServices {
   export namespace cache {
     const // (undocumented)
       factory: () => ServiceFactory<CacheService, 'plugin'>;
+    const // (undocumented)
+      mock: (
+        partialImpl?: Partial<CacheService> | undefined,
+      ) => ServiceMock<CacheService>;
   }
   // (undocumented)
   export namespace database {
     const // (undocumented)
       factory: () => ServiceFactory<DatabaseService, 'plugin'>;
+    const // (undocumented)
+      mock: (
+        partialImpl?: Partial<DatabaseService> | undefined,
+      ) => ServiceMock<DatabaseService>;
   }
   // (undocumented)
   export namespace httpRouter {
@@ -46,6 +59,10 @@ export namespace mockServices {
       factory: (
         options?: HttpRouterFactoryOptions | undefined,
       ) => ServiceFactory<HttpRouterService, 'plugin'>;
+    const // (undocumented)
+      mock: (
+        partialImpl?: Partial<HttpRouterService> | undefined,
+      ) => ServiceMock<HttpRouterService>;
   }
   // (undocumented)
   export function identity(): IdentityService;
@@ -53,21 +70,37 @@ export namespace mockServices {
   export namespace identity {
     const // (undocumented)
       factory: () => ServiceFactory<IdentityService, 'plugin'>;
+    const // (undocumented)
+      mock: (
+        partialImpl?: Partial<IdentityService> | undefined,
+      ) => ServiceMock<IdentityService>;
   }
   // (undocumented)
   export namespace lifecycle {
     const // (undocumented)
       factory: () => ServiceFactory<LifecycleService, 'plugin'>;
+    const // (undocumented)
+      mock: (
+        partialImpl?: Partial<LifecycleService> | undefined,
+      ) => ServiceMock<LifecycleService>;
   }
   // (undocumented)
   export namespace logger {
     const // (undocumented)
       factory: () => ServiceFactory<LoggerService, 'plugin'>;
+    const // (undocumented)
+      mock: (
+        partialImpl?: Partial<LoggerService> | undefined,
+      ) => ServiceMock<LoggerService>;
   }
   // (undocumented)
   export namespace permissions {
     const // (undocumented)
       factory: () => ServiceFactory<PermissionsService, 'plugin'>;
+    const // (undocumented)
+      mock: (
+        partialImpl?: Partial<PermissionsService> | undefined,
+      ) => ServiceMock<PermissionsService>;
   }
   // (undocumented)
   export function rootConfig(options?: rootConfig.Options): RootConfigService;
@@ -83,9 +116,24 @@ export namespace mockServices {
       ) => ServiceFactory<RootConfigService, 'root'>;
   }
   // (undocumented)
+  export namespace rootHttpRouter {
+    const // (undocumented)
+      factory: (
+        options?: RootHttpRouterFactoryOptions | undefined,
+      ) => ServiceFactory<RootHttpRouterService, 'root'>;
+    const // (undocumented)
+      mock: (
+        partialImpl?: Partial<RootHttpRouterService> | undefined,
+      ) => ServiceMock<RootHttpRouterService>;
+  }
+  // (undocumented)
   export namespace rootLifecycle {
     const // (undocumented)
       factory: () => ServiceFactory<RootLifecycleService, 'root'>;
+    const // (undocumented)
+      mock: (
+        partialImpl?: Partial<RootLifecycleService> | undefined,
+      ) => ServiceMock<RootLifecycleService>;
   }
   // (undocumented)
   export function rootLogger(options?: rootLogger.Options): LoggerService;
@@ -99,11 +147,19 @@ export namespace mockServices {
       factory: (
         options?: Options | undefined,
       ) => ServiceFactory<LoggerService, 'root'>;
+    const // (undocumented)
+      mock: (
+        partialImpl?: Partial<RootLoggerService> | undefined,
+      ) => ServiceMock<RootLoggerService>;
   }
   // (undocumented)
   export namespace scheduler {
     const // (undocumented)
       factory: () => ServiceFactory<SchedulerService, 'plugin'>;
+    const // (undocumented)
+      mock: (
+        partialImpl?: Partial<SchedulerService> | undefined,
+      ) => ServiceMock<SchedulerService>;
   }
   // (undocumented)
   export function tokenManager(): TokenManagerService;
@@ -111,14 +167,56 @@ export namespace mockServices {
   export namespace tokenManager {
     const // (undocumented)
       factory: () => ServiceFactory<TokenManagerService, 'plugin'>;
+    const // (undocumented)
+      mock: (
+        partialImpl?: Partial<TokenManagerService> | undefined,
+      ) => ServiceMock<TokenManagerService>;
   }
   // (undocumented)
   export namespace urlReader {
     const // (undocumented)
       factory: () => ServiceFactory<UrlReaderService, 'plugin'>;
+    const // (undocumented)
+      mock: (
+        partialImpl?: Partial<UrlReaderService> | undefined,
+      ) => ServiceMock<UrlReaderService>;
   }
 }
 
+// @public
+export class ServiceFactoryTester<TService, TScope extends 'root' | 'plugin'> {
+  static from<TService, TScope extends 'root' | 'plugin'>(
+    subject:
+      | ServiceFactory<TService, TScope>
+      | (() => ServiceFactory<TService, TScope>),
+    options?: ServiceFactoryTesterOptions,
+  ): ServiceFactoryTester<TService, TScope>;
+  get(
+    ...args: 'root' extends TScope ? [] : [pluginId?: string]
+  ): Promise<TService>;
+  getService<TGetService, TGetScope extends 'root' | 'plugin'>(
+    service: ServiceRef<TGetService, TGetScope>,
+    ...args: 'root' extends TGetScope ? [] : [pluginId?: string]
+  ): Promise<TGetService>;
+}
+
+// @public
+export interface ServiceFactoryTesterOptions {
+  dependencies?: Array<ServiceFactory | (() => ServiceFactory)>;
+}
+
+// @public (undocumented)
+export type ServiceMock<TService> = {
+  factory: ServiceFactory<TService>;
+} & {
+  [Key in keyof TService]: TService[Key] extends (
+    this: infer This,
+    ...args: infer Args
+  ) => infer Return
+    ? TService[Key] & jest.MockInstance<Return, Args, This>
+    : TService[Key];
+};
+
 // @public
 export function setupRequestMockHandlers(worker: {
   listen: (t: any) => void;
@@ -127,11 +225,8 @@ export function setupRequestMockHandlers(worker: {
 }): void;
 
 // @public (undocumented)
-export function startTestBackend<
-  TServices extends any[],
-  TExtensionPoints extends any[],
->(
-  options: TestBackendOptions<TServices, TExtensionPoints>,
+export function startTestBackend<TExtensionPoints extends any[]>(
+  options: TestBackendOptions<TExtensionPoints>,
 ): Promise<TestBackend>;
 
 // @public (undocumented)
@@ -140,10 +235,7 @@ export interface TestBackend extends Backend {
 }
 
 // @public (undocumented)
-export interface TestBackendOptions<
-  TServices extends any[],
-  TExtensionPoints extends any[],
-> {
+export interface TestBackendOptions<TExtensionPoints extends any[]> {
   // (undocumented)
   extensionPoints?: readonly [
     ...{
@@ -154,16 +246,13 @@ export interface TestBackendOptions<
     },
   ];
   // (undocumented)
-  features?: BackendFeature[];
-  // (undocumented)
-  services?: readonly [
-    ...{
-      [index in keyof TServices]:
-        | ServiceFactory<TServices[index]>
-        | (() => ServiceFactory<TServices[index]>)
-        | [ServiceRef<TServices[index]>, Partial<TServices[index]>];
-    },
-  ];
+  features?: Array<
+    | BackendFeature
+    | (() => BackendFeature)
+    | Promise<{
+        default: BackendFeature | (() => BackendFeature);
+      }>
+  >;
 }
 
 // @public
diff --git a/packages/backend-test-utils/catalog-info.yaml b/packages/backend-test-utils/catalog-info.yaml
new file mode 100644
index 0000000000..396f190ef4
--- /dev/null
+++ b/packages/backend-test-utils/catalog-info.yaml
@@ -0,0 +1,10 @@
+apiVersion: backstage.io/v1alpha1
+kind: Component
+metadata:
+  name: backstage-backend-test-utils
+  title: '@backstage/backend-test-utils'
+  description: Test helpers library for Backstage backends
+spec:
+  lifecycle: experimental
+  type: backstage-node-library
+  owner: maintainers
diff --git a/packages/backend-test-utils/package.json b/packages/backend-test-utils/package.json
index beebf06624..8cdbcc7aca 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.2.0-next.1",
+  "version": "0.2.3-next.2",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "publishConfig": {
@@ -57,6 +57,9 @@
     "testcontainers": "^8.1.2",
     "uuid": "^8.0.0"
   },
+  "peerDependencies": {
+    "@types/jest": "*"
+  },
   "devDependencies": {
     "@backstage/cli": "workspace:^",
     "@types/supertest": "^2.0.8",
diff --git a/packages/backend-test-utils/src/next/services/index.ts b/packages/backend-test-utils/src/next/services/index.ts
index f562150efa..97a22567fd 100644
--- a/packages/backend-test-utils/src/next/services/index.ts
+++ b/packages/backend-test-utils/src/next/services/index.ts
@@ -13,4 +13,4 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-export { mockServices } from './mockServices';
+export { mockServices, type ServiceMock } from './mockServices';
diff --git a/packages/backend-test-utils/src/next/services/mockServices.ts b/packages/backend-test-utils/src/next/services/mockServices.ts
index 0455b9f1ae..22fba38fda 100644
--- a/packages/backend-test-utils/src/next/services/mockServices.ts
+++ b/packages/backend-test-utils/src/next/services/mockServices.ts
@@ -31,6 +31,7 @@ import {
   lifecycleServiceFactory,
   loggerServiceFactory,
   permissionsServiceFactory,
+  rootHttpRouterServiceFactory,
   rootLifecycleServiceFactory,
   schedulerServiceFactory,
   urlReaderServiceFactory,
@@ -40,6 +41,7 @@ import { JsonObject } from '@backstage/types';
 import { MockIdentityService } from './MockIdentityService';
 import { MockRootLoggerService } from './MockRootLoggerService';
 
+/** @internal */
 function simpleFactory<
   TService,
   TScope extends 'root' | 'plugin',
@@ -57,6 +59,44 @@ function simpleFactory<
   })) as (...options: TOptions) => ServiceFactory<TService, any>;
 }
 
+/** @public */
+export type ServiceMock<TService> = {
+  factory: ServiceFactory<TService>;
+} & {
+  [Key in keyof TService]: TService[Key] extends (
+    this: infer This,
+    ...args: infer Args
+  ) => infer Return
+    ? TService[Key] & jest.MockInstance<Return, Args, This>
+    : TService[Key];
+};
+
+/** @internal */
+function simpleMock<TService>(
+  ref: ServiceRef<TService, any>,
+  mockFactory: () => jest.Mocked<TService>,
+): (partialImpl?: Partial<TService>) => ServiceMock<TService> {
+  return partialImpl => {
+    const mock = mockFactory();
+    if (partialImpl) {
+      for (const [key, impl] of Object.entries(partialImpl)) {
+        if (typeof impl === 'function') {
+          (mock as any)[key].mockImplementation(impl);
+        } else {
+          (mock as any)[key] = impl;
+        }
+      }
+    }
+    return Object.assign(mock, {
+      factory: createServiceFactory({
+        service: ref,
+        deps: {},
+        factory: () => mock,
+      })(),
+    }) as ServiceMock<TService>;
+  };
+}
+
 /**
  * @public
  */
@@ -79,6 +119,13 @@ export namespace mockServices {
     };
 
     export const factory = simpleFactory(coreServices.rootLogger, rootLogger);
+    export const mock = simpleMock(coreServices.rootLogger, () => ({
+      child: jest.fn(),
+      debug: jest.fn(),
+      error: jest.fn(),
+      info: jest.fn(),
+      warn: jest.fn(),
+    }));
   }
 
   export function tokenManager(): TokenManagerService {
@@ -98,6 +145,10 @@ export namespace mockServices {
       coreServices.tokenManager,
       tokenManager,
     );
+    export const mock = simpleMock(coreServices.tokenManager, () => ({
+      authenticate: jest.fn(),
+      getToken: jest.fn(),
+    }));
   }
 
   export function identity(): IdentityService {
@@ -105,6 +156,9 @@ export namespace mockServices {
   }
   export namespace identity {
     export const factory = simpleFactory(coreServices.identity, identity);
+    export const mock = simpleMock(coreServices.identity, () => ({
+      getIdentity: jest.fn(),
+    }));
   }
 
   // TODO(Rugvip): Not all core services have implementations available here yet.
@@ -112,29 +166,77 @@ export namespace mockServices {
   //               re-implement functioning mock versions here.
   export namespace cache {
     export const factory = cacheServiceFactory;
+    export const mock = simpleMock(coreServices.cache, () => ({
+      delete: jest.fn(),
+      get: jest.fn(),
+      set: jest.fn(),
+      withOptions: jest.fn(),
+    }));
   }
   export namespace database {
     export const factory = databaseServiceFactory;
+    export const mock = simpleMock(coreServices.database, () => ({
+      getClient: jest.fn(),
+    }));
   }
   export namespace httpRouter {
     export const factory = httpRouterServiceFactory;
+    export const mock = simpleMock(coreServices.httpRouter, () => ({
+      use: jest.fn(),
+    }));
+  }
+  export namespace rootHttpRouter {
+    export const factory = rootHttpRouterServiceFactory;
+    export const mock = simpleMock(coreServices.rootHttpRouter, () => ({
+      use: jest.fn(),
+    }));
   }
   export namespace lifecycle {
     export const factory = lifecycleServiceFactory;
+    export const mock = simpleMock(coreServices.lifecycle, () => ({
+      addShutdownHook: jest.fn(),
+      addStartupHook: jest.fn(),
+    }));
   }
   export namespace logger {
     export const factory = loggerServiceFactory;
+    export const mock = simpleMock(coreServices.logger, () => ({
+      child: jest.fn(),
+      debug: jest.fn(),
+      error: jest.fn(),
+      info: jest.fn(),
+      warn: jest.fn(),
+    }));
   }
   export namespace permissions {
     export const factory = permissionsServiceFactory;
+    export const mock = simpleMock(coreServices.permissions, () => ({
+      authorize: jest.fn(),
+      authorizeConditional: jest.fn(),
+    }));
   }
   export namespace rootLifecycle {
     export const factory = rootLifecycleServiceFactory;
+    export const mock = simpleMock(coreServices.rootLifecycle, () => ({
+      addShutdownHook: jest.fn(),
+      addStartupHook: jest.fn(),
+    }));
   }
   export namespace scheduler {
     export const factory = schedulerServiceFactory;
+    export const mock = simpleMock(coreServices.scheduler, () => ({
+      createScheduledTaskRunner: jest.fn(),
+      getScheduledTasks: jest.fn(),
+      scheduleTask: jest.fn(),
+      triggerTask: jest.fn(),
+    }));
   }
   export namespace urlReader {
     export const factory = urlReaderServiceFactory;
+    export const mock = simpleMock(coreServices.urlReader, () => ({
+      readTree: jest.fn(),
+      readUrl: jest.fn(),
+      search: jest.fn(),
+    }));
   }
 }
diff --git a/packages/backend-test-utils/src/next/wiring/ServiceFactoryTester.test.ts b/packages/backend-test-utils/src/next/wiring/ServiceFactoryTester.test.ts
new file mode 100644
index 0000000000..14dd427ecf
--- /dev/null
+++ b/packages/backend-test-utils/src/next/wiring/ServiceFactoryTester.test.ts
@@ -0,0 +1,145 @@
+/*
+ * 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,
+  createServiceRef,
+} from '@backstage/backend-plugin-api';
+import { ServiceFactoryTester } from './ServiceFactoryTester';
+
+const rootServiceRef = createServiceRef<string>({ id: 'a', scope: 'root' });
+const pluginServiceRef = createServiceRef<string>({ id: 'b', scope: 'plugin' });
+const sharedPluginServiceRef = createServiceRef<string>({
+  id: 'c',
+  scope: 'plugin',
+});
+
+const rootFactory = createServiceFactory({
+  service: rootServiceRef,
+  deps: {},
+  factory: async () => 'root',
+});
+
+const pluginFactory = createServiceFactory({
+  service: pluginServiceRef,
+  deps: { plugin: coreServices.pluginMetadata },
+  factory: async ({ plugin }) => `${plugin.getId()}-plugin`,
+});
+
+const sharedPluginFactory = createServiceFactory({
+  service: sharedPluginServiceRef,
+  deps: { plugin: coreServices.pluginMetadata },
+  createRootContext() {
+    return { counter: 0 };
+  },
+  factory: async ({ plugin }, state) => {
+    state.counter += 1;
+    return `${plugin.getId()}-${state.counter}-plugin`;
+  },
+});
+
+describe('ServiceFactoryTester', () => {
+  it('should test a root service factory', async () => {
+    const tester = ServiceFactoryTester.from(rootFactory);
+
+    await expect(tester.get()).resolves.toBe('root');
+  });
+
+  it('should test a plugin service factory', async () => {
+    const tester = ServiceFactoryTester.from(pluginFactory);
+
+    await expect(tester.get('x')).resolves.toBe('x-plugin');
+    await expect(tester.get('y')).resolves.toBe('y-plugin');
+    await expect(tester.get('z')).resolves.toBe('z-plugin');
+  });
+
+  it('should test a plugin service factory with root context', async () => {
+    const tester = ServiceFactoryTester.from(sharedPluginFactory);
+
+    await expect(tester.get('x')).resolves.toBe('x-1-plugin');
+    await expect(tester.get('y')).resolves.toBe('y-2-plugin');
+    await expect(tester.get('y')).resolves.toBe('y-2-plugin');
+    await expect(tester.get('y')).resolves.toBe('y-2-plugin');
+    await expect(tester.get('z')).resolves.toBe('z-3-plugin');
+
+    const tester2 = ServiceFactoryTester.from(sharedPluginFactory);
+
+    await expect(tester2.get('z')).resolves.toBe('z-1-plugin');
+    await expect(tester2.get('y')).resolves.toBe('y-2-plugin');
+    await expect(tester2.get('x')).resolves.toBe('x-3-plugin');
+    await expect(tester2.get('x')).resolves.toBe('x-3-plugin');
+    await expect(tester2.get('y')).resolves.toBe('y-2-plugin');
+    await expect(tester2.get('z')).resolves.toBe('z-1-plugin');
+  });
+
+  it('should use dependencies', async () => {
+    const tester = ServiceFactoryTester.from(
+      createServiceFactory({
+        service: createServiceRef<string>({ id: 'concat' }),
+        deps: { root: rootServiceRef, plugin: pluginServiceRef },
+        factory: async ({ root, plugin }) => `${root}, ${plugin}`,
+      }),
+      { dependencies: [rootFactory, pluginFactory()] },
+    );
+
+    await expect(tester.get('x')).resolves.toBe('root, x-plugin');
+  });
+
+  it('should use dependencies with root context', async () => {
+    const tester = ServiceFactoryTester.from(
+      createServiceFactory({
+        service: createServiceRef<string>({ id: 'concat' }),
+        deps: { shared: sharedPluginServiceRef, plugin: pluginServiceRef },
+        factory: async ({ shared, plugin }) => `${shared}, ${plugin}`,
+      }),
+      { dependencies: [sharedPluginFactory(), pluginFactory] },
+    );
+
+    await expect(tester.get('x')).resolves.toBe('x-1-plugin, x-plugin');
+    await expect(tester.get('y')).resolves.toBe('y-2-plugin, y-plugin');
+    await expect(tester.get('y')).resolves.toBe('y-2-plugin, y-plugin');
+    await expect(tester.get('y')).resolves.toBe('y-2-plugin, y-plugin');
+    await expect(tester.get('z')).resolves.toBe('z-3-plugin, z-plugin');
+  });
+
+  it('should prioritize the subject implementation', async () => {
+    const tester = ServiceFactoryTester.from(
+      createServiceFactory({
+        service: rootServiceRef,
+        deps: {},
+        factory: async () => 'other-root',
+      }),
+      { dependencies: [rootFactory] },
+    );
+
+    await expect(tester.get()).resolves.toBe('other-root');
+  });
+
+  it('should throw on missing dependencies', async () => {
+    const tester = ServiceFactoryTester.from(
+      createServiceFactory({
+        service: pluginServiceRef,
+        deps: { root: rootServiceRef },
+        factory: async () => 'plugin',
+      }),
+    );
+
+    await expect(tester.get('x')).rejects.toThrow(
+      "Failed to instantiate service 'b' for 'x' because the following dependent services are missing: 'a'",
+    );
+  });
+});
diff --git a/packages/backend-test-utils/src/next/wiring/ServiceFactoryTester.ts b/packages/backend-test-utils/src/next/wiring/ServiceFactoryTester.ts
new file mode 100644
index 0000000000..0555ab10a4
--- /dev/null
+++ b/packages/backend-test-utils/src/next/wiring/ServiceFactoryTester.ts
@@ -0,0 +1,117 @@
+/*
+ * 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, ServiceRef } from '@backstage/backend-plugin-api';
+import { defaultServiceFactories } from './TestBackend';
+// Direct internal import to avoid duplication.
+// This is a relative import in order to make sure that the implementation is duplicated
+// rather than leading to an import from @backstage/backend-app-api.
+// eslint-disable-next-line @backstage/no-relative-monorepo-imports
+import { ServiceRegistry } from '../../../../backend-app-api/src/wiring/ServiceRegistry';
+
+/**
+ * Options for {@link ServiceFactoryTester}.
+ * @public
+ */
+export interface ServiceFactoryTesterOptions {
+  /**
+   * Additional service factories to make available as dependencies.
+   *
+   * @remarks
+   *
+   * If a service factory is provided for a service that already has a default
+   * implementation, the provided factory will override the default.
+   */
+  dependencies?: Array<ServiceFactory | (() => ServiceFactory)>;
+}
+
+/**
+ * A utility to help test service factories in isolation.
+ *
+ * @public
+ */
+export class ServiceFactoryTester<TService, TScope extends 'root' | 'plugin'> {
+  readonly #subject: ServiceRef<TService, TScope>;
+  readonly #registry: ServiceRegistry;
+
+  /**
+   * Creates a new {@link ServiceFactoryTester} used to test the provided subject.
+   *
+   * @param subject - The service factory to test.
+   * @param options - Additional options
+   * @returns A new tester instance for the provided subject.
+   */
+  static from<TService, TScope extends 'root' | 'plugin'>(
+    subject:
+      | ServiceFactory<TService, TScope>
+      | (() => ServiceFactory<TService, TScope>),
+    options?: ServiceFactoryTesterOptions,
+  ) {
+    const subjectFactory = typeof subject === 'function' ? subject() : subject;
+    const registry = ServiceRegistry.create([
+      ...defaultServiceFactories,
+      ...(options?.dependencies?.map(f =>
+        typeof f === 'function' ? f() : f,
+      ) ?? []),
+      subjectFactory,
+    ]);
+    return new ServiceFactoryTester(subjectFactory.service, registry);
+  }
+
+  private constructor(
+    subject: ServiceRef<TService, TScope>,
+    registry: ServiceRegistry,
+  ) {
+    this.#subject = subject;
+    this.#registry = registry;
+  }
+
+  /**
+   * Returns the service instance for the subject.
+   *
+   * @remarks
+   *
+   * If the subject is a plugin scoped service factory a plugin ID
+   * can be provided to instantiate the service for a specific plugin.
+   *
+   * By default the plugin ID 'test' is used.
+   */
+  async get(
+    ...args: 'root' extends TScope ? [] : [pluginId?: string]
+  ): Promise<TService> {
+    const [pluginId] = args;
+    return this.#registry.get(this.#subject, pluginId ?? 'test')!;
+  }
+
+  /**
+   * Return the service instance for any of the provided dependencies or built-in services.
+   *
+   * @remarks
+   *
+   * A plugin ID can optionally be provided for plugin scoped services, otherwise the plugin ID 'test' is used.
+   */
+  async getService<TGetService, TGetScope extends 'root' | 'plugin'>(
+    service: ServiceRef<TGetService, TGetScope>,
+    ...args: 'root' extends TGetScope ? [] : [pluginId?: string]
+  ): Promise<TGetService> {
+    const [pluginId] = args;
+    const instance = await this.#registry.get(service, pluginId ?? 'test');
+    if (instance === undefined) {
+      throw new Error(`Service '${service.id}' not found`);
+    }
+    return instance;
+  }
+}
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 cc916d4309..b127712927 100644
--- a/packages/backend-test-utils/src/next/wiring/TestBackend.test.ts
+++ b/packages/backend-test-utils/src/next/wiring/TestBackend.test.ts
@@ -31,7 +31,6 @@ import { startTestBackend } from './TestBackend';
 let globalTestBackendHasBeenStopped = false;
 beforeAll(async () => {
   await startTestBackend({
-    services: [],
     features: [
       createBackendModule({
         moduleId: 'test.module',
@@ -46,7 +45,7 @@ beforeAll(async () => {
             },
           });
         },
-      })(),
+      }),
     ],
   });
 });
@@ -68,17 +67,37 @@ describe('TestBackend', () => {
     const extensionPoint5 = createExtensionPoint<Obj>({ id: 'b5' });
     await expect(
       startTestBackend({
-        services: [
+        features: [
           // @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' }],
+          createServiceFactory(() => ({
+            service: serviceRef,
+            deps: {},
+            // @ts-expect-error
+            factory: async () => ({ a: 'a' }),
+          })),
+          createServiceFactory(() => ({
+            service: serviceRef,
+            deps: {},
+            factory: async () => ({ a: 'a', b: 'b' }),
+          })),
+          createServiceFactory(() => ({
+            service: serviceRef,
+            deps: {},
+            // @ts-expect-error
+            factory: async () => ({ c: 'c' }),
+          })),
+          createServiceFactory(() => ({
+            service: serviceRef,
+            deps: {},
+            // @ts-expect-error
+            factory: async () => ({ a: 'a', c: 'c' }),
+          })),
+          createServiceFactory(() => ({
+            service: serviceRef,
+            deps: {},
+            factory: async () => ({ a: 'a', b: 'b', c: 'c' }),
+          })),
         ],
         extensionPoints: [
           // @ts-expect-error
@@ -124,8 +143,7 @@ describe('TestBackend', () => {
     });
 
     await startTestBackend({
-      services: [sf],
-      features: [testModule()],
+      features: [testModule(), sf()],
     });
 
     expect(testFn).toHaveBeenCalledWith('winning');
@@ -150,7 +168,6 @@ describe('TestBackend', () => {
     });
 
     const backend = await startTestBackend({
-      services: [],
       features: [testModule()],
     });
 
@@ -192,7 +209,6 @@ describe('TestBackend', () => {
     });
 
     await startTestBackend({
-      services: [],
       features: [testPlugin()],
     });
   });
@@ -220,4 +236,89 @@ describe('TestBackend', () => {
     expect(res.status).toEqual(200);
     expect(res.body).toEqual({ message: 'pong' });
   });
+
+  it('should provide extension point implementations', async () => {
+    expect.assertions(3);
+
+    const extensionPointA = createExtensionPoint<string>({ id: 'a' });
+    const extensionPointB = createExtensionPoint<string>({ id: 'b' });
+    await expect(
+      startTestBackend({
+        extensionPoints: [
+          [extensionPointA, 'a'],
+          [extensionPointB, 'b'],
+        ],
+        features: [
+          createBackendModule({
+            pluginId: 'testA',
+            moduleId: 'test',
+            register(reg) {
+              reg.registerInit({
+                deps: { ext: extensionPointA },
+                async init({ ext }) {
+                  expect(ext).toBe('a');
+                },
+              });
+            },
+          }),
+          createBackendModule({
+            pluginId: 'testB',
+            moduleId: 'test',
+            register(reg) {
+              reg.registerInit({
+                deps: { ext: extensionPointB },
+                async init({ ext }) {
+                  expect(ext).toBe('b');
+                },
+              });
+            },
+          }),
+        ],
+      }),
+    ).resolves.not.toBeUndefined();
+  });
+
+  it('should reject extension point used by multiple plugins', async () => {
+    const extensionPointA = createExtensionPoint<string>({ id: 'a' });
+    await expect(
+      startTestBackend({
+        extensionPoints: [[extensionPointA, 'a']],
+        features: [
+          createBackendModule({
+            pluginId: 'testA',
+            moduleId: 'test',
+            register(reg) {
+              reg.registerInit({
+                deps: { ext: extensionPointA },
+                async init() {},
+              });
+            },
+          }),
+          createBackendModule({
+            pluginId: 'testB',
+            moduleId: 'test',
+            register(reg) {
+              reg.registerInit({
+                deps: { ext: extensionPointA },
+                async init() {},
+              });
+            },
+          }),
+        ],
+      }),
+    ).rejects.toThrow(
+      "Extension point registered for plugin 'testA' may not be used by module for plugin 'testB'",
+    );
+  });
+
+  it('should reject extension point not used by any plugin', async () => {
+    const extensionPointA = createExtensionPoint<string>({ id: 'a' });
+    await expect(
+      startTestBackend({
+        extensionPoints: [[extensionPointA, 'a']],
+      }),
+    ).rejects.toThrow(
+      "Unable to determine the plugin ID of extension point(s) 'a'. Tested extension points must be depended on by one or more tested modules.",
+    );
+  });
 });
diff --git a/packages/backend-test-utils/src/next/wiring/TestBackend.ts b/packages/backend-test-utils/src/next/wiring/TestBackend.ts
index 8a4e1d8471..59b5906eb4 100644
--- a/packages/backend-test-utils/src/next/wiring/TestBackend.ts
+++ b/packages/backend-test-utils/src/next/wiring/TestBackend.ts
@@ -24,31 +24,21 @@ import {
 } from '@backstage/backend-app-api';
 import { HostDiscovery } from '@backstage/backend-common';
 import {
-  ServiceFactory,
-  ServiceRef,
   createServiceFactory,
   BackendFeature,
   ExtensionPoint,
   coreServices,
-  createBackendPlugin,
+  createBackendModule,
 } from '@backstage/backend-plugin-api';
 import { mockServices } from '../services';
 import { ConfigReader } from '@backstage/config';
 import express from 'express';
+// Direct internal import to avoid duplication
+// eslint-disable-next-line @backstage/no-forbidden-package-imports
+import { InternalBackendFeature } from '@backstage/backend-plugin-api/src/wiring/types';
 
 /** @public */
-export interface TestBackendOptions<
-  TServices extends any[],
-  TExtensionPoints extends any[],
-> {
-  services?: readonly [
-    ...{
-      [index in keyof TServices]:
-        | ServiceFactory<TServices[index]>
-        | (() => ServiceFactory<TServices[index]>)
-        | [ServiceRef<TServices[index]>, Partial<TServices[index]>];
-    },
-  ];
+export interface TestBackendOptions<TExtensionPoints extends any[]> {
   extensionPoints?: readonly [
     ...{
       [index in keyof TExtensionPoints]: [
@@ -57,7 +47,11 @@ export interface TestBackendOptions<
       ];
     },
   ];
-  features?: BackendFeature[];
+  features?: Array<
+    | BackendFeature
+    | (() => BackendFeature)
+    | Promise<{ default: BackendFeature | (() => BackendFeature) }>
+  >;
 }
 
 /** @public */
@@ -71,7 +65,7 @@ export interface TestBackend extends Backend {
   readonly server: ExtendedHttpServer;
 }
 
-const defaultServiceFactories = [
+export const defaultServiceFactories = [
   mockServices.cache.factory(),
   mockServices.rootConfig.factory(),
   mockServices.database.factory(),
@@ -87,21 +81,130 @@ const defaultServiceFactories = [
   mockServices.urlReader.factory(),
 ];
 
+/**
+ * Given a set of extension points and features, find the extension
+ * points that we mock and tie them to the correct plugin ID.
+ * @returns
+ */
+function createExtensionPointTestModules(
+  features: Array<BackendFeature>,
+  extensionPointTuples?: readonly [
+    ref: ExtensionPoint<unknown>,
+    impl: unknown,
+  ][],
+): Array<() => BackendFeature> {
+  if (!extensionPointTuples) {
+    return [];
+  }
+
+  const registrations = features.flatMap(feature => {
+    if (feature.$$type !== '@backstage/BackendFeature') {
+      throw new Error(
+        `Failed to add feature, invalid type '${feature.$$type}'`,
+      );
+    }
+
+    if (isInternalBackendFeature(feature)) {
+      if (feature.version !== 'v1') {
+        throw new Error(
+          `Failed to add feature, invalid version '${feature.version}'`,
+        );
+      }
+      return feature.getRegistrations();
+    }
+    return [];
+  });
+
+  const extensionPointMap = new Map(
+    extensionPointTuples.map(ep => [ep[0].id, ep]),
+  );
+  const extensionPointsToSort = new Set(extensionPointMap.keys());
+  const extensionPointsByPlugin = new Map<string, string[]>();
+
+  for (const registration of registrations) {
+    if (registration.type === 'module') {
+      const testDep = Object.values(registration.init.deps).filter(dep =>
+        extensionPointsToSort.has(dep.id),
+      );
+      if (testDep.length > 0) {
+        let points = extensionPointsByPlugin.get(registration.pluginId);
+        if (!points) {
+          points = [];
+          extensionPointsByPlugin.set(registration.pluginId, points);
+        }
+        for (const { id } of testDep) {
+          points.push(id);
+          extensionPointsToSort.delete(id);
+        }
+      }
+    }
+  }
+
+  if (extensionPointsToSort.size > 0) {
+    const list = Array.from(extensionPointsToSort)
+      .map(id => `'${id}'`)
+      .join(', ');
+    throw new Error(
+      `Unable to determine the plugin ID of extension point(s) ${list}. ` +
+        'Tested extension points must be depended on by one or more tested modules.',
+    );
+  }
+
+  const modules = [];
+
+  for (const [pluginId, pluginExtensionPointIds] of extensionPointsByPlugin) {
+    modules.push(
+      createBackendModule({
+        pluginId,
+        moduleId: 'testExtensionPointRegistration',
+        register(reg) {
+          for (const id of pluginExtensionPointIds) {
+            const tuple = extensionPointMap.get(id)!;
+            reg.registerExtensionPoint(...tuple);
+          }
+
+          reg.registerInit({ deps: {}, async init() {} });
+        },
+      }),
+    );
+  }
+
+  return modules;
+}
+
+function isPromise<T>(value: unknown | Promise<T>): value is Promise<T> {
+  return (
+    typeof value === 'object' &&
+    value !== null &&
+    'then' in value &&
+    typeof value.then === 'function'
+  );
+}
+
+function unwrapFeature(
+  feature: BackendFeature | (() => BackendFeature),
+): BackendFeature {
+  return typeof feature === 'function' ? feature() : feature;
+}
+
 const backendInstancesToCleanUp = new Array<Backend>();
 
 /** @public */
-export async function startTestBackend<
-  TServices extends any[],
-  TExtensionPoints extends any[],
->(
-  options: TestBackendOptions<TServices, TExtensionPoints>,
+export async function startTestBackend<TExtensionPoints extends any[]>(
+  options: TestBackendOptions<TExtensionPoints>,
 ): Promise<TestBackend> {
-  const {
-    services = [],
-    extensionPoints = [],
-    features = [],
-    ...otherOptions
-  } = options;
+  const { extensionPoints, ...otherOptions } = options;
+
+  // Unpack input into awaited plain BackendFeatures
+  const features: BackendFeature[] = await Promise.all(
+    options.features?.map(async val => {
+      if (isPromise(val)) {
+        const { default: feature } = await val;
+        return unwrapFeature(feature);
+      }
+      return unwrapFeature(val);
+    }) ?? [],
+  );
 
   let server: ExtendedHttpServer;
 
@@ -157,55 +260,20 @@ export async function startTestBackend<
     },
   });
 
-  const factories = services.map(serviceDef => {
-    if (Array.isArray(serviceDef)) {
-      // if type is ExtensionPoint?
-      // do something differently?
-      const [ref, impl] = serviceDef;
-      if (ref.scope === 'plugin') {
-        return createServiceFactory({
-          service: ref as ServiceRef<unknown, 'plugin'>,
-          deps: {},
-          factory: async () => impl,
-        })();
-      }
-      return createServiceFactory({
-        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.id === factory.service.id)) {
-      factories.push(factory);
-    }
-  }
-
   const backend = createSpecializedBackend({
     ...otherOptions,
-    services: [...factories, rootHttpRouterFactory, discoveryFactory],
+    defaultServiceFactories: [
+      ...defaultServiceFactories,
+      rootHttpRouterFactory,
+      discoveryFactory,
+    ],
   });
 
   backendInstancesToCleanUp.push(backend);
 
-  backend.add(
-    createBackendPlugin({
-      pluginId: `---test-extension-point-registrar`,
-      register(reg) {
-        for (const [ref, impl] of extensionPoints) {
-          reg.registerExtensionPoint(ref, impl);
-        }
-
-        reg.registerInit({ deps: {}, async init() {} });
-      },
-    })(),
-  );
+  for (const m of createExtensionPointTestModules(features, extensionPoints)) {
+    backend.add(m);
+  }
 
   for (const feature of features) {
     backend.add(feature);
@@ -248,3 +316,11 @@ function registerTestHooks() {
 }
 
 registerTestHooks();
+
+function isInternalBackendFeature(
+  feature: BackendFeature,
+): feature is InternalBackendFeature {
+  return (
+    typeof (feature as InternalBackendFeature).getRegistrations === 'function'
+  );
+}
diff --git a/packages/backend-test-utils/src/next/wiring/index.ts b/packages/backend-test-utils/src/next/wiring/index.ts
index 7c39474d4c..bd6a61317f 100644
--- a/packages/backend-test-utils/src/next/wiring/index.ts
+++ b/packages/backend-test-utils/src/next/wiring/index.ts
@@ -14,5 +14,9 @@
  * limitations under the License.
  */
 
+export {
+  ServiceFactoryTester,
+  type ServiceFactoryTesterOptions,
+} from './ServiceFactoryTester';
 export { startTestBackend } from './TestBackend';
 export type { TestBackend, TestBackendOptions } from './TestBackend';
diff --git a/packages/backend/.snyk b/packages/backend/.snyk
new file mode 100644
index 0000000000..ea5abd653d
--- /dev/null
+++ b/packages/backend/.snyk
@@ -0,0 +1,10 @@
+# Snyk (https://snyk.io) policy file, patches or ignores known vulnerabilities.
+version: v1.22.1
+# ignores vulnerabilities until expiry date; change duration by modifying expiry date
+ignore:
+  SNYK-JS-ISOLATEDVM-3037320:
+    - '*':
+        reason: We do not pass any V8 cache data, and are therefore unaffected by this vulnerability
+        expires: 2033-07-02T16:55:57.077Z
+        created: 2023-07-02T16:55:57.077Z
+patch: {}
diff --git a/packages/backend/CHANGELOG.md b/packages/backend/CHANGELOG.md
index 84c802ae58..6c3dfcf2fd 100644
--- a/packages/backend/CHANGELOG.md
+++ b/packages/backend/CHANGELOG.md
@@ -1,5 +1,280 @@
 # example-backend
 
+## 0.2.87-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-scaffolder-backend@1.16.6-next.2
+  - @backstage/plugin-code-coverage-backend@0.2.17-next.2
+  - @backstage/plugin-permission-backend@0.5.26-next.2
+  - @backstage/plugin-catalog-backend@1.13.0-next.2
+  - @backstage/plugin-badges-backend@0.2.6-next.2
+  - @backstage/config@1.1.0-next.1
+  - @backstage/plugin-tech-insights-backend-module-jsonfc@0.1.35-next.2
+  - @backstage/plugin-tech-insights-backend@0.5.17-next.2
+  - @backstage/backend-tasks@0.5.8-next.2
+  - example-app@0.2.87-next.2
+  - @backstage/backend-common@0.19.5-next.2
+  - @backstage/plugin-app-backend@0.3.51-next.2
+  - @backstage/plugin-auth-backend@0.18.9-next.2
+  - @backstage/plugin-auth-node@0.3.0-next.2
+  - @backstage/plugin-catalog-node@1.4.4-next.2
+  - @backstage/plugin-entity-feedback-backend@0.1.9-next.2
+  - @backstage/plugin-events-backend@0.2.12-next.2
+  - @backstage/plugin-kubernetes-backend@0.11.6-next.2
+  - @backstage/plugin-linguist-backend@0.4.3-next.2
+  - @backstage/plugin-permission-node@0.7.14-next.2
+  - @backstage/plugin-playlist-backend@0.3.7-next.2
+  - @backstage/plugin-proxy-backend@0.3.3-next.2
+  - @backstage/plugin-rollbar-backend@0.1.48-next.2
+  - @backstage/plugin-scaffolder-backend-module-confluence-to-markdown@0.2.4-next.2
+  - @backstage/plugin-search-backend@1.4.3-next.2
+  - @backstage/plugin-search-backend-module-catalog@0.1.7-next.2
+  - @backstage/plugin-search-backend-module-explore@0.1.7-next.2
+  - @backstage/plugin-search-backend-module-pg@0.5.12-next.2
+  - @backstage/plugin-search-backend-module-techdocs@0.1.7-next.2
+  - @backstage/plugin-techdocs-backend@1.7.0-next.2
+  - @backstage/integration@1.7.0-next.2
+  - @backstage/plugin-devtools-backend@0.1.6-next.2
+  - @backstage/catalog-model@1.4.2-next.1
+  - @backstage/plugin-adr-backend@0.3.9-next.2
+  - @backstage/plugin-azure-devops-backend@0.3.30-next.2
+  - @backstage/plugin-azure-sites-backend@0.1.13-next.2
+  - @backstage/plugin-explore-backend@0.0.13-next.2
+  - @backstage/plugin-graphql-backend@0.1.41-next.2
+  - @backstage/plugin-jenkins-backend@0.2.6-next.2
+  - @backstage/plugin-kafka-backend@0.2.44-next.2
+  - @backstage/plugin-lighthouse-backend@0.2.7-next.2
+  - @backstage/plugin-nomad-backend@0.1.5-next.2
+  - @backstage/plugin-permission-common@0.7.8-next.1
+  - @backstage/plugin-scaffolder-backend-module-rails@0.4.20-next.2
+  - @backstage/plugin-search-backend-module-elasticsearch@1.3.6-next.2
+  - @backstage/plugin-search-backend-node@1.2.7-next.2
+  - @backstage/plugin-tech-insights-node@0.4.9-next.2
+  - @backstage/plugin-todo-backend@0.2.3-next.2
+  - @backstage/catalog-client@1.4.4-next.1
+  - @backstage/plugin-catalog-backend-module-unprocessed@0.2.3-next.2
+  - @backstage/plugin-events-node@0.2.12-next.2
+  - @backstage/plugin-search-common@1.2.6-next.1
+
+## 0.2.87-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-search-backend-module-pg@0.5.12-next.1
+  - @backstage/plugin-kubernetes-backend@0.11.6-next.1
+  - @backstage/plugin-catalog-backend@1.13.0-next.1
+  - @backstage/plugin-auth-backend@0.18.9-next.1
+  - @backstage/config@1.1.0-next.0
+  - @backstage/integration@1.7.0-next.1
+  - @backstage/plugin-devtools-backend@0.1.6-next.1
+  - @backstage/backend-tasks@0.5.8-next.1
+  - @backstage/plugin-techdocs-backend@1.7.0-next.1
+  - @backstage/plugin-scaffolder-backend@1.16.6-next.1
+  - @backstage/plugin-code-coverage-backend@0.2.17-next.1
+  - example-app@0.2.87-next.1
+  - @backstage/backend-common@0.19.5-next.1
+  - @backstage/catalog-model@1.4.2-next.0
+  - @backstage/plugin-adr-backend@0.3.9-next.1
+  - @backstage/plugin-app-backend@0.3.51-next.1
+  - @backstage/plugin-auth-node@0.3.0-next.1
+  - @backstage/plugin-azure-devops-backend@0.3.30-next.1
+  - @backstage/plugin-azure-sites-backend@0.1.13-next.1
+  - @backstage/plugin-badges-backend@0.2.6-next.1
+  - @backstage/plugin-entity-feedback-backend@0.1.9-next.1
+  - @backstage/plugin-events-backend@0.2.12-next.1
+  - @backstage/plugin-explore-backend@0.0.13-next.1
+  - @backstage/plugin-graphql-backend@0.1.41-next.1
+  - @backstage/plugin-jenkins-backend@0.2.6-next.1
+  - @backstage/plugin-kafka-backend@0.2.44-next.1
+  - @backstage/plugin-lighthouse-backend@0.2.7-next.1
+  - @backstage/plugin-linguist-backend@0.4.3-next.1
+  - @backstage/plugin-nomad-backend@0.1.5-next.1
+  - @backstage/plugin-permission-backend@0.5.26-next.1
+  - @backstage/plugin-permission-common@0.7.8-next.0
+  - @backstage/plugin-permission-node@0.7.14-next.1
+  - @backstage/plugin-playlist-backend@0.3.7-next.1
+  - @backstage/plugin-proxy-backend@0.3.3-next.1
+  - @backstage/plugin-rollbar-backend@0.1.48-next.1
+  - @backstage/plugin-scaffolder-backend-module-confluence-to-markdown@0.2.4-next.1
+  - @backstage/plugin-scaffolder-backend-module-rails@0.4.20-next.1
+  - @backstage/plugin-search-backend@1.4.3-next.1
+  - @backstage/plugin-search-backend-module-catalog@0.1.7-next.1
+  - @backstage/plugin-search-backend-module-elasticsearch@1.3.6-next.1
+  - @backstage/plugin-search-backend-module-explore@0.1.7-next.1
+  - @backstage/plugin-search-backend-module-techdocs@0.1.7-next.1
+  - @backstage/plugin-search-backend-node@1.2.7-next.1
+  - @backstage/plugin-tech-insights-backend@0.5.17-next.1
+  - @backstage/plugin-tech-insights-backend-module-jsonfc@0.1.35-next.1
+  - @backstage/plugin-tech-insights-node@0.4.9-next.1
+  - @backstage/plugin-todo-backend@0.2.3-next.1
+  - @backstage/plugin-catalog-node@1.4.4-next.1
+  - @backstage/plugin-catalog-backend-module-unprocessed@0.2.3-next.1
+  - @backstage/plugin-events-node@0.2.12-next.1
+  - @backstage/catalog-client@1.4.4-next.0
+  - @backstage/plugin-search-common@1.2.6-next.0
+
+## 0.2.87-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-backend@1.12.2-next.0
+  - @backstage/plugin-auth-backend@0.18.8-next.0
+  - @backstage/plugin-code-coverage-backend@0.2.16-next.0
+  - @backstage/plugin-scaffolder-backend@1.16.3-next.0
+  - @backstage/plugin-auth-node@0.3.0-next.0
+  - @backstage/backend-common@0.19.4-next.0
+  - @backstage/plugin-linguist-backend@0.4.2-next.0
+  - @backstage/integration@1.7.0-next.0
+  - @backstage/plugin-entity-feedback-backend@0.1.8-next.0
+  - @backstage/plugin-tech-insights-backend@0.5.16-next.0
+  - @backstage/backend-tasks@0.5.7-next.0
+  - @backstage/plugin-app-backend@0.3.50-next.0
+  - example-app@0.2.87-next.0
+  - @backstage/catalog-client@1.4.3
+  - @backstage/catalog-model@1.4.1
+  - @backstage/config@1.0.8
+  - @backstage/plugin-adr-backend@0.3.8-next.0
+  - @backstage/plugin-azure-devops-backend@0.3.29-next.0
+  - @backstage/plugin-azure-sites-backend@0.1.12-next.0
+  - @backstage/plugin-badges-backend@0.2.5-next.0
+  - @backstage/plugin-catalog-backend-module-unprocessed@0.2.2-next.0
+  - @backstage/plugin-catalog-node@1.4.3-next.0
+  - @backstage/plugin-devtools-backend@0.1.5-next.0
+  - @backstage/plugin-events-backend@0.2.11-next.0
+  - @backstage/plugin-events-node@0.2.11-next.0
+  - @backstage/plugin-explore-backend@0.0.12-next.0
+  - @backstage/plugin-graphql-backend@0.1.40-next.0
+  - @backstage/plugin-jenkins-backend@0.2.5-next.0
+  - @backstage/plugin-kafka-backend@0.2.43-next.0
+  - @backstage/plugin-kubernetes-backend@0.11.5-next.0
+  - @backstage/plugin-lighthouse-backend@0.2.6-next.0
+  - @backstage/plugin-nomad-backend@0.1.4-next.0
+  - @backstage/plugin-permission-backend@0.5.25-next.0
+  - @backstage/plugin-permission-common@0.7.7
+  - @backstage/plugin-permission-node@0.7.13-next.0
+  - @backstage/plugin-playlist-backend@0.3.6-next.0
+  - @backstage/plugin-proxy-backend@0.3.2-next.0
+  - @backstage/plugin-rollbar-backend@0.1.47-next.0
+  - @backstage/plugin-scaffolder-backend-module-confluence-to-markdown@0.2.3-next.0
+  - @backstage/plugin-scaffolder-backend-module-rails@0.4.19-next.0
+  - @backstage/plugin-search-backend@1.4.2-next.0
+  - @backstage/plugin-search-backend-module-elasticsearch@1.3.5-next.0
+  - @backstage/plugin-search-backend-module-pg@0.5.11-next.0
+  - @backstage/plugin-search-backend-node@1.2.6-next.0
+  - @backstage/plugin-search-common@1.2.5
+  - @backstage/plugin-tech-insights-backend-module-jsonfc@0.1.34-next.0
+  - @backstage/plugin-tech-insights-node@0.4.8-next.0
+  - @backstage/plugin-techdocs-backend@1.6.7-next.0
+  - @backstage/plugin-todo-backend@0.2.2-next.0
+
+## 0.2.86
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-search-backend-module-elasticsearch@1.3.3
+  - @backstage/plugin-search-backend-module-pg@0.5.9
+  - @backstage/plugin-azure-devops-backend@0.3.27
+  - @backstage/plugin-kubernetes-backend@0.11.3
+  - @backstage/plugin-lighthouse-backend@0.2.4
+  - @backstage/plugin-permission-backend@0.5.23
+  - @backstage/plugin-scaffolder-backend@1.16.0
+  - @backstage/plugin-devtools-backend@0.1.3
+  - @backstage/plugin-techdocs-backend@1.6.5
+  - @backstage/backend-common@0.19.2
+  - @backstage/plugin-catalog-backend@1.12.0
+  - @backstage/plugin-badges-backend@0.2.3
+  - @backstage/plugin-events-backend@0.2.9
+  - @backstage/plugin-search-backend@1.4.0
+  - @backstage/plugin-kafka-backend@0.2.41
+  - @backstage/plugin-proxy-backend@0.3.0
+  - @backstage/plugin-todo-backend@0.2.0
+  - @backstage/plugin-app-backend@0.3.48
+  - @backstage/plugin-scaffolder-backend-module-confluence-to-markdown@0.2.1
+  - @backstage/plugin-auth-backend@0.18.6
+  - @backstage/plugin-explore-backend@0.0.10
+  - @backstage/plugin-catalog-backend-module-unprocessed@0.2.0
+  - @backstage/plugin-scaffolder-backend-module-rails@0.4.17
+  - @backstage/plugin-entity-feedback-backend@0.1.6
+  - @backstage/plugin-code-coverage-backend@0.2.14
+  - @backstage/plugin-search-backend-node@1.2.4
+  - @backstage/plugin-linguist-backend@0.4.0
+  - @backstage/plugin-playlist-backend@0.3.4
+  - @backstage/plugin-jenkins-backend@0.2.3
+  - @backstage/plugin-nomad-backend@0.1.2
+  - @backstage/plugin-catalog-node@1.4.1
+  - @backstage/plugin-events-node@0.2.9
+  - @backstage/plugin-auth-node@0.2.17
+  - @backstage/integration@1.6.0
+  - @backstage/backend-tasks@0.5.5
+  - example-app@0.2.86
+  - @backstage/plugin-adr-backend@0.3.6
+  - @backstage/plugin-azure-sites-backend@0.1.10
+  - @backstage/plugin-graphql-backend@0.1.38
+  - @backstage/plugin-permission-node@0.7.11
+  - @backstage/plugin-rollbar-backend@0.1.45
+  - @backstage/plugin-tech-insights-backend@0.5.14
+  - @backstage/plugin-tech-insights-backend-module-jsonfc@0.1.32
+  - @backstage/plugin-tech-insights-node@0.4.6
+  - @backstage/catalog-client@1.4.3
+  - @backstage/catalog-model@1.4.1
+  - @backstage/config@1.0.8
+  - @backstage/plugin-permission-common@0.7.7
+  - @backstage/plugin-search-common@1.2.5
+
+## 0.2.86-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-auth-backend@0.18.6-next.2
+  - @backstage/plugin-scaffolder-backend@1.15.2-next.2
+  - @backstage/plugin-explore-backend@0.0.10-next.2
+  - @backstage/plugin-catalog-backend@1.12.0-next.2
+  - @backstage/plugin-proxy-backend@0.3.0-next.2
+  - @backstage/backend-tasks@0.5.5-next.2
+  - @backstage/plugin-app-backend@0.3.48-next.2
+  - @backstage/plugin-linguist-backend@0.4.0-next.2
+  - @backstage/plugin-techdocs-backend@1.6.5-next.2
+  - @backstage/backend-common@0.19.2-next.2
+  - example-app@0.2.86-next.2
+  - @backstage/plugin-adr-backend@0.3.6-next.2
+  - @backstage/plugin-azure-devops-backend@0.3.27-next.2
+  - @backstage/plugin-badges-backend@0.2.3-next.2
+  - @backstage/plugin-catalog-backend-module-unprocessed@0.2.0-next.2
+  - @backstage/plugin-catalog-node@1.4.1-next.2
+  - @backstage/plugin-devtools-backend@0.1.3-next.2
+  - @backstage/plugin-entity-feedback-backend@0.1.6-next.2
+  - @backstage/plugin-events-backend@0.2.9-next.2
+  - @backstage/plugin-events-node@0.2.9-next.2
+  - @backstage/plugin-kafka-backend@0.2.41-next.2
+  - @backstage/plugin-kubernetes-backend@0.11.3-next.2
+  - @backstage/plugin-lighthouse-backend@0.2.4-next.2
+  - @backstage/plugin-permission-backend@0.5.23-next.2
+  - @backstage/plugin-permission-node@0.7.11-next.2
+  - @backstage/plugin-search-backend@1.4.0-next.2
+  - @backstage/plugin-search-backend-module-elasticsearch@1.3.3-next.2
+  - @backstage/plugin-search-backend-module-pg@0.5.9-next.2
+  - @backstage/plugin-search-backend-node@1.2.4-next.2
+  - @backstage/plugin-todo-backend@0.2.0-next.2
+  - @backstage/plugin-tech-insights-backend@0.5.14-next.2
+  - @backstage/plugin-tech-insights-node@0.4.6-next.2
+  - @backstage/plugin-scaffolder-backend-module-confluence-to-markdown@0.2.1-next.2
+  - @backstage/plugin-scaffolder-backend-module-rails@0.4.17-next.2
+  - @backstage/plugin-auth-node@0.2.17-next.2
+  - @backstage/plugin-azure-sites-backend@0.1.10-next.2
+  - @backstage/plugin-code-coverage-backend@0.2.14-next.2
+  - @backstage/plugin-graphql-backend@0.1.38-next.2
+  - @backstage/plugin-jenkins-backend@0.2.3-next.2
+  - @backstage/plugin-nomad-backend@0.1.2-next.2
+  - @backstage/plugin-playlist-backend@0.3.4-next.2
+  - @backstage/plugin-rollbar-backend@0.1.45-next.2
+  - @backstage/plugin-tech-insights-backend-module-jsonfc@0.1.32-next.2
+
 ## 0.2.86-next.1
 
 ### Patch Changes
diff --git a/packages/backend/catalog-info.yaml b/packages/backend/catalog-info.yaml
new file mode 100644
index 0000000000..0e95516a41
--- /dev/null
+++ b/packages/backend/catalog-info.yaml
@@ -0,0 +1,9 @@
+apiVersion: backstage.io/v1alpha1
+kind: Component
+metadata:
+  name: example-backend
+  title: example-backend
+spec:
+  lifecycle: experimental
+  type: backstage-backend
+  owner: maintainers
diff --git a/packages/backend/package.json b/packages/backend/package.json
index 4f5b896d27..d7f8a9c403 100644
--- a/packages/backend/package.json
+++ b/packages/backend/package.json
@@ -1,6 +1,6 @@
 {
   "name": "example-backend",
-  "version": "0.2.86-next.1",
+  "version": "0.2.87-next.2",
   "main": "dist/index.cjs.js",
   "types": "src/index.ts",
   "license": "Apache-2.0",
@@ -65,8 +65,11 @@
     "@backstage/plugin-scaffolder-backend-module-confluence-to-markdown": "workspace:^",
     "@backstage/plugin-scaffolder-backend-module-rails": "workspace:^",
     "@backstage/plugin-search-backend": "workspace:^",
+    "@backstage/plugin-search-backend-module-catalog": "workspace:^",
     "@backstage/plugin-search-backend-module-elasticsearch": "workspace:^",
+    "@backstage/plugin-search-backend-module-explore": "workspace:^",
     "@backstage/plugin-search-backend-module-pg": "workspace:^",
+    "@backstage/plugin-search-backend-module-techdocs": "workspace:^",
     "@backstage/plugin-search-backend-node": "workspace:^",
     "@backstage/plugin-search-common": "workspace:^",
     "@backstage/plugin-tech-insights-backend": "workspace:^",
@@ -87,6 +90,7 @@
     "express-prom-bundle": "^6.3.6",
     "express-promise-router": "^4.1.0",
     "luxon": "^3.0.0",
+    "mysql2": "^2.2.5",
     "pg": "^8.3.0",
     "pg-connection-string": "^2.3.0",
     "prom-client": "^14.0.1",
diff --git a/packages/backend/src/plugins/search.ts b/packages/backend/src/plugins/search.ts
index 4290fcd68a..7babfe7e1f 100644
--- a/packages/backend/src/plugins/search.ts
+++ b/packages/backend/src/plugins/search.ts
@@ -16,8 +16,8 @@
 
 import { useHotCleanup } from '@backstage/backend-common';
 import { DefaultAdrCollatorFactory } from '@backstage/plugin-adr-backend';
-import { DefaultCatalogCollatorFactory } from '@backstage/plugin-catalog-backend';
-import { ToolDocumentCollatorFactory } from '@backstage/plugin-explore-backend';
+import { DefaultCatalogCollatorFactory } from '@backstage/plugin-search-backend-module-catalog';
+import { ToolDocumentCollatorFactory } from '@backstage/plugin-search-backend-module-explore';
 import { createRouter } from '@backstage/plugin-search-backend';
 import { ElasticSearchSearchEngine } from '@backstage/plugin-search-backend-module-elasticsearch';
 import { PgSearchEngine } from '@backstage/plugin-search-backend-module-pg';
@@ -26,7 +26,7 @@ import {
   LunrSearchEngine,
 } from '@backstage/plugin-search-backend-node';
 import { SearchEngine } from '@backstage/plugin-search-common';
-import { DefaultTechDocsCollatorFactory } from '@backstage/plugin-techdocs-backend';
+import { DefaultTechDocsCollatorFactory } from '@backstage/plugin-search-backend-module-techdocs';
 import { Router } from 'express';
 import { PluginEnvironment } from '../types';
 
@@ -43,6 +43,7 @@ async function createSearchEngine(
   if (await PgSearchEngine.supported(env.database)) {
     return await PgSearchEngine.fromConfig(env.config, {
       database: env.database,
+      logger: env.logger,
     });
   }
 
diff --git a/packages/catalog-client/CHANGELOG.md b/packages/catalog-client/CHANGELOG.md
index c9bf604360..d544c25244 100644
--- a/packages/catalog-client/CHANGELOG.md
+++ b/packages/catalog-client/CHANGELOG.md
@@ -1,5 +1,21 @@
 # @backstage/catalog-client
 
+## 1.4.4-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/catalog-model@1.4.2-next.1
+  - @backstage/errors@1.2.1
+
+## 1.4.4-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/catalog-model@1.4.2-next.0
+  - @backstage/errors@1.2.1
+
 ## 1.4.3
 
 ### Patch Changes
diff --git a/packages/catalog-client/catalog-info.yaml b/packages/catalog-client/catalog-info.yaml
new file mode 100644
index 0000000000..91a4cb5504
--- /dev/null
+++ b/packages/catalog-client/catalog-info.yaml
@@ -0,0 +1,10 @@
+apiVersion: backstage.io/v1alpha1
+kind: Component
+metadata:
+  name: backstage-catalog-client
+  title: '@backstage/catalog-client'
+  description: An isomorphic client for the catalog backend
+spec:
+  lifecycle: production
+  type: backstage-common-library
+  owner: maintainers
diff --git a/packages/catalog-client/package.json b/packages/catalog-client/package.json
index 99c36cdf2d..91f90e8928 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.4.3",
+  "version": "1.4.4-next.1",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
@@ -23,6 +23,7 @@
   "keywords": [
     "backstage"
   ],
+  "sideEffects": false,
   "scripts": {
     "build": "backstage-cli package build",
     "lint": "backstage-cli package lint",
diff --git a/packages/catalog-model/CHANGELOG.md b/packages/catalog-model/CHANGELOG.md
index 8425a83c85..4e07318bf7 100644
--- a/packages/catalog-model/CHANGELOG.md
+++ b/packages/catalog-model/CHANGELOG.md
@@ -1,5 +1,23 @@
 # @backstage/catalog-model
 
+## 1.4.2-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config@1.1.0-next.1
+  - @backstage/errors@1.2.1
+  - @backstage/types@1.1.0
+
+## 1.4.2-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config@1.1.0-next.0
+  - @backstage/errors@1.2.1
+  - @backstage/types@1.1.0
+
 ## 1.4.1
 
 ### Patch Changes
diff --git a/packages/catalog-model/catalog-info.yaml b/packages/catalog-model/catalog-info.yaml
new file mode 100644
index 0000000000..7b2bce99b9
--- /dev/null
+++ b/packages/catalog-model/catalog-info.yaml
@@ -0,0 +1,10 @@
+apiVersion: backstage.io/v1alpha1
+kind: Component
+metadata:
+  name: backstage-catalog-model
+  title: '@backstage/catalog-model'
+  description: Types and validators that help describe the model of a Backstage Catalog
+spec:
+  lifecycle: production
+  type: backstage-common-library
+  owner: maintainers
diff --git a/packages/catalog-model/package.json b/packages/catalog-model/package.json
index 869023127f..536fee0893 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.4.1",
+  "version": "1.4.2-next.1",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
@@ -35,6 +35,7 @@
   "keywords": [
     "backstage"
   ],
+  "sideEffects": false,
   "scripts": {
     "build": "backstage-cli package build",
     "lint": "backstage-cli package lint",
diff --git a/packages/cli-common/catalog-info.yaml b/packages/cli-common/catalog-info.yaml
new file mode 100644
index 0000000000..bc1f589fc1
--- /dev/null
+++ b/packages/cli-common/catalog-info.yaml
@@ -0,0 +1,10 @@
+apiVersion: backstage.io/v1alpha1
+kind: Component
+metadata:
+  name: backstage-cli-common
+  title: '@backstage/cli-common'
+  description: Common functionality used by cli, backend, and create-app
+spec:
+  lifecycle: experimental
+  type: backstage-node-library
+  owner: maintainers
diff --git a/packages/cli-node/CHANGELOG.md b/packages/cli-node/CHANGELOG.md
index 2615c2ddd7..8a7af72d8d 100644
--- a/packages/cli-node/CHANGELOG.md
+++ b/packages/cli-node/CHANGELOG.md
@@ -1,5 +1,15 @@
 # @backstage/cli-node
 
+## 0.1.3
+
+### Patch Changes
+
+- 12a8c94eda8d: Add package repository and homepage metadata
+- Updated dependencies
+  - @backstage/cli-common@0.1.12
+  - @backstage/errors@1.2.1
+  - @backstage/types@1.1.0
+
 ## 0.1.3-next.0
 
 ### Patch Changes
diff --git a/packages/cli-node/catalog-info.yaml b/packages/cli-node/catalog-info.yaml
new file mode 100644
index 0000000000..3497007bfa
--- /dev/null
+++ b/packages/cli-node/catalog-info.yaml
@@ -0,0 +1,10 @@
+apiVersion: backstage.io/v1alpha1
+kind: Component
+metadata:
+  name: backstage-cli-node
+  title: '@backstage/cli-node'
+  description: Node.js library for Backstage CLIs
+spec:
+  lifecycle: experimental
+  type: backstage-node-library
+  owner: maintainers
diff --git a/packages/cli-node/package.json b/packages/cli-node/package.json
index f87f70b135..589139a141 100644
--- a/packages/cli-node/package.json
+++ b/packages/cli-node/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@backstage/cli-node",
   "description": "Node.js library for Backstage CLIs",
-  "version": "0.1.3-next.0",
+  "version": "0.1.3",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
diff --git a/packages/cli/CHANGELOG.md b/packages/cli/CHANGELOG.md
index 54660d1773..dd4a35df94 100644
--- a/packages/cli/CHANGELOG.md
+++ b/packages/cli/CHANGELOG.md
@@ -1,5 +1,77 @@
 # @backstage/cli
 
+## 0.22.13-next.2
+
+### Patch Changes
+
+- 8cec7664e146: Removed `@types/node` dependency
+- ea779492ad88: Updated dependency `run-script-webpack-plugin` to `^0.2.0`.
+- Updated dependencies
+  - @backstage/release-manifests@0.0.10-next.0
+  - @backstage/config-loader@1.5.0-next.2
+  - @backstage/config@1.1.0-next.1
+  - @backstage/integration@1.7.0-next.2
+  - @backstage/catalog-model@1.4.2-next.1
+  - @backstage/cli-common@0.1.12
+  - @backstage/cli-node@0.1.3
+  - @backstage/errors@1.2.1
+  - @backstage/eslint-plugin@0.1.3
+  - @backstage/types@1.1.0
+
+## 0.22.13-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config@1.1.0-next.0
+  - @backstage/integration@1.7.0-next.1
+  - @backstage/catalog-model@1.4.2-next.0
+  - @backstage/config-loader@1.5.0-next.1
+  - @backstage/cli-common@0.1.12
+  - @backstage/cli-node@0.1.3
+  - @backstage/errors@1.2.1
+  - @backstage/eslint-plugin@0.1.3
+  - @backstage/release-manifests@0.0.9
+  - @backstage/types@1.1.0
+
+## 0.22.12-next.0
+
+### Patch Changes
+
+- 278d9326eb40: Added the ability to create a plain backend module with the `new` command.
+- 71d4368ae5cc: Added support for the `dev/index` entry point for backend plugins and modules.
+- Updated dependencies
+  - @backstage/integration@1.7.0-next.0
+  - @backstage/config-loader@1.5.0-next.0
+  - @backstage/catalog-model@1.4.1
+  - @backstage/cli-common@0.1.12
+  - @backstage/cli-node@0.1.3
+  - @backstage/config@1.0.8
+  - @backstage/errors@1.2.1
+  - @backstage/eslint-plugin@0.1.3
+  - @backstage/release-manifests@0.0.9
+  - @backstage/types@1.1.0
+
+## 0.22.10
+
+### Patch Changes
+
+- 3f67cefb4780: Reload the frontend when app config changes
+- cebbf8a27f3c: Enable to print the config schema not merged with the `--no-merge` flag
+- 5c28ebc79fd6: Updated dependency `esbuild` to `^0.19.0`.
+- 971bdd6a4732: Bumped internal `nodemon` dependency.
+- Updated dependencies
+  - @backstage/config-loader@1.4.0
+  - @backstage/cli-node@0.1.3
+  - @backstage/integration@1.6.0
+  - @backstage/catalog-model@1.4.1
+  - @backstage/cli-common@0.1.12
+  - @backstage/config@1.0.8
+  - @backstage/errors@1.2.1
+  - @backstage/eslint-plugin@0.1.3
+  - @backstage/release-manifests@0.0.9
+  - @backstage/types@1.1.0
+
 ## 0.22.10-next.1
 
 ### Patch Changes
diff --git a/packages/cli/catalog-info.yaml b/packages/cli/catalog-info.yaml
new file mode 100644
index 0000000000..212ba472d4
--- /dev/null
+++ b/packages/cli/catalog-info.yaml
@@ -0,0 +1,10 @@
+apiVersion: backstage.io/v1alpha1
+kind: Component
+metadata:
+  name: backstage-cli
+  title: '@backstage/cli'
+  description: CLI for developing Backstage plugins and apps
+spec:
+  lifecycle: experimental
+  type: backstage-cli
+  owner: maintainers
diff --git a/packages/cli/cli-report.md b/packages/cli/cli-report.md
index e20634df4e..6323eb0035 100644
--- a/packages/cli/cli-report.md
+++ b/packages/cli/cli-report.md
@@ -405,6 +405,7 @@ Options:
 Commands:
   build [options]
   lint [options]
+  fix [options]
   clean
   list-deprecations [options]
   test [options]
@@ -431,6 +432,16 @@ Options:
   -h, --help
 ```
 
+### `backstage-cli repo fix`
+
+```
+Usage: backstage-cli repo fix [options]
+
+Options:
+  --check
+  -h, --help
+```
+
 ### `backstage-cli repo lint`
 
 ```
diff --git a/packages/cli/package.json b/packages/cli/package.json
index 8fe6a579ea..604832ed89 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.10-next.1",
+  "version": "0.22.13-next.2",
   "publishConfig": {
     "access": "public"
   },
@@ -41,6 +41,7 @@
     "@backstage/release-manifests": "workspace:^",
     "@backstage/types": "workspace:^",
     "@esbuild-kit/cjs-loader": "^2.4.1",
+    "@esbuild-kit/esm-loader": "^2.5.5",
     "@manypkg/get-packages": "^1.1.3",
     "@octokit/graphql": "^5.0.0",
     "@octokit/graphql-schema": "^13.7.0",
@@ -78,7 +79,7 @@
     "cross-spawn": "^7.0.3",
     "css-loader": "^6.5.1",
     "diff": "^5.0.0",
-    "esbuild": "^0.18.0",
+    "esbuild": "^0.19.0",
     "esbuild-loader": "^2.18.0",
     "eslint": "^8.6.0",
     "eslint-config-prettier": "^8.3.0",
@@ -122,7 +123,7 @@
     "rollup-plugin-esbuild": "^4.7.2",
     "rollup-plugin-postcss": "^4.0.0",
     "rollup-pluginutils": "^2.8.2",
-    "run-script-webpack-plugin": "^0.1.0",
+    "run-script-webpack-plugin": "^0.2.0",
     "semver": "^7.5.3",
     "style-loader": "^3.3.1",
     "sucrase": "^3.20.2",
@@ -140,6 +141,8 @@
   },
   "devDependencies": {
     "@backstage/backend-common": "workspace:^",
+    "@backstage/backend-plugin-api": "workspace:^",
+    "@backstage/backend-test-utils": "workspace:^",
     "@backstage/config": "workspace:^",
     "@backstage/core-app-api": "workspace:^",
     "@backstage/core-components": "workspace:^",
@@ -167,7 +170,7 @@
     "del": "^7.0.0",
     "mock-fs": "^5.1.0",
     "msw": "^1.0.0",
-    "nodemon": "^2.0.2",
+    "nodemon": "^3.0.1",
     "ts-node": "^10.0.0",
     "type-fest": "^2.19.0"
   },
diff --git a/packages/cli/src/commands/index.ts b/packages/cli/src/commands/index.ts
index a7f65588a5..b1941ddac8 100644
--- a/packages/cli/src/commands/index.ts
+++ b/packages/cli/src/commands/index.ts
@@ -67,6 +67,15 @@ export function registerRepoCommand(program: Command) {
     .option('--fix', 'Attempt to automatically fix violations')
     .action(lazy(() => import('./repo/lint').then(m => m.command)));
 
+  command
+    .command('fix')
+    .description('Automatically fix packages in the project')
+    .option(
+      '--check',
+      'Fail if any packages would have been changed by the command',
+    )
+    .action(lazy(() => import('./repo/fix').then(m => m.command)));
+
   command
     .command('clean')
     .description('Delete cache and output directories')
diff --git a/packages/cli/src/commands/migrate/packageExports.ts b/packages/cli/src/commands/migrate/packageExports.ts
index 82d0b73ac2..6757d01bbe 100644
--- a/packages/cli/src/commands/migrate/packageExports.ts
+++ b/packages/cli/src/commands/migrate/packageExports.ts
@@ -14,108 +14,21 @@
  * limitations under the License.
  */
 
-import fs from 'fs-extra';
-import { resolve as resolvePath } from 'path';
-import { BackstagePackageJson, PackageGraph } from '@backstage/cli-node';
-
-function trimRelative(path: string): string {
-  if (path.startsWith('./')) {
-    return path.slice(2);
-  }
-  return path;
-}
+import {
+  fixPackageExports,
+  readFixablePackages,
+  writeFixedPackages,
+} from '../repo/fix';
 
 export async function command() {
-  const packages = await PackageGraph.listTargetPackages();
-
-  await Promise.all(
-    packages.map(async ({ dir, packageJson }) => {
-      let changed = false;
-      let newPackageJson = packageJson;
-
-      let { exports: exp } = newPackageJson;
-      if (!exp) {
-        return;
-      }
-      if (Array.isArray(exp)) {
-        throw new Error('Unexpected array in package.json exports field');
-      }
-
-      // If exports is a string we rewrite it to an object to add package.json
-      if (typeof exp === 'string') {
-        changed = true;
-        exp = { '.': exp };
-        newPackageJson.exports = exp;
-      } else if (typeof exp !== 'object') {
-        return;
-      }
-
-      if (!exp['./package.json']) {
-        changed = true;
-        exp['./package.json'] = './package.json';
-      }
-
-      const existingTypesVersions = JSON.stringify(packageJson.typesVersions);
-
-      const typeEntries: Record<string, [string]> = {};
-      for (const [path, value] of Object.entries(exp)) {
-        // Main entry point does not need to be listed
-        if (path === '.') {
-          continue;
-        }
-        const newPath = trimRelative(path);
-
-        if (typeof value === 'string') {
-          typeEntries[newPath] = [trimRelative(value)];
-        } else if (
-          value &&
-          typeof value === 'object' &&
-          !Array.isArray(value)
-        ) {
-          if (typeof value.types === 'string') {
-            typeEntries[newPath] = [trimRelative(value.types)];
-          } else if (typeof value.default === 'string') {
-            typeEntries[newPath] = [trimRelative(value.default)];
-          }
-        }
-      }
-
-      const typesVersions = { '*': typeEntries };
-      if (existingTypesVersions !== JSON.stringify(typesVersions)) {
-        console.log(`Synchronizing exports in ${packageJson.name}`);
-        const newPkgEntries = Object.entries(newPackageJson).filter(
-          ([name]) => name !== 'typesVersions',
-        );
-        newPkgEntries.splice(
-          newPkgEntries.findIndex(([name]) => name === 'exports') + 1,
-          0,
-          ['typesVersions', typesVersions],
-        );
-
-        newPackageJson = Object.fromEntries(
-          newPkgEntries,
-        ) as BackstagePackageJson;
-        changed = true;
-      }
-
-      // Remove the legacy fields from publishConfig, which are no longer needed
-      const publishConfig = newPackageJson.publishConfig as
-        | Record<string, string>
-        | undefined;
-      if (publishConfig) {
-        for (const field of ['main', 'module', 'browser', 'types']) {
-          if (publishConfig[field]) {
-            delete publishConfig[field];
-            changed = true;
-          }
-        }
-      }
-
-      if (changed) {
-        await fs.writeJson(resolvePath(dir, 'package.json'), newPackageJson, {
-          spaces: 2,
-        });
-      }
-    }),
+  console.log(
+    'The `migrate package-exports` command is deprecated, use `repo fix` instead.',
   );
+  const packages = await readFixablePackages();
+
+  for (const pkg of packages) {
+    fixPackageExports(pkg);
+  }
+
+  await writeFixedPackages(packages);
 }
diff --git a/packages/cli/src/commands/repo/fix.ts b/packages/cli/src/commands/repo/fix.ts
new file mode 100644
index 0000000000..bd5b375ed5
--- /dev/null
+++ b/packages/cli/src/commands/repo/fix.ts
@@ -0,0 +1,207 @@
+/*
+ * 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 {
+  BackstagePackage,
+  BackstagePackageJson,
+  PackageGraph,
+  PackageRoles,
+} from '@backstage/cli-node';
+import { OptionValues } from 'commander';
+import fs from 'fs-extra';
+import { resolve as resolvePath } from 'path';
+import { paths } from '../../lib/paths';
+
+/**
+ * A mutable object representing a package.json file with potential fixes.
+ */
+export interface FixablePackage extends BackstagePackage {
+  changed: boolean;
+}
+
+export async function readFixablePackages(): Promise<FixablePackage[]> {
+  const packages = await PackageGraph.listTargetPackages();
+  return packages.map(pkg => ({ ...pkg, changed: false }));
+}
+
+export function printPackageFixHint(packages: FixablePackage[]) {
+  const changed = packages.filter(pkg => pkg.changed);
+  if (changed.length > 0) {
+    const rootPkg = require(paths.resolveTargetRoot('package.json'));
+    const fixCmd =
+      rootPkg.scripts?.fix === 'backstage-cli repo fix'
+        ? 'fix'
+        : 'backstage-cli repo fix';
+    console.log(
+      `The following packages are out of sync, run 'yarn ${fixCmd}' to fix them:`,
+    );
+    for (const pkg of changed) {
+      console.log(`  ${pkg.packageJson.name}`);
+    }
+    return true;
+  }
+  return false;
+}
+
+export async function writeFixedPackages(
+  packages: FixablePackage[],
+): Promise<void> {
+  await Promise.all(
+    packages.map(async pkg => {
+      if (!pkg.changed) {
+        return;
+      }
+
+      await fs.writeJson(
+        resolvePath(pkg.dir, 'package.json'),
+        pkg.packageJson,
+        {
+          spaces: 2,
+        },
+      );
+    }),
+  );
+}
+
+function trimRelative(path: string): string {
+  if (path.startsWith('./')) {
+    return path.slice(2);
+  }
+  return path;
+}
+
+export function fixPackageExports(pkg: FixablePackage) {
+  let { exports: exp } = pkg.packageJson;
+  if (!exp) {
+    return;
+  }
+  if (Array.isArray(exp)) {
+    throw new Error('Unexpected array in package.json exports field');
+  }
+
+  // If exports is a string we rewrite it to an object to add package.json
+  if (typeof exp === 'string') {
+    pkg.changed = true;
+    exp = { '.': exp };
+    pkg.packageJson.exports = exp;
+  } else if (typeof exp !== 'object') {
+    return;
+  }
+
+  if (!exp['./package.json']) {
+    pkg.changed = true;
+    exp['./package.json'] = './package.json';
+  }
+
+  const existingTypesVersions = JSON.stringify(pkg.packageJson.typesVersions);
+
+  const typeEntries: Record<string, [string]> = {};
+  for (const [path, value] of Object.entries(exp)) {
+    // Main entry point does not need to be listed
+    if (path === '.') {
+      continue;
+    }
+    const newPath = trimRelative(path);
+
+    if (typeof value === 'string') {
+      typeEntries[newPath] = [trimRelative(value)];
+    } else if (value && typeof value === 'object' && !Array.isArray(value)) {
+      if (typeof value.types === 'string') {
+        typeEntries[newPath] = [trimRelative(value.types)];
+      } else if (typeof value.default === 'string') {
+        typeEntries[newPath] = [trimRelative(value.default)];
+      }
+    }
+  }
+
+  const typesVersions = { '*': typeEntries };
+  if (existingTypesVersions !== JSON.stringify(typesVersions)) {
+    const newPkgEntries = Object.entries(pkg.packageJson).filter(
+      ([name]) => name !== 'typesVersions',
+    );
+    newPkgEntries.splice(
+      newPkgEntries.findIndex(([name]) => name === 'exports') + 1,
+      0,
+      ['typesVersions', typesVersions],
+    );
+
+    pkg.packageJson = Object.fromEntries(newPkgEntries) as BackstagePackageJson;
+    pkg.changed = true;
+  }
+
+  // Remove the legacy fields from publishConfig, which are no longer needed
+  const publishConfig = pkg.packageJson.publishConfig as
+    | Record<string, string>
+    | undefined;
+  if (publishConfig) {
+    for (const field of ['main', 'module', 'browser', 'types']) {
+      if (publishConfig[field]) {
+        delete publishConfig[field];
+        pkg.changed = true;
+      }
+    }
+  }
+}
+
+export function fixSideEffects(pkg: FixablePackage) {
+  const role = PackageRoles.getRoleFromPackage(pkg.packageJson);
+  if (!role) {
+    return;
+  }
+
+  const roleInfo = PackageRoles.getRoleInfo(role);
+
+  // Only web and common packages benefit from being marked as side effect free
+  if (roleInfo.platform === 'node') {
+    return;
+  }
+  // Bundled packages don't need to mark themselves as having no side effects
+  if (roleInfo.output.length === 1 && roleInfo.output[0] === 'bundle') {
+    return;
+  }
+
+  // Already declared
+  if ('sideEffects' in pkg.packageJson) {
+    return;
+  }
+
+  const pkgEntries = Object.entries(pkg.packageJson);
+  pkgEntries.splice(
+    // Place it just above the scripts field
+    pkgEntries.findIndex(([name]) => name === 'scripts'),
+    0,
+    ['sideEffects', false],
+  );
+  pkg.packageJson = Object.fromEntries(pkgEntries) as BackstagePackageJson;
+  pkg.changed = true;
+}
+
+export async function command(opts: OptionValues): Promise<void> {
+  const packages = await readFixablePackages();
+
+  for (const pkg of packages) {
+    fixPackageExports(pkg);
+    fixSideEffects(pkg);
+  }
+
+  if (opts.check) {
+    if (printPackageFixHint(packages)) {
+      process.exit(1);
+    }
+  } else {
+    await writeFixedPackages(packages);
+  }
+}
diff --git a/packages/cli/src/commands/start/startBackend.ts b/packages/cli/src/commands/start/startBackend.ts
index 3e6a13be96..622eeb9d1b 100644
--- a/packages/cli/src/commands/start/startBackend.ts
+++ b/packages/cli/src/commands/start/startBackend.ts
@@ -26,7 +26,17 @@ interface StartBackendOptions {
 }
 
 export async function startBackend(options: StartBackendOptions) {
-  if (process.env.EXPERIMENTAL_BACKEND_START) {
+  const hasDev = await fs.pathExists(paths.resolveTarget('dev'));
+  if (hasDev) {
+    const waitForExit = await startBackendExperimental({
+      entry: 'dev/index',
+      checksEnabled: false, // not supported
+      inspectEnabled: options.inspectEnabled,
+      inspectBrkEnabled: options.inspectBrkEnabled,
+    });
+
+    await waitForExit();
+  } else if (process.env.EXPERIMENTAL_BACKEND_START) {
     const waitForExit = await startBackendExperimental({
       entry: 'src/index',
       checksEnabled: false, // not supported
diff --git a/packages/cli/src/lib/builder/config.ts b/packages/cli/src/lib/builder/config.ts
index 8035796cba..99d8e96498 100644
--- a/packages/cli/src/lib/builder/config.ts
+++ b/packages/cli/src/lib/builder/config.ts
@@ -157,7 +157,7 @@ export async function makeRollupConfigs(
         paths.resolveTargetRoot(
           'dist-types',
           relativePath(paths.targetRoot, targetDir),
-          e.path.replace(/\.ts$/, '.d.ts'),
+          e.path.replace(/\.(?:ts|tsx)$/, '.d.ts'),
         ),
       ]),
     );
diff --git a/packages/cli/src/lib/bundler/bundle.ts b/packages/cli/src/lib/bundler/bundle.ts
index 7c45528c5c..11e18320f1 100644
--- a/packages/cli/src/lib/bundler/bundle.ts
+++ b/packages/cli/src/lib/bundler/bundle.ts
@@ -27,6 +27,7 @@ import { createConfig, resolveBaseUrl } from './config';
 import { BuildOptions } from './types';
 import { resolveBundlingPaths } from './paths';
 import chalk from 'chalk';
+import { createDetectedModulesEntryPoint } from './packageDetection';
 
 // TODO(Rugvip): Limits from CRA, we might want to tweak these though.
 const WARN_AFTER_BUNDLE_GZIP_SIZE = 512 * 1024;
@@ -40,12 +41,19 @@ export async function buildBundle(options: BuildOptions) {
   const { statsJsonEnabled, schema: configSchema } = options;
 
   const paths = resolveBundlingPaths(options);
+
+  const detectedModulesEntryPoint = await createDetectedModulesEntryPoint({
+    config: options.fullConfig,
+    targetPath: paths.targetPath,
+  });
+
   const config = await createConfig(paths, {
     ...options,
     checksEnabled: false,
     isDev: false,
     baseUrl: resolveBaseUrl(options.frontendConfig),
     getFrontendAppConfigs: () => options.frontendAppConfigs,
+    additionalEntryPoints: detectedModulesEntryPoint,
   });
 
   const isCi = yn(process.env.CI, { default: false });
diff --git a/packages/cli/src/lib/bundler/config.ts b/packages/cli/src/lib/bundler/config.ts
index 2f09a66e18..c9238e7e48 100644
--- a/packages/cli/src/lib/bundler/config.ts
+++ b/packages/cli/src/lib/bundler/config.ts
@@ -161,7 +161,7 @@ export async function createConfig(
     },
     devtool: isDev ? 'eval-cheap-module-source-map' : 'source-map',
     context: paths.targetPath,
-    entry: [paths.targetEntry],
+    entry: [...(options.additionalEntryPoints ?? []), paths.targetEntry],
     resolve: {
       extensions: ['.ts', '.tsx', '.mjs', '.js', '.jsx', '.json', '.wasm'],
       mainFields: ['browser', 'module', 'main'],
diff --git a/packages/cli/src/lib/bundler/packageDetection.ts b/packages/cli/src/lib/bundler/packageDetection.ts
new file mode 100644
index 0000000000..46cffdceb0
--- /dev/null
+++ b/packages/cli/src/lib/bundler/packageDetection.ts
@@ -0,0 +1,131 @@
+/*
+ * 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 { BackstagePackageJson } from '@backstage/cli-node';
+import { Config } from '@backstage/config';
+import chokidar from 'chokidar';
+import fs from 'fs-extra';
+import { join as joinPath, resolve as resolvePath } from 'path';
+import { paths as cliPaths } from '../paths';
+
+const DETECTED_MODULES_MODULE_NAME = '__backstage-autodetected-plugins__';
+
+interface PackageDetectionConfig {
+  include?: string[];
+  exclude?: string[];
+}
+
+function readPackageDetectionConfig(
+  config: Config,
+): PackageDetectionConfig | undefined {
+  const packages = config.getOptional('app.experimental.packages');
+  if (packages === undefined || packages === null) {
+    return undefined;
+  }
+
+  if (typeof packages === 'string') {
+    if (packages !== 'all') {
+      throw new Error(
+        `Invalid app.experimental.packages mode, got '${packages}', expected 'all'`,
+      );
+    }
+    return {};
+  }
+
+  return {
+    include: config.getOptionalStringArray('app.experimental.packages.include'),
+    exclude: config.getOptionalStringArray('app.experimental.packages.exclude'),
+  };
+}
+
+async function detectPackages(
+  targetPath: string,
+  { include, exclude }: PackageDetectionConfig,
+) {
+  const pkg: BackstagePackageJson = await fs.readJson(
+    resolvePath(targetPath, 'package.json'),
+  );
+
+  return Object.keys(pkg.dependencies ?? {})
+    .flatMap(depName => {
+      const depPackageJson: BackstagePackageJson = require(require.resolve(
+        `${depName}/package.json`,
+        { paths: [targetPath] },
+      ));
+      if (
+        ['frontend-plugin', 'frontend-plugin-module'].includes(
+          depPackageJson.backstage?.role ?? '',
+        )
+      ) {
+        return [depName];
+      }
+      return [];
+    })
+    .filter(name => {
+      if (exclude?.includes(name)) {
+        return false;
+      }
+      if (include && !include.includes(name)) {
+        return false;
+      }
+      return true;
+    });
+}
+
+async function writeDetectedPackagesModule(packageNames: string[]) {
+  const requirePackageScript = packageNames
+    ?.map(pkg => `{ name: '${pkg}', default: require('${pkg}').default }`)
+    .join(',');
+
+  await fs.writeFile(
+    joinPath(
+      cliPaths.targetRoot,
+      'node_modules',
+      `${DETECTED_MODULES_MODULE_NAME}.js`,
+    ),
+    `window['__@backstage/discovered__'] = { modules: [${requirePackageScript}] };`,
+  );
+}
+
+export async function createDetectedModulesEntryPoint(options: {
+  config: Config;
+  targetPath: string;
+  watch?: () => void;
+}): Promise<string[]> {
+  const { config, watch, targetPath } = options;
+
+  const detectionConfig = readPackageDetectionConfig(config);
+  if (!detectionConfig) {
+    return [];
+  }
+
+  if (watch) {
+    const watcher = chokidar.watch(resolvePath(targetPath, 'package.json'));
+
+    watcher.on('change', async () => {
+      await writeDetectedPackagesModule(
+        await detectPackages(targetPath, detectionConfig),
+      );
+      watch();
+    });
+  }
+
+  await writeDetectedPackagesModule(
+    await detectPackages(targetPath, detectionConfig),
+  );
+
+  return [DETECTED_MODULES_MODULE_NAME];
+}
diff --git a/packages/cli/src/lib/bundler/server.ts b/packages/cli/src/lib/bundler/server.ts
index 74c6b2a53c..78f6bb7823 100644
--- a/packages/cli/src/lib/bundler/server.ts
+++ b/packages/cli/src/lib/bundler/server.ts
@@ -14,27 +14,31 @@
  * limitations under the License.
  */
 
+import { PackageGraph } from '@backstage/cli-node';
+import { AppConfig } from '@backstage/config';
+import chalk from 'chalk';
 import fs from 'fs-extra';
+import uniq from 'lodash/uniq';
+import openBrowser from 'react-dev-utils/openBrowser';
 import webpack from 'webpack';
 import WebpackDevServer from 'webpack-dev-server';
-import openBrowser from 'react-dev-utils/openBrowser';
-import uniq from 'lodash/uniq';
 
-import { createConfig, resolveBaseUrl } from './config';
-import { ServeOptions } from './types';
-import { resolveBundlingPaths } from './paths';
-import { paths as libPaths } from '../../lib/paths';
-import { loadCliConfig } from '../config';
-import chalk from 'chalk';
-import { AppConfig } from '@backstage/config';
-import { PackageGraph } from '@backstage/cli-node';
-import { Lockfile } from '../versioning';
 import {
   forbiddenDuplicatesFilter,
   includedFilter,
 } from '../../commands/versions/lint';
+import { paths as libPaths } from '../../lib/paths';
+import { loadCliConfig } from '../config';
+import { Lockfile } from '../versioning';
+import { createConfig, resolveBaseUrl } from './config';
+import { createDetectedModulesEntryPoint } from './packageDetection';
+import { resolveBundlingPaths } from './paths';
+import { ServeOptions } from './types';
 
 export async function serveBundle(options: ServeOptions) {
+  const paths = resolveBundlingPaths(options);
+  const targetPkg = await fs.readJson(paths.targetPackageJson);
+
   if (options.verifyVersions) {
     const lockfile = await Lockfile.load(
       libPaths.resolveTargetRoot('yarn.lock'),
@@ -115,10 +119,16 @@ export async function serveBundle(options: ServeOptions) {
     Number(url.port) ||
     (url.protocol === 'https:' ? 443 : 80);
 
-  const paths = resolveBundlingPaths(options);
-  const pkgPath = paths.targetPackageJson;
-  const pkg = await fs.readJson(pkgPath);
+  const detectedModulesEntryPoint = await createDetectedModulesEntryPoint({
+    config: fullConfig,
+    targetPath: paths.targetPath,
+    watch() {
+      server?.invalidate();
+    },
+  });
+
   const config = await createConfig(paths, {
+    ...options,
     checksEnabled: options.checksEnabled,
     isDev: true,
     baseUrl: url,
@@ -126,6 +136,7 @@ export async function serveBundle(options: ServeOptions) {
     getFrontendAppConfigs: () => {
       return latestFrontendAppConfigs;
     },
+    additionalEntryPoints: detectedModulesEntryPoint,
   });
 
   const compiler = webpack(config);
@@ -160,7 +171,7 @@ export async function serveBundle(options: ServeOptions) {
           : false,
       host,
       port,
-      proxy: pkg.proxy,
+      proxy: targetPkg.proxy,
       // When the dev server is behind a proxy, the host and public hostname differ
       allowedHosts: [url.hostname],
       client: {
diff --git a/packages/cli/src/lib/bundler/types.ts b/packages/cli/src/lib/bundler/types.ts
index 69e75b113d..414414fa81 100644
--- a/packages/cli/src/lib/bundler/types.ts
+++ b/packages/cli/src/lib/bundler/types.ts
@@ -25,6 +25,7 @@ export type BundlingOptions = {
   getFrontendAppConfigs(): AppConfig[];
   baseUrl: URL;
   parallelism?: number;
+  additionalEntryPoints?: string[];
 };
 
 export type ServeOptions = BundlingPathsOptions & {
@@ -41,6 +42,7 @@ export type BuildOptions = BundlingPathsOptions & {
   schema?: ConfigSchema;
   frontendConfig: Config;
   frontendAppConfigs: AppConfig[];
+  fullConfig: Config;
 };
 
 export type BackendBundlingOptions = {
diff --git a/packages/cli/src/lib/experimental/startBackendExperimental.ts b/packages/cli/src/lib/experimental/startBackendExperimental.ts
index c08fbda0da..f4875ce1e5 100644
--- a/packages/cli/src/lib/experimental/startBackendExperimental.ts
+++ b/packages/cli/src/lib/experimental/startBackendExperimental.ts
@@ -25,7 +25,12 @@ import debounce from 'lodash/debounce';
 import spawn from 'cross-spawn';
 import { paths } from '../paths';
 
-const loaderArgs = ['--require', require.resolve('@esbuild-kit/cjs-loader')];
+const loaderArgs = [
+  '--require',
+  require.resolve('@esbuild-kit/cjs-loader'),
+  '--loader',
+  require.resolve('@esbuild-kit/esm-loader'),
+];
 
 export async function startBackendExperimental(options: BackendServeOptions) {
   const envEnv = process.env as { NODE_ENV: string };
diff --git a/packages/cli/src/lib/new/factories/backendModule.test.ts b/packages/cli/src/lib/new/factories/backendModule.test.ts
new file mode 100644
index 0000000000..c633b1c1b2
--- /dev/null
+++ b/packages/cli/src/lib/new/factories/backendModule.test.ts
@@ -0,0 +1,121 @@
+/*
+ * 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 fs from 'fs-extra';
+import mockFs from 'mock-fs';
+import { sep, resolve as resolvePath } from 'path';
+import { paths } from '../../paths';
+import { Task } from '../../tasks';
+import { FactoryRegistry } from '../FactoryRegistry';
+import { createMockOutputStream, mockPaths } from './common/testUtils';
+import { backendModule } from './backendModule';
+
+describe('backendModule factory', () => {
+  beforeEach(() => {
+    mockPaths({
+      targetRoot: '/root',
+    });
+  });
+
+  afterEach(() => {
+    mockFs.restore();
+    jest.resetAllMocks();
+  });
+
+  it('should create a backend plugin', async () => {
+    mockFs({
+      '/root': {
+        packages: {
+          backend: {
+            'package.json': JSON.stringify({}),
+          },
+        },
+        plugins: mockFs.directory(),
+      },
+      [paths.resolveOwn('templates')]: mockFs.load(
+        paths.resolveOwn('templates'),
+      ),
+    });
+
+    const options = await FactoryRegistry.populateOptions(backendModule, {
+      id: 'test',
+      moduleId: 'tester-two',
+    });
+
+    let modified = false;
+
+    const [output, mockStream] = createMockOutputStream();
+    jest.spyOn(process, 'stderr', 'get').mockReturnValue(mockStream);
+    jest.spyOn(Task, 'forCommand').mockResolvedValue();
+
+    await backendModule.create(options, {
+      private: true,
+      isMonoRepo: true,
+      defaultVersion: '1.0.0',
+      markAsModified: () => {
+        modified = true;
+      },
+      createTemporaryDirectory: () => fs.mkdtemp('test'),
+    });
+
+    expect(modified).toBe(true);
+
+    expect(output).toEqual([
+      '',
+      'Creating backend module backstage-plugin-test-backend-module-tester-two',
+      'Checking Prerequisites:',
+      `availability  plugins${sep}test-backend-module-tester-two`,
+      'creating      temp dir',
+      'Executing Template:',
+      'copying       .eslintrc.js',
+      'templating    README.md.hbs',
+      'templating    package.json.hbs',
+      'templating    index.ts.hbs',
+      'templating    module.ts.hbs',
+      'Installing:',
+      `moving        plugins${sep}test-backend-module-tester-two`,
+      'backend       adding dependency',
+    ]);
+
+    await expect(
+      fs.readJson('/root/packages/backend/package.json'),
+    ).resolves.toEqual({
+      dependencies: {
+        'backstage-plugin-test-backend-module-tester-two': '^1.0.0',
+      },
+    });
+    const moduleFile = await fs.readFile(
+      '/root/plugins/test-backend-module-tester-two/src/module.ts',
+      'utf-8',
+    );
+
+    expect(moduleFile).toContain(
+      `const testModuleTesterTwo = createBackendModule({`,
+    );
+    expect(moduleFile).toContain(`pluginId: 'test',`);
+    expect(moduleFile).toContain(`moduleId: 'tester-two',`);
+
+    expect(Task.forCommand).toHaveBeenCalledTimes(2);
+    expect(Task.forCommand).toHaveBeenCalledWith('yarn install', {
+      cwd: resolvePath('/root/plugins/test-backend-module-tester-two'),
+      optional: true,
+    });
+    expect(Task.forCommand).toHaveBeenCalledWith('yarn lint --fix', {
+      cwd: resolvePath('/root/plugins/test-backend-module-tester-two'),
+      optional: true,
+    });
+  });
+});
diff --git a/packages/cli/src/lib/new/factories/backendModule.ts b/packages/cli/src/lib/new/factories/backendModule.ts
new file mode 100644
index 0000000000..221adcb1f3
--- /dev/null
+++ b/packages/cli/src/lib/new/factories/backendModule.ts
@@ -0,0 +1,100 @@
+/*
+ * 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 fs from 'fs-extra';
+import chalk from 'chalk';
+import camelCase from 'lodash/camelCase';
+import { paths } from '../../paths';
+import { addCodeownersEntry, getCodeownersFilePath } from '../../codeowners';
+import { createFactory, CreateContext } from '../types';
+import { addPackageDependency, Task } from '../../tasks';
+import {
+  moduleIdIdPrompt,
+  ownerPrompt,
+  pluginIdPrompt,
+} from './common/prompts';
+import { executePluginPackageTemplate } from './common/tasks';
+
+type Options = {
+  id: string;
+  moduleId: string;
+  owner?: string;
+  codeOwnersPath?: string;
+};
+
+export const backendModule = createFactory<Options>({
+  name: 'backend-module',
+  description: 'A new backend module',
+  optionsDiscovery: async () => ({
+    codeOwnersPath: await getCodeownersFilePath(paths.targetRoot),
+  }),
+  optionsPrompts: [pluginIdPrompt(), moduleIdIdPrompt(), ownerPrompt()],
+  async create(options: Options, ctx: CreateContext) {
+    const { id: pluginId, moduleId } = options;
+    const dirName = `${pluginId}-backend-module-${moduleId}`;
+    const name = ctx.scope
+      ? `@${ctx.scope}/plugin-${dirName}`
+      : `backstage-plugin-${dirName}`;
+
+    Task.log();
+    Task.log(`Creating backend module ${chalk.cyan(name)}`);
+
+    const targetDir = ctx.isMonoRepo
+      ? paths.resolveTargetRoot('plugins', dirName)
+      : paths.resolveTargetRoot(`backstage-plugin-${dirName}`);
+
+    const moduleCamelCase = camelCase(moduleId);
+    const modulePascalCase =
+      moduleCamelCase[0].toUpperCase() + moduleCamelCase.slice(1);
+    const moduleVar = `${camelCase(pluginId)}Module${modulePascalCase}`;
+    await executePluginPackageTemplate(ctx, {
+      targetDir,
+      templateName: 'default-backend-module',
+      values: {
+        pluginId,
+        moduleId,
+        name,
+        moduleVar,
+        packageVersion: ctx.defaultVersion,
+        privatePackage: ctx.private,
+        npmRegistry: ctx.npmRegistry,
+      },
+    });
+
+    if (await fs.pathExists(paths.resolveTargetRoot('packages/backend'))) {
+      await Task.forItem('backend', 'adding dependency', async () => {
+        await addPackageDependency(
+          paths.resolveTargetRoot('packages/backend/package.json'),
+          {
+            dependencies: {
+              [name]: `^${ctx.defaultVersion}`,
+            },
+          },
+        );
+      });
+    }
+
+    if (options.owner) {
+      await addCodeownersEntry(`/plugins/${dirName}`, options.owner);
+    }
+
+    await Task.forCommand('yarn install', { cwd: targetDir, optional: true });
+    await Task.forCommand('yarn lint --fix', {
+      cwd: targetDir,
+      optional: true,
+    });
+  },
+});
diff --git a/packages/cli/src/lib/new/factories/common/prompts.ts b/packages/cli/src/lib/new/factories/common/prompts.ts
index 9c7672ddfb..428ba8f9d3 100644
--- a/packages/cli/src/lib/new/factories/common/prompts.ts
+++ b/packages/cli/src/lib/new/factories/common/prompts.ts
@@ -33,6 +33,22 @@ export function pluginIdPrompt(): Prompt<{ id: string }> {
   };
 }
 
+export function moduleIdIdPrompt(): Prompt<{ moduleId: string }> {
+  return {
+    type: 'input',
+    name: 'moduleId',
+    message: 'Enter the ID of the module [required]',
+    validate: (value: string) => {
+      if (!value) {
+        return 'Please enter the ID of the module';
+      } else if (!/^[a-z0-9]+(-[a-z0-9]+)*$/.test(value)) {
+        return 'Module IDs must be lowercase and contain only letters, digits, and dashes.';
+      }
+      return true;
+    },
+  };
+}
+
 export function ownerPrompt(): Prompt<{
   owner?: string;
   codeOwnersPath?: string;
diff --git a/packages/cli/src/lib/new/factories/index.ts b/packages/cli/src/lib/new/factories/index.ts
index 232e762b91..a4bcb2b721 100644
--- a/packages/cli/src/lib/new/factories/index.ts
+++ b/packages/cli/src/lib/new/factories/index.ts
@@ -16,6 +16,7 @@
 
 export { frontendPlugin } from './frontendPlugin';
 export { backendPlugin } from './backendPlugin';
+export { backendModule } from './backendModule';
 export { webLibraryPackage } from './webLibraryPackage';
 export { pluginCommon } from './pluginCommon';
 export { pluginNode } from './pluginNode';
diff --git a/packages/cli/src/lib/version.ts b/packages/cli/src/lib/version.ts
index bf89842d5f..96b42fcfb7 100644
--- a/packages/cli/src/lib/version.ts
+++ b/packages/cli/src/lib/version.ts
@@ -35,6 +35,8 @@ leaving any imports in place.
 */
 
 import { version as backendCommon } from '../../../../packages/backend-common/package.json';
+import { version as backendPluginApi } from '../../../../packages/backend-plugin-api/package.json';
+import { version as backendTestUtils } from '../../../../packages/backend-test-utils/package.json';
 import { version as cli } from '../../../../packages/cli/package.json';
 import { version as config } from '../../../../packages/config/package.json';
 import { version as coreAppApi } from '../../../../packages/core-app-api/package.json';
@@ -47,6 +49,8 @@ import { version as scaffolderBackend } from '../../../../plugins/scaffolder-bac
 
 export const packageVersions: Record<string, string> = {
   '@backstage/backend-common': backendCommon,
+  '@backstage/backend-plugin-api': backendPluginApi,
+  '@backstage/backend-test-utils': backendTestUtils,
   '@backstage/cli': cli,
   '@backstage/config': config,
   '@backstage/core-app-api': coreAppApi,
diff --git a/packages/cli/templates/default-backend-module/.eslintrc.js b/packages/cli/templates/default-backend-module/.eslintrc.js
new file mode 100644
index 0000000000..e2a53a6ad2
--- /dev/null
+++ b/packages/cli/templates/default-backend-module/.eslintrc.js
@@ -0,0 +1 @@
+module.exports = require('@backstage/cli/config/eslint-factory')(__dirname);
diff --git a/packages/cli/templates/default-backend-module/README.md.hbs b/packages/cli/templates/default-backend-module/README.md.hbs
new file mode 100644
index 0000000000..ad7669beda
--- /dev/null
+++ b/packages/cli/templates/default-backend-module/README.md.hbs
@@ -0,0 +1,5 @@
+# {{name}}
+
+The {{moduleId}} backend module for the {{pluginId}} plugin.
+
+_This plugin was created through the Backstage CLI_
diff --git a/packages/cli/templates/default-backend-module/package.json.hbs b/packages/cli/templates/default-backend-module/package.json.hbs
new file mode 100644
index 0000000000..07eee73d50
--- /dev/null
+++ b/packages/cli/templates/default-backend-module/package.json.hbs
@@ -0,0 +1,42 @@
+{
+  "name": "{{name}}",
+  "description": "The {{moduleId}} backend module for the {{pluginId}} plugin.",
+  "version": "{{packageVersion}}",
+  "main": "src/index.ts",
+  "types": "src/index.ts",
+  "license": "Apache-2.0",
+{{#if privatePackage}}
+  "private": {{privatePackage}},
+{{/if}}
+  "publishConfig": {
+{{#if npmRegistry}}
+    "registry": "{{npmRegistry}}",
+{{/if}}
+    "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/backend-common": "{{versionQuery '@backstage/backend-common'}}",
+    "@backstage/backend-plugin-api": "{{versionQuery '@backstage/backend-plugin-api'}}"
+  },
+  "devDependencies": {
+    "@backstage/backend-test-utils": "{{versionQuery '@backstage/backend-test-utils'}}",
+    "@backstage/cli": "{{versionQuery '@backstage/cli'}}"
+  },
+  "files": [
+    "dist"
+  ]
+}
diff --git a/packages/cli/templates/default-backend-module/src/index.ts.hbs b/packages/cli/templates/default-backend-module/src/index.ts.hbs
new file mode 100644
index 0000000000..0cf1f00d42
--- /dev/null
+++ b/packages/cli/templates/default-backend-module/src/index.ts.hbs
@@ -0,0 +1,8 @@
+/***/
+/**
+ * The {{moduleId}} backend module for the {{pluginId}} plugin.
+ *
+ * @packageDocumentation
+ */
+
+export { {{moduleVar}} } from './module';
diff --git a/packages/cli/templates/default-backend-module/src/module.ts.hbs b/packages/cli/templates/default-backend-module/src/module.ts.hbs
new file mode 100644
index 0000000000..8c895a49c0
--- /dev/null
+++ b/packages/cli/templates/default-backend-module/src/module.ts.hbs
@@ -0,0 +1,14 @@
+import { coreServices, createBackendModule } from '@backstage/backend-plugin-api';
+
+export const {{moduleVar}} = createBackendModule({
+  pluginId: '{{pluginId}}',
+  moduleId: '{{moduleId}}',
+  register(reg) {
+    reg.registerInit({
+      deps: { logger: coreServices.logger },
+      async init({ logger }) {
+        logger.info('Hello World!')
+      },
+    });
+  },
+});
diff --git a/packages/cli/templates/default-backend-module/tsconfig.json b/packages/cli/templates/default-backend-module/tsconfig.json
new file mode 100644
index 0000000000..5ae9aeb62d
--- /dev/null
+++ b/packages/cli/templates/default-backend-module/tsconfig.json
@@ -0,0 +1,9 @@
+{
+  "extends": "@backstage/cli/config/tsconfig.json",
+  "include": ["src"],
+  "exclude": ["node_modules"],
+  "compilerOptions": {
+    "outDir": "dist-types",
+    "rootDir": "."
+  }
+}
diff --git a/packages/cli/templates/default-common-plugin-package/package.json.hbs b/packages/cli/templates/default-common-plugin-package/package.json.hbs
index 844a951d05..992599ef6d 100644
--- a/packages/cli/templates/default-common-plugin-package/package.json.hbs
+++ b/packages/cli/templates/default-common-plugin-package/package.json.hbs
@@ -20,6 +20,7 @@
   "backstage": {
     "role": "common-library"
   },
+  "sideEffects": false,
   "scripts": {
     "build": "backstage-cli package build",
     "lint": "backstage-cli package lint",
diff --git a/packages/cli/templates/default-plugin/package.json.hbs b/packages/cli/templates/default-plugin/package.json.hbs
index 463fc6ea90..011a50ba37 100644
--- a/packages/cli/templates/default-plugin/package.json.hbs
+++ b/packages/cli/templates/default-plugin/package.json.hbs
@@ -18,6 +18,7 @@
   "backstage": {
     "role": "frontend-plugin"
   },
+  "sideEffects": false,
   "scripts": {
     "start": "backstage-cli package start",
     "build": "backstage-cli package build",
@@ -47,7 +48,6 @@
     "@testing-library/jest-dom": "{{versionQuery '@testing-library/jest-dom' '5.10.1'}}",
     "@testing-library/react": "{{versionQuery '@testing-library/react' '12.1.3'}}",
     "@testing-library/user-event": "{{versionQuery '@testing-library/user-event' '14.0.0'}}",
-    "@types/node": "{{versionQuery '@types/node' '16.11.26'}}",
     "msw": "{{versionQuery 'msw' '1.0.0'}}"
   },
   "files": [
diff --git a/packages/cli/templates/default-react-plugin-package/package.json.hbs b/packages/cli/templates/default-react-plugin-package/package.json.hbs
index e0ee408eda..230ecc5f03 100644
--- a/packages/cli/templates/default-react-plugin-package/package.json.hbs
+++ b/packages/cli/templates/default-react-plugin-package/package.json.hbs
@@ -19,6 +19,7 @@
   "backstage": {
     "role": "web-library"
   },
+  "sideEffects": false,
   "scripts": {
     "start": "backstage-cli package start",
     "build": "backstage-cli package build",
diff --git a/packages/cli/templates/web-library-package/package.json.hbs b/packages/cli/templates/web-library-package/package.json.hbs
index 957efef167..f9f703f523 100644
--- a/packages/cli/templates/web-library-package/package.json.hbs
+++ b/packages/cli/templates/web-library-package/package.json.hbs
@@ -18,6 +18,7 @@
   "backstage": {
     "role": "web-library"
   },
+  "sideEffects": false,
   "scripts": {
     "start": "backstage-cli package start",
     "build": "backstage-cli package build",
diff --git a/packages/codemods/catalog-info.yaml b/packages/codemods/catalog-info.yaml
new file mode 100644
index 0000000000..8e5739bd1a
--- /dev/null
+++ b/packages/codemods/catalog-info.yaml
@@ -0,0 +1,10 @@
+apiVersion: backstage.io/v1alpha1
+kind: Component
+metadata:
+  name: backstage-codemods
+  title: '@backstage/codemods'
+  description: A collection of codemods for Backstage projects
+spec:
+  lifecycle: experimental
+  type: backstage-cli
+  owner: maintainers
diff --git a/packages/config-loader/CHANGELOG.md b/packages/config-loader/CHANGELOG.md
index b02d08495a..aab170e602 100644
--- a/packages/config-loader/CHANGELOG.md
+++ b/packages/config-loader/CHANGELOG.md
@@ -1,5 +1,128 @@
 # @backstage/config-loader
 
+## 1.5.0-next.2
+
+### Patch Changes
+
+- 8cec7664e146: Removed `@types/node` dependency
+- Updated dependencies
+  - @backstage/config@1.1.0-next.1
+  - @backstage/cli-common@0.1.12
+  - @backstage/errors@1.2.1
+  - @backstage/types@1.1.0
+
+## 1.5.0-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config@1.1.0-next.0
+  - @backstage/cli-common@0.1.12
+  - @backstage/errors@1.2.1
+  - @backstage/types@1.1.0
+
+## 1.5.0-next.0
+
+### Minor Changes
+
+- 9606ba0939e6: Deep visibility now also applies to values that are not covered by the configuration schema.
+
+  For example, given the following configuration schema:
+
+  ```ts
+  // plugins/a/config.schema.ts
+  export interface Config {
+    /** @deepVisibility frontend */
+    a?: unknown;
+  }
+
+  // plugins/a/config.schema.ts
+  export interface Config {
+    a?: {
+      b?: string;
+    };
+  }
+  ```
+
+  All values under `a` are now visible to the frontend, while previously only `a` and `a/b` would've been visible.
+
+### Patch Changes
+
+- f9657b891b00: Do not unnecessarily notify subscribers when no-op updates to config happen
+- Updated dependencies
+  - @backstage/cli-common@0.1.12
+  - @backstage/config@1.0.8
+  - @backstage/errors@1.2.1
+  - @backstage/types@1.1.0
+
+## 1.4.0
+
+### Minor Changes
+
+- 2f1859585998: Loading invalid TypeScript configuration schemas will now throw an error rather than silently being ignored.
+
+  In particular this includes defining any additional types other than `Config` in the schema file, or use of unsupported types such as `Record` or `Partial`.
+
+- cd514545d1d0: Adds a new `deepVisibility` schema keyword that sets child visibility recursively to the defined value, respecting preexisting values or child `deepVisibility`.
+
+  Example usage:
+
+  ```ts
+  export interface Config {
+    /**
+     * Enforces a default of `secret` instead of `backend` for this object.
+     * @deepVisibility secret
+     */
+    mySecretProperty: {
+      type: 'object';
+      properties: {
+        secretValue: {
+          type: 'string';
+        };
+
+        verySecretProperty: {
+          type: 'string';
+        };
+      };
+    };
+  }
+  ```
+
+  Example of a schema that would not be allowed:
+
+  ```ts
+  export interface Config {
+    /**
+     * Set the top level property to secret, enforcing a default of `secret` instead of `backend` for this object.
+     * @deepVisibility secret
+     */
+    mySecretProperty: {
+      type: 'object';
+      properties: {
+        frontendUrl: {
+          /**
+           * We can NOT override the visibility to reveal a property to the front end.
+           * @visibility frontend
+           */
+          type: 'string';
+        };
+
+        verySecretProperty: {
+          type: 'string';
+        };
+      };
+    };
+  }
+  ```
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/cli-common@0.1.12
+  - @backstage/config@1.0.8
+  - @backstage/errors@1.2.1
+  - @backstage/types@1.1.0
+
 ## 1.4.0-next.1
 
 ### Minor Changes
diff --git a/packages/config-loader/catalog-info.yaml b/packages/config-loader/catalog-info.yaml
new file mode 100644
index 0000000000..4dfe9c1e59
--- /dev/null
+++ b/packages/config-loader/catalog-info.yaml
@@ -0,0 +1,10 @@
+apiVersion: backstage.io/v1alpha1
+kind: Component
+metadata:
+  name: backstage-config-loader
+  title: '@backstage/config-loader'
+  description: Config loading functionality used by Backstage backend, and CLI
+spec:
+  lifecycle: production
+  type: backstage-node-library
+  owner: maintainers
diff --git a/packages/config-loader/package.json b/packages/config-loader/package.json
index 5e82c0bb76..56a8a0db81 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.4.0-next.1",
+  "version": "1.5.0-next.2",
   "publishConfig": {
     "access": "public",
     "main": "dist/index.cjs.js",
@@ -56,7 +56,6 @@
     "@backstage/cli": "workspace:^",
     "@types/json-schema-merge-allof": "^0.6.0",
     "@types/mock-fs": "^4.10.0",
-    "@types/node": "^16.11.26",
     "@types/yup": "^0.29.13",
     "mock-fs": "^5.1.0",
     "msw": "^1.0.0",
diff --git a/packages/config-loader/src/schema/compile.test.ts b/packages/config-loader/src/schema/compile.test.ts
index 914a813d9f..ff0a9543aa 100644
--- a/packages/config-loader/src/schema/compile.test.ts
+++ b/packages/config-loader/src/schema/compile.test.ts
@@ -39,6 +39,7 @@ describe('compileConfigSchemas', () => {
         },
       ],
       visibilityByDataPath: new Map(),
+      deepVisibilityByDataPath: new Map(),
       visibilityBySchemaPath: new Map(),
       deprecationByDataPath: new Map(),
     });
@@ -53,6 +54,7 @@ describe('compileConfigSchemas', () => {
         },
       ],
       visibilityByDataPath: new Map(),
+      deepVisibilityByDataPath: new Map(),
       visibilityBySchemaPath: new Map(),
       deprecationByDataPath: new Map(),
     });
@@ -106,6 +108,7 @@ describe('compileConfigSchemas', () => {
           '/d/0': 'frontend',
         }),
       ),
+      deepVisibilityByDataPath: new Map(),
       visibilityBySchemaPath: new Map(
         Object.entries({
           '/properties/a': 'frontend',
@@ -166,6 +169,7 @@ describe('compileConfigSchemas', () => {
           '/b': 'deprecation reason for b',
         }),
       ),
+      deepVisibilityByDataPath: new Map(),
       visibilityByDataPath: new Map(),
       visibilityBySchemaPath: new Map(),
     });
@@ -221,6 +225,7 @@ describe('compileConfigSchemas', () => {
           '//circleci/api/headers/Circle-Token': 'secret',
         }),
       ),
+      deepVisibilityByDataPath: new Map(),
       visibilityBySchemaPath: new Map(
         Object.entries({
           '/properties//circleci/api/properties/headers/properties/Circle-Token':
@@ -277,18 +282,18 @@ describe('deepVisibility', () => {
     ).toEqual({
       visibilityByDataPath: new Map(
         Object.entries({
-          '': 'secret',
           '/b': 'secret',
-          '/d': 'secret',
-          '/d/0': 'secret',
+        }),
+      ),
+      deepVisibilityByDataPath: new Map(
+        Object.entries({
+          '': 'secret',
         }),
       ),
       visibilityBySchemaPath: new Map(
         Object.entries({
           '': 'secret',
           '/properties/b': 'secret',
-          '/properties/d': 'secret',
-          '/properties/d/items': 'secret',
         }),
       ),
       deprecationByDataPath: new Map(),
@@ -339,26 +344,6 @@ describe('deepVisibility', () => {
   it('should throw when children have a different deepVisibility', () => {
     expect(() =>
       compileConfigSchemas([
-        {
-          path: 'a1',
-          value: {
-            type: 'object',
-            properties: {
-              a: {
-                type: 'object',
-                properties: {
-                  a: { type: 'string' },
-                },
-              },
-              b: { type: 'string', visibility: 'backend' },
-              c: { type: 'string' },
-              d: {
-                type: 'array',
-                items: { type: 'string' },
-              },
-            },
-          },
-        },
         {
           path: 'a2',
           value: {
@@ -368,7 +353,7 @@ describe('deepVisibility', () => {
               a: {
                 type: 'object',
                 properties: {
-                  a: { type: 'string', visibility: 'frontend' },
+                  a: { type: 'string', deepVisibility: 'frontend' },
                 },
               },
               b: { type: 'string', visibility: 'secret' },
@@ -386,6 +371,28 @@ describe('deepVisibility', () => {
     );
   });
 
+  it('should throw when the same schema node has a conflicting deepVisibility', () => {
+    expect(() =>
+      compileConfigSchemas([
+        {
+          path: 'a2',
+          value: {
+            type: 'object',
+            properties: {
+              a: {
+                type: 'string',
+                deepVisibility: 'secret',
+                visibility: 'frontend',
+              },
+            },
+          },
+        },
+      ]),
+    ).toThrow(
+      `Config schema visibility is both 'frontend' and 'secret' for /properties/a`,
+    );
+  });
+
   it('should throw when ancestor and children have a different deepVisibility', () => {
     expect(() =>
       compileConfigSchemas([
diff --git a/packages/config-loader/src/schema/compile.ts b/packages/config-loader/src/schema/compile.ts
index 5d448a590a..fd39b0def9 100644
--- a/packages/config-loader/src/schema/compile.ts
+++ b/packages/config-loader/src/schema/compile.ts
@@ -28,6 +28,9 @@ import {
 import { SchemaObject } from 'json-schema-traverse';
 import { normalizeAjvPath } from './utils';
 
+// Used to keep track of the internal deepVisibility inherited through the schema.
+const inheritedVisibility = Symbol('inherited-visibility');
+
 /**
  * This takes a collection of Backstage configuration schemas from various
  * sources and compiles them down into a single schema validation function.
@@ -45,6 +48,7 @@ export function compileConfigSchemas(
   // output during validation. We work around this by having this extra piece
   // of state that we reset before each validation.
   const visibilityByDataPath = new Map<string, ConfigVisibility>();
+  const deepVisibilityByDataPath = new Map<string, ConfigVisibility>();
   const deprecationByDataPath = new Map<string, string>();
 
   const ajv = new Ajv({
@@ -87,6 +91,18 @@ export function compileConfigSchemas(
          */
         enum: ['frontend', 'secret'],
       },
+      compile(visibility: 'frontend' | 'secret') {
+        return (_data, context) => {
+          if (context?.instancePath === undefined) {
+            return false;
+          }
+          if (visibility) {
+            const normalizedPath = normalizeAjvPath(context.instancePath);
+            deepVisibilityByDataPath.set(normalizedPath, visibility);
+          }
+          return true;
+        };
+      },
     })
     .removeKeyword('deprecated') // remove `deprecated` keyword so that we can implement our own compiler
     .addKeyword({
@@ -118,37 +134,34 @@ export function compileConfigSchemas(
   traverse(
     merged,
     (
-      schema: SchemaObject,
+      schema: SchemaObject & { [inheritedVisibility]?: ConfigVisibility },
       jsonPtr: string,
       _1: any,
       _2: any,
       _3?: any,
-      parentSchema?: SchemaObject,
+      parentSchema?: SchemaObject & {
+        [inheritedVisibility]?: ConfigVisibility;
+      },
     ) => {
       // Inherit parent deepVisibility if we don't define one ourselves.
-      if (parentSchema?.deepVisibility) {
-        schema.deepVisibility ??= parentSchema?.deepVisibility;
-      }
+      // This is used to detect situations where conflicting deep visibilities are set.
+      schema[inheritedVisibility] ??=
+        schema?.deepVisibility ?? parentSchema?.[inheritedVisibility];
 
-      // Apply deep visibility to self.
-      if (schema?.deepVisibility) {
-        // This runs before we compile the AJV so visibilityByDataPath has the
-        //  correct data.
-        schema.visibility ??= schema.deepVisibility;
-
-        if (parentSchema) {
-          /**
-           * Validate that we're not trying to override a child's visibility
-           *  by setting the parent deep visibility.
-           */
-          const values = [schema.visibility, parentSchema.visibility];
-          const hasFrontend = values.some(e => e === 'frontend');
-          const hasSecret = values.some(e => e === 'secret');
-          if (hasFrontend && hasSecret) {
-            throw new Error(
-              `Config schema visibility is both 'frontend' and 'secret' for ${jsonPtr}`,
-            );
-          }
+      if (schema[inheritedVisibility]) {
+        // Validate that we're not trying to set a conflicting visibility. This can be done
+        // either by setting a conflicting visibility directly or deep visibility
+        const values = [
+          schema.visibility,
+          schema[inheritedVisibility],
+          parentSchema?.[inheritedVisibility],
+        ];
+        const hasFrontend = values.some(e => e === 'frontend');
+        const hasSecret = values.some(e => e === 'secret');
+        if (hasFrontend && hasSecret) {
+          throw new Error(
+            `Config schema visibility is both 'frontend' and 'secret' for ${jsonPtr}`,
+          );
         }
       }
 
@@ -171,12 +184,16 @@ export function compileConfigSchemas(
     if (schema.visibility && schema.visibility !== 'backend') {
       visibilityBySchemaPath.set(normalizeAjvPath(path), schema.visibility);
     }
+    if (schema.deepVisibility) {
+      visibilityBySchemaPath.set(normalizeAjvPath(path), schema.deepVisibility);
+    }
   });
 
   return configs => {
     const config = ConfigReader.fromConfigs(configs).get();
 
     visibilityByDataPath.clear();
+    deepVisibilityByDataPath.clear();
 
     const valid = validate(config);
 
@@ -184,6 +201,7 @@ export function compileConfigSchemas(
       return {
         errors: validate.errors ?? [],
         visibilityByDataPath: new Map(visibilityByDataPath),
+        deepVisibilityByDataPath: new Map(deepVisibilityByDataPath),
         visibilityBySchemaPath,
         deprecationByDataPath,
       };
@@ -191,6 +209,7 @@ export function compileConfigSchemas(
 
     return {
       visibilityByDataPath: new Map(visibilityByDataPath),
+      deepVisibilityByDataPath: new Map(deepVisibilityByDataPath),
       visibilityBySchemaPath,
       deprecationByDataPath,
     };
diff --git a/packages/config-loader/src/schema/filtering.test.ts b/packages/config-loader/src/schema/filtering.test.ts
index 3a5de7e2c0..4beed367ea 100644
--- a/packages/config-loader/src/schema/filtering.test.ts
+++ b/packages/config-loader/src/schema/filtering.test.ts
@@ -30,6 +30,8 @@ const data = {
     b: {
       s: true,
     },
+    df: { a: 1, b: [{ c: 1 }, '1'], d: { e: 'x' } },
+    ds: { a: 1, b: [{ c: 1 }, '1'], d: { e: 'x' } },
   },
   arrF: [{ never: 'here' }],
   arrB: [{ never: 'here' }],
@@ -64,6 +66,13 @@ const visibility = new Map<string, ConfigVisibility>(
   }),
 );
 
+const deepVisibility = new Map<string, ConfigVisibility>(
+  Object.entries({
+    '/obj/df': 'frontend',
+    '/obj/ds': 'secret',
+  }),
+);
+
 const deprecations = new Map<string, string>(
   Object.entries({
     '/arr': 'deprecated array',
@@ -92,6 +101,14 @@ describe('filterByVisibility', () => {
           'objArr[1].s',
           'obj.f',
           'obj.b.s',
+          'obj.df.a',
+          'obj.df.b[0].c',
+          'obj.df.b[1]',
+          'obj.df.d.e',
+          'obj.ds.a',
+          'obj.ds.b[0].c',
+          'obj.ds.b[1]',
+          'obj.ds.d.e',
           'arrF[0].never',
           'arrB[0].never',
           'arrS[0].never',
@@ -107,7 +124,7 @@ describe('filterByVisibility', () => {
         data: {
           arr: ['f'],
           objArr: [{ f: 1 }, { f: 4 }],
-          obj: { f: 'a' },
+          obj: { f: 'a', df: { a: 1, b: [{ c: 1 }, '1'], d: { e: 'x' } } },
           arrF: [],
           objF: {},
           arrU: ['f', 'b'],
@@ -121,6 +138,10 @@ describe('filterByVisibility', () => {
           'objArr[1].b',
           'objArr[1].s',
           'obj.b.s',
+          'obj.ds.a',
+          'obj.ds.b[0].c',
+          'obj.ds.b[1]',
+          'obj.ds.d.e',
           'arrF[0].never',
           'arrB[0].never',
           'arrS[0].never',
@@ -137,7 +158,7 @@ describe('filterByVisibility', () => {
           arr: ['b'],
           arrU: ['t'],
           objArr: [{ b: 2 }, { b: 5 }],
-          obj: { b: {} },
+          obj: { b: {}, df: {}, ds: {} },
           arrF: [{ never: 'here' }],
           arrB: [{ never: 'here' }],
           arrS: [{ never: 'here' }],
@@ -156,6 +177,14 @@ describe('filterByVisibility', () => {
           'objArr[1].s',
           'obj.f',
           'obj.b.s',
+          'obj.df.a',
+          'obj.df.b[0].c',
+          'obj.df.b[1]',
+          'obj.df.d.e',
+          'obj.ds.a',
+          'obj.ds.b[0].c',
+          'obj.ds.b[1]',
+          'obj.ds.d.e',
         ],
       },
     ],
@@ -165,7 +194,10 @@ describe('filterByVisibility', () => {
         data: {
           arr: ['s'],
           objArr: [{ s: 3 }, { s: 6 }],
-          obj: { b: { s: true } },
+          obj: {
+            b: { s: true },
+            ds: { a: 1, b: [{ c: 1 }, '1'], d: { e: 'x' } },
+          },
           arrS: [],
           objS: {},
         },
@@ -180,6 +212,10 @@ describe('filterByVisibility', () => {
           'objArr[1].f',
           'objArr[1].b',
           'obj.f',
+          'obj.df.a',
+          'obj.df.b[0].c',
+          'obj.df.b[1]',
+          'obj.df.d.e',
           'arrF[0].never',
           'arrB[0].never',
           'arrS[0].never',
@@ -196,6 +232,7 @@ describe('filterByVisibility', () => {
         data,
         filter,
         visibility,
+        deepVisibility,
         deprecations,
         undefined,
         true,
@@ -210,6 +247,7 @@ describe('filterByVisibility', () => {
         data,
         [],
         visibility,
+        deepVisibility,
         deprecations,
         undefined,
         true,
diff --git a/packages/config-loader/src/schema/filtering.ts b/packages/config-loader/src/schema/filtering.ts
index 1c2d0c122a..1b7bbf43c1 100644
--- a/packages/config-loader/src/schema/filtering.ts
+++ b/packages/config-loader/src/schema/filtering.ts
@@ -31,6 +31,7 @@ export function filterByVisibility(
   data: JsonObject,
   includeVisibilities: ConfigVisibility[],
   visibilityByDataPath: Map<string, ConfigVisibility>,
+  deepVisibilityByDataPath: Map<string, ConfigVisibility>,
   deprecationByDataPath: Map<string, string>,
   transformFunc?: TransformFunc<number | string | boolean>,
   withFilteredKeys?: boolean,
@@ -47,11 +48,17 @@ export function filterByVisibility(
     jsonVal: JsonValue,
     visibilityPath: string, // Matches the format we get from ajv
     filterPath: string, // Matches the format of the ConfigReader
+    inheritedVisibility: ConfigVisibility,
   ): JsonValue | undefined {
     const visibility =
-      visibilityByDataPath.get(visibilityPath) ?? DEFAULT_CONFIG_VISIBILITY;
+      visibilityByDataPath.get(visibilityPath) ?? inheritedVisibility;
     const isVisible = includeVisibilities.includes(visibility);
 
+    // If a deep visibility is set for our current path, then we that as our
+    // default visibility for all children until we encounter a different deep visibility
+    const newInheritedVisibility =
+      deepVisibilityByDataPath.get(visibilityPath) ?? inheritedVisibility;
+
     // deprecated keys are added regardless of visibility indicator
     const deprecation = deprecationByDataPath.get(visibilityPath);
     if (deprecation) {
@@ -84,7 +91,12 @@ export function filterByVisibility(
           path = `${visibilityPath}/${index}`;
         }
 
-        const out = transform(value, path, `${filterPath}[${index}]`);
+        const out = transform(
+          value,
+          path,
+          `${filterPath}[${index}]`,
+          newInheritedVisibility,
+        );
 
         if (out !== undefined) {
           arr.push(out);
@@ -108,6 +120,7 @@ export function filterByVisibility(
         value,
         `${visibilityPath}/${key}`,
         filterPath ? `${filterPath}.${key}` : key,
+        newInheritedVisibility,
       );
       if (out !== undefined) {
         outObj[key] = out;
@@ -124,7 +137,8 @@ export function filterByVisibility(
   return {
     filteredKeys: withFilteredKeys ? filteredKeys : undefined,
     deprecatedKeys: withDeprecatedKeys ? deprecatedKeys : undefined,
-    data: (transform(data, '', '') as JsonObject) ?? {},
+    data:
+      (transform(data, '', '', DEFAULT_CONFIG_VISIBILITY) as JsonObject) ?? {},
   };
 }
 
diff --git a/packages/config-loader/src/schema/load.ts b/packages/config-loader/src/schema/load.ts
index 8ef971184f..885da44116 100644
--- a/packages/config-loader/src/schema/load.ts
+++ b/packages/config-loader/src/schema/load.ts
@@ -122,6 +122,7 @@ export async function loadConfigSchema(
             data,
             visibility,
             result.visibilityByDataPath,
+            result.deepVisibilityByDataPath,
             result.deprecationByDataPath,
             valueTransform,
             withFilteredKeys,
@@ -135,6 +136,7 @@ export async function loadConfigSchema(
             data,
             Array.from(CONFIG_VISIBILITIES),
             result.visibilityByDataPath,
+            result.deepVisibilityByDataPath,
             result.deprecationByDataPath,
             valueTransform,
             withFilteredKeys,
diff --git a/packages/config-loader/src/schema/types.ts b/packages/config-loader/src/schema/types.ts
index 95576cf5aa..dc8da64038 100644
--- a/packages/config-loader/src/schema/types.ts
+++ b/packages/config-loader/src/schema/types.ts
@@ -75,6 +75,13 @@ type ValidationResult = {
    */
   visibilityByDataPath: Map<string, ConfigVisibility>;
 
+  /**
+   * The configuration deep visibilities that were discovered during validation.
+   *
+   * The path in the key uses the form `/<key>/<sub-key>/<array-index>/<leaf-key>`
+   */
+  deepVisibilityByDataPath: Map<string, ConfigVisibility>;
+
   /**
    * The configuration visibilities that were discovered during validation.
    *
diff --git a/packages/config-loader/src/sources/ObservableConfigProxy.test.ts b/packages/config-loader/src/sources/ObservableConfigProxy.test.ts
index d1fccf3e80..f072536489 100644
--- a/packages/config-loader/src/sources/ObservableConfigProxy.test.ts
+++ b/packages/config-loader/src/sources/ObservableConfigProxy.test.ts
@@ -25,21 +25,17 @@ describe('ObservableConfigProxy', () => {
     const sub = config.subscribe(fn);
     expect(config.getOptionalNumber('x')).toBe(undefined);
 
-    config.setConfig(new ConfigReader({}));
-    expect(fn).toHaveBeenCalledTimes(1);
-    expect(config.getOptionalNumber('x')).toBe(undefined);
-
     config.setConfig(new ConfigReader({ x: 1 }));
-    expect(fn).toHaveBeenCalledTimes(2);
+    expect(fn).toHaveBeenCalledTimes(1);
     expect(config.getOptionalNumber('x')).toBe(1);
 
     config.setConfig(new ConfigReader({ x: 3 }));
-    expect(fn).toHaveBeenCalledTimes(3);
+    expect(fn).toHaveBeenCalledTimes(2);
     sub.unsubscribe();
     expect(config.getOptionalNumber('x')).toBe(3);
 
     config.setConfig(new ConfigReader({ x: 5 }));
-    expect(fn).toHaveBeenCalledTimes(3);
+    expect(fn).toHaveBeenCalledTimes(2);
     expect(config.getOptionalNumber('x')).toBe(5);
   });
 
@@ -58,18 +54,10 @@ describe('ObservableConfigProxy', () => {
     expect(config2.getOptionalNumber('x')).toBe(undefined);
     expect(config3.getOptionalNumber('x')).toBe(undefined);
 
-    config1.setConfig(new ConfigReader({}));
+    config1.setConfig(new ConfigReader({ x: 1, a: { x: 2, b: { x: 3 } } }));
     expect(fn1).toHaveBeenCalledTimes(1);
     expect(fn2).toHaveBeenCalledTimes(1);
     expect(fn3).toHaveBeenCalledTimes(1);
-    expect(config1.getOptionalNumber('x')).toBe(undefined);
-    expect(config2.getOptionalNumber('x')).toBe(undefined);
-    expect(config3.getOptionalNumber('x')).toBe(undefined);
-
-    config1.setConfig(new ConfigReader({ x: 1, a: { x: 2, b: { x: 3 } } }));
-    expect(fn1).toHaveBeenCalledTimes(2);
-    expect(fn2).toHaveBeenCalledTimes(2);
-    expect(fn3).toHaveBeenCalledTimes(2);
     expect(config1.getNumber('x')).toBe(1);
     expect(config2.getNumber('x')).toBe(2);
     expect(config3.getNumber('x')).toBe(3);
@@ -79,9 +67,9 @@ describe('ObservableConfigProxy', () => {
     sub3.unsubscribe();
 
     config1.setConfig(new ConfigReader({ x: 4, a: { x: 5, b: { x: 6 } } }));
-    expect(fn1).toHaveBeenCalledTimes(2);
-    expect(fn2).toHaveBeenCalledTimes(2);
-    expect(fn3).toHaveBeenCalledTimes(2);
+    expect(fn1).toHaveBeenCalledTimes(1);
+    expect(fn2).toHaveBeenCalledTimes(1);
+    expect(fn3).toHaveBeenCalledTimes(1);
     expect(config1.getNumber('x')).toBe(4);
     expect(config2.getNumber('x')).toBe(5);
     expect(config3.getNumber('x')).toBe(6);
@@ -140,4 +128,43 @@ describe('ObservableConfigProxy', () => {
       'Only the root config can be closed',
     );
   });
+
+  it('should only notify subscribers when the config data actually changes (ignoring key order)', () => {
+    const config = ObservableConfigProxy.create(new AbortController());
+    const fn = jest.fn();
+    config.subscribe(fn);
+
+    expect(config.getOptionalNumber('a')).toBe(undefined);
+
+    config.setConfig(new ConfigReader({}));
+    expect(fn).toHaveBeenCalledTimes(0);
+    expect(config.getOptionalNumber('a')).toBe(undefined);
+
+    config.setConfig(
+      new ConfigReader({
+        a: 1,
+        b: 1,
+      }),
+    );
+    expect(fn).toHaveBeenCalledTimes(1);
+    expect(config.getOptionalNumber('a')).toBe(1);
+
+    config.setConfig(
+      new ConfigReader({
+        b: 1,
+        a: 1,
+      }),
+    );
+    expect(fn).toHaveBeenCalledTimes(1);
+    expect(config.getOptionalNumber('a')).toBe(1);
+
+    config.setConfig(
+      new ConfigReader({
+        b: 1,
+        a: 2,
+      }),
+    );
+    expect(fn).toHaveBeenCalledTimes(2);
+    expect(config.getOptionalNumber('a')).toBe(2);
+  });
 });
diff --git a/packages/config-loader/src/sources/ObservableConfigProxy.ts b/packages/config-loader/src/sources/ObservableConfigProxy.ts
index 59be836160..3d2084beac 100644
--- a/packages/config-loader/src/sources/ObservableConfigProxy.ts
+++ b/packages/config-loader/src/sources/ObservableConfigProxy.ts
@@ -16,6 +16,7 @@
 
 import { Config, ConfigReader } from '@backstage/config';
 import { JsonValue } from '@backstage/types';
+import isEqual from 'lodash/isEqual';
 
 export class ObservableConfigProxy implements Config {
   private config: Config = new ConfigReader({});
@@ -40,12 +41,22 @@ export class ObservableConfigProxy implements Config {
     if (this.parent) {
       throw new Error('immutable');
     }
+
+    // We only notify subscribers if the data contents of the config actually
+    // changed. If they didn't, there's no point in callers trying to re-read
+    // them. However we still want to replace the local config object, since its
+    // runtime implementation could be entirely different.
+    const changed = !isEqual(this.config.get(), config.get());
+
     this.config = config;
-    for (const subscriber of this.subscribers) {
-      try {
-        subscriber();
-      } catch (error) {
-        console.error(`Config subscriber threw error, ${error}`);
+
+    if (changed) {
+      for (const subscriber of this.subscribers) {
+        try {
+          subscriber();
+        } catch (error) {
+          console.error(`Config subscriber threw error, ${error}`);
+        }
       }
     }
   }
diff --git a/packages/config/CHANGELOG.md b/packages/config/CHANGELOG.md
index 9f2f38c8ee..5960c5da49 100644
--- a/packages/config/CHANGELOG.md
+++ b/packages/config/CHANGELOG.md
@@ -1,5 +1,26 @@
 # @backstage/config
 
+## 1.1.0-next.1
+
+### Patch Changes
+
+- 8cec7664e146: Removed `@types/node` dependency
+- Updated dependencies
+  - @backstage/errors@1.2.1
+  - @backstage/types@1.1.0
+
+## 1.1.0-next.0
+
+### Minor Changes
+
+- 62f448edb0b5: Added a `readDurationFromConfig` function
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/errors@1.2.1
+  - @backstage/types@1.1.0
+
 ## 1.0.8
 
 ### Patch Changes
diff --git a/packages/config/api-report.md b/packages/config/api-report.md
index df9baeb4cd..ea9617b2a3 100644
--- a/packages/config/api-report.md
+++ b/packages/config/api-report.md
@@ -3,6 +3,8 @@
 > Do not edit this file. It is a report generated by [API Extractor](https://api-extractor.com/).
 
 ```ts
+import { Config as Config_2 } from '@backstage/config';
+import { HumanDuration } from '@backstage/types';
 import type { JsonArray as JsonArray_2 } from '@backstage/types';
 import { JsonObject as JsonObject_2 } from '@backstage/types';
 import type { JsonPrimitive as JsonPrimitive_2 } from '@backstage/types';
@@ -80,4 +82,12 @@ export type JsonPrimitive = JsonPrimitive_2;
 
 // @public @deprecated
 export type JsonValue = JsonValue_2;
+
+// @public
+export function readDurationFromConfig(
+  config: Config_2,
+  options?: {
+    key?: string;
+  },
+): HumanDuration;
 ```
diff --git a/packages/config/catalog-info.yaml b/packages/config/catalog-info.yaml
new file mode 100644
index 0000000000..c077d9d47b
--- /dev/null
+++ b/packages/config/catalog-info.yaml
@@ -0,0 +1,10 @@
+apiVersion: backstage.io/v1alpha1
+kind: Component
+metadata:
+  name: backstage-config
+  title: '@backstage/config'
+  description: Config API used by Backstage core, backend, and CLI
+spec:
+  lifecycle: production
+  type: backstage-common-library
+  owner: maintainers
diff --git a/packages/config/package.json b/packages/config/package.json
index 4470e9719e..359791a969 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.8",
+  "version": "1.1.0-next.1",
   "publishConfig": {
     "access": "public",
     "main": "dist/index.cjs.js",
@@ -23,6 +23,7 @@
   "license": "Apache-2.0",
   "main": "src/index.ts",
   "types": "src/index.ts",
+  "sideEffects": false,
   "scripts": {
     "build": "backstage-cli package build",
     "lint": "backstage-cli package lint",
@@ -32,13 +33,13 @@
     "clean": "backstage-cli package clean"
   },
   "dependencies": {
+    "@backstage/errors": "workspace:^",
     "@backstage/types": "workspace:^",
     "lodash": "^4.17.21"
   },
   "devDependencies": {
     "@backstage/cli": "workspace:^",
-    "@backstage/test-utils": "workspace:^",
-    "@types/node": "^16.0.0"
+    "@backstage/test-utils": "workspace:^"
   },
   "files": [
     "dist"
diff --git a/packages/config/src/index.ts b/packages/config/src/index.ts
index c8800d0ad2..c6254e97ba 100644
--- a/packages/config/src/index.ts
+++ b/packages/config/src/index.ts
@@ -26,5 +26,6 @@ export type {
   JsonPrimitive,
   JsonValue,
 } from './deprecatedTypes';
+export { readDurationFromConfig } from './readDurationFromConfig';
 export { ConfigReader } from './reader';
 export type { AppConfig, Config } from './types';
diff --git a/packages/config/src/readDurationFromConfig.test.ts b/packages/config/src/readDurationFromConfig.test.ts
new file mode 100644
index 0000000000..3da790ddcf
--- /dev/null
+++ b/packages/config/src/readDurationFromConfig.test.ts
@@ -0,0 +1,128 @@
+/*
+ * 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 {
+  readDurationFromConfig,
+  propsOfHumanDuration,
+} from './readDurationFromConfig';
+import { ConfigReader } from './reader';
+
+describe('readDurationFromConfig', () => {
+  it('reads all known keys', () => {
+    const config = new ConfigReader({
+      milliseconds: 1,
+      seconds: 2,
+      minutes: 3,
+      hours: 4,
+      days: 5,
+      weeks: 6,
+      months: 7,
+      years: 8,
+    });
+    expect(readDurationFromConfig(config)).toEqual({
+      milliseconds: 1,
+      seconds: 2,
+      minutes: 3,
+      hours: 4,
+      days: 5,
+      weeks: 6,
+      months: 7,
+      years: 8,
+    });
+  });
+
+  it('reads all known keys, for a subkey', () => {
+    const config = new ConfigReader({
+      sub: {
+        key: {
+          milliseconds: 1,
+          seconds: 2,
+          minutes: 3,
+          hours: 4,
+          days: 5,
+          weeks: 6,
+          months: 7,
+          years: 8,
+        },
+      },
+    });
+    expect(readDurationFromConfig(config, { key: 'sub.key' })).toEqual({
+      milliseconds: 1,
+      seconds: 2,
+      minutes: 3,
+      hours: 4,
+      days: 5,
+      weeks: 6,
+      months: 7,
+      years: 8,
+    });
+  });
+
+  it('rejects wrong type of target, for a subkey', () => {
+    const config = new ConfigReader({
+      sub: { key: 7 },
+    });
+    expect(() => readDurationFromConfig(config, { key: 'sub.key' })).toThrow(
+      "Failed to read duration from config, TypeError: Invalid type in config for key 'sub.key' in 'mock-config', got number, wanted object",
+    );
+  });
+
+  it('rejects no keys', () => {
+    const config = new ConfigReader({});
+    expect(() => readDurationFromConfig(config)).toThrow(
+      `Failed to read duration from config, Error: Needs one or more of 'years', 'months', 'weeks', 'days', 'hours', 'minutes', 'seconds', 'milliseconds'`,
+    );
+  });
+
+  it('rejects no keys, for a subkey', () => {
+    const config = new ConfigReader({ sub: { key: {} } });
+    expect(() => readDurationFromConfig(config, { key: 'sub.key' })).toThrow(
+      `Failed to read duration from config at 'sub.key', Error: Needs one or more of 'years', 'months', 'weeks', 'days', 'hours', 'minutes', 'seconds', 'milliseconds'`,
+    );
+  });
+
+  it('rejects unknown keys', () => {
+    const config = new ConfigReader({
+      minutes: 3,
+      invalid: 'value',
+    });
+    expect(() => readDurationFromConfig(config)).toThrow(
+      `Failed to read duration from config, Error: Unknown property 'invalid'; expected one or more of 'years', 'months', 'weeks', 'days', 'hours', 'minutes', 'seconds', 'milliseconds'`,
+    );
+  });
+
+  it.each(propsOfHumanDuration)('rejects non-number %p', prop => {
+    const config = new ConfigReader({
+      [prop]: 'value',
+    });
+    expect(() => readDurationFromConfig(config)).toThrow(
+      `Failed to read duration from config, Error: Unable to convert config value for key '${prop}' in 'mock-config' to a number`,
+    );
+  });
+
+  it.each(propsOfHumanDuration)('rejects non-number %p, for a subkey', prop => {
+    const config = new ConfigReader({
+      sub: {
+        key: {
+          [prop]: 'value',
+        },
+      },
+    });
+    expect(() => readDurationFromConfig(config, { key: 'sub.key' })).toThrow(
+      `Failed to read duration from config, Error: Unable to convert config value for key 'sub.key.${prop}' in 'mock-config' to a number`,
+    );
+  });
+});
diff --git a/packages/config/src/readDurationFromConfig.ts b/packages/config/src/readDurationFromConfig.ts
new file mode 100644
index 0000000000..2f59e9a976
--- /dev/null
+++ b/packages/config/src/readDurationFromConfig.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 { InputError } from '@backstage/errors';
+import { HumanDuration } from '@backstage/types';
+
+export const propsOfHumanDuration = [
+  'years',
+  'months',
+  'weeks',
+  'days',
+  'hours',
+  'minutes',
+  'seconds',
+  'milliseconds',
+];
+
+/**
+ * Reads a duration from a config object.
+ *
+ * @public
+ * @remarks
+ *
+ * This does not support optionality; if you want to support optional durations,
+ * you need to first check the presence of the target with `config.has(...)` and
+ * then call this function.
+ *
+ * @param config - A configuration object
+ * @param key - If specified, read the duration from the given subkey
+ *        under the config object
+ * @returns A duration object
+ */
+export function readDurationFromConfig(
+  config: Config,
+  options?: {
+    key?: string;
+  },
+): HumanDuration {
+  let root: Config;
+  let found = false;
+  const result: Record<string, number> = {};
+
+  try {
+    root = options?.key ? config.getConfig(options.key) : config;
+    for (const prop of propsOfHumanDuration) {
+      const value = root.getOptionalNumber(prop);
+      if (value !== undefined) {
+        result[prop] = value;
+        found = true;
+      }
+    }
+  } catch (error) {
+    // This needs no contextual key prefix since the config reader adds it to
+    // its own errors
+    throw new InputError(`Failed to read duration from config, ${error}`);
+  }
+
+  try {
+    if (!found) {
+      const good = propsOfHumanDuration.map(p => `'${p}'`).join(', ');
+      throw new Error(`Needs one or more of ${good}`);
+    }
+
+    const invalidProps = root
+      .keys()
+      .filter(prop => !propsOfHumanDuration.includes(prop));
+    if (invalidProps.length) {
+      const what = invalidProps.length === 1 ? 'property' : 'properties';
+      const bad = invalidProps.map(p => `'${p}'`).join(', ');
+      const good = propsOfHumanDuration.map(p => `'${p}'`).join(', ');
+      throw new Error(
+        `Unknown ${what} ${bad}; expected one or more of ${good}`,
+      );
+    }
+  } catch (error) {
+    // For our own errors, even though we don't know where we are anchored in
+    // the config hierarchy, we try to be helpful and at least add the subkey if
+    // we have it
+    let prefix = 'Failed to read duration from config';
+    if (options?.key) {
+      prefix += ` at '${options.key}'`;
+    }
+    throw new InputError(`${prefix}, ${error}`);
+  }
+
+  return result as HumanDuration;
+}
diff --git a/packages/core-app-api/CHANGELOG.md b/packages/core-app-api/CHANGELOG.md
index 1de645fb9e..3cd9fe309e 100644
--- a/packages/core-app-api/CHANGELOG.md
+++ b/packages/core-app-api/CHANGELOG.md
@@ -1,5 +1,56 @@
 # @backstage/core-app-api
 
+## 1.10.0-next.2
+
+### Minor Changes
+
+- 6e30769cc627: Introduced experimental support for internationalization.
+
+### Patch Changes
+
+- 8cec7664e146: Removed `@types/node` dependency
+- Updated dependencies
+  - @backstage/core-plugin-api@1.6.0-next.2
+  - @backstage/config@1.1.0-next.1
+  - @backstage/types@1.1.0
+  - @backstage/version-bridge@1.0.4
+
+## 1.10.0-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config@1.1.0-next.0
+  - @backstage/core-plugin-api@1.6.0-next.1
+  - @backstage/types@1.1.0
+  - @backstage/version-bridge@1.0.4
+
+## 1.10.0-next.0
+
+### Minor Changes
+
+- 18619f793c94: Fixed two bugs in how the `OAuth2Session` type represents the underlying data. The `expiresAt` and `backstageIdentity` are now both optional, since that's what they are in practice. This is not considered a breaking change since it was effectively a bug in the modelling of the state that this type represents, and the type was not used in any other external contract.
+- 18619f793c94: The `OAuth` class which is used by all OAuth providers will now consider both the session expiration of both the Backstage identity as well as the upstream identity provider, and refresh the session with either of them is about to expire.
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-plugin-api@1.6.0-next.0
+  - @backstage/config@1.0.8
+  - @backstage/types@1.1.0
+  - @backstage/version-bridge@1.0.4
+
+## 1.9.1
+
+### Patch Changes
+
+- 9ae4e7e63836: Fixed a bug that could cause `navigate` analytics events to be misattributed to the plugin mounted on the root route (e.g. the `home` plugin at `/`) when the route that was navigated to wasn't associated with a routable extension.
+- Updated dependencies
+  - @backstage/core-plugin-api@1.5.3
+  - @backstage/config@1.0.8
+  - @backstage/types@1.1.0
+  - @backstage/version-bridge@1.0.4
+
 ## 1.9.1-next.0
 
 ### Patch Changes
diff --git a/packages/core-app-api/alpha-api-report.md b/packages/core-app-api/alpha-api-report.md
new file mode 100644
index 0000000000..f35adfdbaa
--- /dev/null
+++ b/packages/core-app-api/alpha-api-report.md
@@ -0,0 +1,85 @@
+## API Report File for "@backstage/core-app-api"
+
+> Do not edit this file. It is a report generated by [API Extractor](https://api-extractor.com/).
+
+```ts
+import { AppTranslationApi } from '@backstage/core-plugin-api/alpha';
+import { i18n } from 'i18next';
+import { TranslationRef } from '@backstage/core-plugin-api/alpha';
+
+// @alpha (undocumented)
+export class AppTranslationApiImpl implements AppTranslationApi {
+  // (undocumented)
+  addLazyResources<Messages extends Record<string, string>>(
+    translationRef: TranslationRef<Messages>,
+    initResources?: Record<
+      string,
+      () => Promise<{
+        messages: TranslationMessages<TranslationRef>;
+      }>
+    >,
+  ): void;
+  // (undocumented)
+  addResources<Messages extends Record<string, string>>(
+    translationRef: TranslationRef<Messages>,
+    initResources?: Record<
+      string,
+      TranslationMessages<TranslationRef<Messages>>
+    >,
+  ): void;
+  // (undocumented)
+  addResourcesByRef<Messages extends Record<string, string>>(
+    translationRef: TranslationRef<Messages>,
+  ): void;
+  // (undocumented)
+  static create(options?: ExperimentalI18n): AppTranslationApiImpl;
+  // (undocumented)
+  getI18n(): i18n;
+  // (undocumented)
+  initMessages(options?: ExperimentalI18n): void;
+}
+
+// @alpha (undocumented)
+export function createTranslationResource<T extends TranslationRef>(options: {
+  ref: T;
+  messages?: Record<string, TranslationMessages<T>>;
+  lazyMessages: Record<
+    string,
+    () => Promise<{
+      messages: TranslationMessages<T>;
+    }>
+  >;
+}): {
+  ref: T;
+  messages?: Record<string, TranslationMessages<T>> | undefined;
+  lazyMessages: Record<
+    string,
+    () => Promise<{
+      messages: TranslationMessages<T>;
+    }>
+  >;
+};
+
+// @alpha (undocumented)
+export type ExperimentalI18n = {
+  supportedLanguages: string[];
+  fallbackLanguage?: string | string[];
+  messages?: Array<{
+    ref: TranslationRef;
+    messages?: Record<string, TranslationMessages<TranslationRef>>;
+    lazyMessages: Record<
+      string,
+      () => Promise<{
+        messages: TranslationMessages<TranslationRef>;
+      }>
+    >;
+  }>;
+};
+
+// @alpha (undocumented)
+export type TranslationMessages<T> = T extends TranslationRef<infer R>
+  ? Partial<R>
+  : never;
+
+// (No @packageDocumentation comment for this package)
+```
diff --git a/packages/core-app-api/api-report.md b/packages/core-app-api/api-report.md
index 5746598ffd..e53d2eed83 100644
--- a/packages/core-app-api/api-report.md
+++ b/packages/core-app-api/api-report.md
@@ -56,6 +56,7 @@ import { ProfileInfo } from '@backstage/core-plugin-api';
 import { ProfileInfoApi } from '@backstage/core-plugin-api';
 import { PropsWithChildren } from 'react';
 import PropTypes from 'prop-types';
+import { default as React_2 } from 'react';
 import { ReactNode } from 'react';
 import { RouteRef } from '@backstage/core-plugin-api';
 import { SessionApi } from '@backstage/core-plugin-api';
@@ -63,6 +64,7 @@ import { SessionState } from '@backstage/core-plugin-api';
 import { StorageApi } from '@backstage/core-plugin-api';
 import { StorageValueSnapshot } from '@backstage/core-plugin-api';
 import { SubRouteRef } from '@backstage/core-plugin-api';
+import { TranslationRef } from '@backstage/core-plugin-api/alpha';
 
 // @public
 export class AlertApiForwarder implements AlertApi {
@@ -113,7 +115,7 @@ export type ApiFactoryScope = 'default' | 'app' | 'static';
 
 // @public
 export const ApiProvider: {
-  (props: PropsWithChildren<ApiProviderProps>): JSX.Element;
+  (props: PropsWithChildren<ApiProviderProps>): React_2.JSX.Element;
   propTypes: {
     apis: PropTypes.Validator<
       NonNullable<
@@ -219,6 +221,20 @@ export type AppOptions = {
   themes: (Partial<AppTheme> & Omit<AppTheme, 'theme'>)[];
   configLoader?: AppConfigLoader;
   bindRoutes?(context: { bind: AppRouteBinder }): void;
+  __experimentalI18n?: {
+    supportedLanguages: string[];
+    fallbackLanguage?: string | string[];
+    messages?: Array<{
+      ref: TranslationRef;
+      messages?: Record<string, TranslationMessages<TranslationRef>>;
+      lazyMessages: Record<
+        string,
+        () => Promise<{
+          messages: TranslationMessages<TranslationRef>;
+        }>
+      >;
+    }>;
+  };
 };
 
 // @public
@@ -235,7 +251,7 @@ export type AppRouteBinder = <
 ) => void;
 
 // @public
-export function AppRouter(props: AppRouterProps): JSX.Element;
+export function AppRouter(props: AppRouterProps): React_2.JSX.Element;
 
 // @public
 export interface AppRouterProps {
@@ -368,7 +384,9 @@ export type ErrorBoundaryFallbackProps = PropsWithChildren<{
 }>;
 
 // @public
-export const FeatureFlagged: (props: FeatureFlaggedProps) => JSX.Element;
+export const FeatureFlagged: (
+  props: FeatureFlaggedProps,
+) => React_2.JSX.Element;
 
 // @public
 export type FeatureFlaggedProps = {
@@ -535,10 +553,10 @@ export type OAuth2Session = {
     idToken: string;
     accessToken: string;
     scopes: Set<string>;
-    expiresAt: Date;
+    expiresAt?: Date;
   };
   profile: ProfileInfo;
-  backstageIdentity: BackstageIdentityResponse;
+  backstageIdentity?: BackstageIdentityResponse;
 };
 
 // @public
diff --git a/packages/core-app-api/catalog-info.yaml b/packages/core-app-api/catalog-info.yaml
new file mode 100644
index 0000000000..628c5a36d6
--- /dev/null
+++ b/packages/core-app-api/catalog-info.yaml
@@ -0,0 +1,10 @@
+apiVersion: backstage.io/v1alpha1
+kind: Component
+metadata:
+  name: backstage-core-app-api
+  title: '@backstage/core-app-api'
+  description: Core app API used by Backstage apps
+spec:
+  lifecycle: production
+  type: backstage-web-library
+  owner: maintainers
diff --git a/packages/core-app-api/package.json b/packages/core-app-api/package.json
index 15dca326e0..0dd87d1c5f 100644
--- a/packages/core-app-api/package.json
+++ b/packages/core-app-api/package.json
@@ -1,11 +1,24 @@
 {
   "name": "@backstage/core-app-api",
   "description": "Core app API used by Backstage apps",
-  "version": "1.9.1-next.0",
+  "version": "1.10.0-next.2",
   "publishConfig": {
-    "access": "public",
-    "main": "dist/index.esm.js",
-    "types": "dist/index.d.ts"
+    "access": "public"
+  },
+  "exports": {
+    ".": "./src/index.ts",
+    "./alpha": "./src/alpha.ts",
+    "./package.json": "./package.json"
+  },
+  "typesVersions": {
+    "*": {
+      "alpha": [
+        "src/alpha.ts"
+      ],
+      "package.json": [
+        "package.json"
+      ]
+    }
   },
   "backstage": {
     "role": "web-library"
@@ -22,6 +35,7 @@
   "license": "Apache-2.0",
   "main": "src/index.ts",
   "types": "src/index.ts",
+  "sideEffects": false,
   "scripts": {
     "build": "backstage-cli package build",
     "lint": "backstage-cli package lint",
@@ -39,7 +53,10 @@
     "@types/prop-types": "^15.7.3",
     "@types/react": "^16.13.1 || ^17.0.0",
     "history": "^5.0.0",
+    "i18next": "^22.4.15",
+    "i18next-browser-languagedetector": "^7.0.2",
     "prop-types": "^15.7.2",
+    "react-i18next": "^12.3.1",
     "react-use": "^17.2.4",
     "zen-observable": "^0.10.0",
     "zod": "^3.21.4"
@@ -57,7 +74,6 @@
     "@testing-library/react": "^12.1.3",
     "@testing-library/react-hooks": "^8.0.0",
     "@testing-library/user-event": "^14.0.0",
-    "@types/node": "^16.11.26",
     "@types/zen-observable": "^0.8.0",
     "msw": "^1.0.0",
     "react-router-beta": "npm:react-router@6.0.0-beta.0",
diff --git a/packages/core-app-api/src/alpha.ts b/packages/core-app-api/src/alpha.ts
new file mode 100644
index 0000000000..288676f509
--- /dev/null
+++ b/packages/core-app-api/src/alpha.ts
@@ -0,0 +1,17 @@
+/*
+ * Copyright 2023 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+export * from './apis/implementations/AppTranslationApi';
+export * from './app/TranslationResource';
diff --git a/packages/core-app-api/src/apis/implementations/AppTranslationApi/AppTranslation.test.ts b/packages/core-app-api/src/apis/implementations/AppTranslationApi/AppTranslation.test.ts
new file mode 100644
index 0000000000..b6eba8a1c7
--- /dev/null
+++ b/packages/core-app-api/src/apis/implementations/AppTranslationApi/AppTranslation.test.ts
@@ -0,0 +1,181 @@
+/*
+ * 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 { createTranslationRef } from '@backstage/core-plugin-api/alpha';
+import { AppTranslationApiImpl } from './AppTranslationImpl';
+import i18next from 'i18next';
+
+jest.mock('i18next', () => ({
+  createInstance: jest.fn(() => ({
+    use: jest.fn(() => ({
+      init: jest.fn(),
+      use: jest.fn(),
+      addResourceBundle: jest.fn(),
+      reloadResources: jest.fn(),
+      emit: jest.fn(),
+      services: {
+        languageUtils: {
+          getFallbackCodes: jest.fn().mockReturnValue(['en']),
+        },
+      },
+      options: {
+        fallbackLng: 'en',
+        supportedLngs: ['zh', 'en'],
+      },
+    })),
+  })),
+}));
+
+describe('AppTranslationApiImpl', () => {
+  afterEach(() => {
+    jest.clearAllMocks();
+  });
+
+  it('should create i18n instance and init with options', () => {
+    const i18nMock = i18next.createInstance() as any;
+    const useReturnMock = i18nMock.use();
+    jest.spyOn(i18nMock, 'use').mockReturnValue(useReturnMock);
+    jest.spyOn(i18next, 'createInstance').mockReturnValue(i18nMock);
+
+    const instance = AppTranslationApiImpl.create({
+      supportedLanguages: ['en', 'zh'],
+    });
+
+    expect(i18next.createInstance).toHaveBeenCalled();
+    expect(i18nMock.use).toHaveBeenCalled();
+    expect(useReturnMock.init).toHaveBeenCalledWith({
+      fallbackLng: 'en',
+      supportedLngs: ['en', 'zh'],
+      interpolation: {
+        escapeValue: false,
+      },
+      react: {
+        bindI18n: 'loaded languageChanged',
+      },
+    });
+    expect(instance).toBeInstanceOf(AppTranslationApiImpl);
+  });
+
+  it('should init messages correctly', () => {
+    const useResourcesMock = jest.spyOn(
+      AppTranslationApiImpl.prototype,
+      'addResources',
+    );
+    const useLazyResourcesMock = jest.spyOn(
+      AppTranslationApiImpl.prototype,
+      'addLazyResources',
+    );
+    const ref = createTranslationRef({
+      id: 'ref-id',
+      messages: {
+        key1: '',
+      },
+    });
+
+    const options = {
+      supportedLanguages: ['en'],
+      messages: [
+        {
+          ref,
+          messages: {
+            en: { key1: 'value1' },
+          },
+          lazyMessages: {
+            en: () => Promise.resolve({ key2: 'value2' }),
+          } as any,
+        },
+      ],
+    };
+
+    const instance = AppTranslationApiImpl.create({
+      supportedLanguages: ['en'],
+    });
+    instance.initMessages(options);
+
+    expect(useResourcesMock).toHaveBeenCalledWith(
+      options.messages[0].ref,
+      options.messages[0].messages,
+    );
+    expect(useLazyResourcesMock).toHaveBeenCalledWith(
+      options.messages[0].ref,
+      options.messages[0].lazyMessages,
+    );
+  });
+
+  it('should useResources correctly', () => {
+    const i18nMock = i18next.createInstance() as any;
+    const useReturnMock = i18nMock.use();
+    jest.spyOn(i18nMock, 'use').mockReturnValue(useReturnMock);
+    jest.spyOn(i18next, 'createInstance').mockReturnValue(i18nMock);
+
+    const ref = createTranslationRef({
+      id: 'ref-id',
+      messages: {
+        key1: 'value1',
+      },
+      resources: {
+        en: {
+          key1: 'value2',
+        },
+      },
+    });
+
+    const instance = AppTranslationApiImpl.create({
+      supportedLanguages: ['en'],
+    });
+    instance.addResources(ref);
+
+    expect(useReturnMock.addResourceBundle).toHaveBeenCalledWith(
+      'en',
+      'ref-id',
+      { key1: 'value2' },
+      true,
+      false,
+    );
+  });
+
+  it('should useLazyResources correctly', () => {
+    const i18nMock = i18next.createInstance() as any;
+    const useReturnMock = i18nMock.use();
+
+    jest.spyOn(i18nMock, 'use').mockReturnValue(useReturnMock);
+    jest.spyOn(i18next, 'createInstance').mockReturnValue(i18nMock);
+
+    const ref = createTranslationRef({
+      id: 'ref-id',
+      messages: {
+        key1: 'value1',
+      },
+      lazyResources: {
+        en: () => Promise.resolve({ messages: { key1: 'value2' } }),
+      },
+    });
+
+    const instance = AppTranslationApiImpl.create({
+      supportedLanguages: ['en'],
+    });
+    instance.addLazyResources(ref);
+    setTimeout(() => {
+      expect(useReturnMock.addResourceBundle).toHaveBeenCalledWith(
+        'en',
+        'ref-id',
+        { key1: 'value2' },
+        true,
+        false,
+      );
+    });
+  });
+});
diff --git a/packages/core-app-api/src/apis/implementations/AppTranslationApi/AppTranslationImpl.ts b/packages/core-app-api/src/apis/implementations/AppTranslationApi/AppTranslationImpl.ts
new file mode 100644
index 0000000000..69820e7b67
--- /dev/null
+++ b/packages/core-app-api/src/apis/implementations/AppTranslationApi/AppTranslationImpl.ts
@@ -0,0 +1,192 @@
+/*
+ * 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 {
+  AppTranslationApi,
+  TranslationRef,
+} from '@backstage/core-plugin-api/alpha';
+import i18next, { type i18n } from 'i18next';
+import { initReactI18next } from 'react-i18next';
+import LanguageDetector from 'i18next-browser-languagedetector';
+
+import { TranslationMessages } from '../../../alpha';
+
+/** @alpha */
+export type ExperimentalI18n = {
+  supportedLanguages: string[];
+  fallbackLanguage?: string | string[];
+  messages?: Array<{
+    ref: TranslationRef;
+    messages?: Record<string, TranslationMessages<TranslationRef>>;
+    lazyMessages: Record<
+      string,
+      () => Promise<{ messages: TranslationMessages<TranslationRef> }>
+    >;
+  }>;
+};
+
+/** @alpha */
+export class AppTranslationApiImpl implements AppTranslationApi {
+  static create(options?: ExperimentalI18n) {
+    const i18n = i18next.createInstance().use(initReactI18next);
+
+    i18n.use(LanguageDetector);
+
+    i18n.init({
+      fallbackLng: options?.fallbackLanguage || 'en',
+      supportedLngs: options?.supportedLanguages || ['en'],
+      interpolation: {
+        escapeValue: false,
+      },
+      react: {
+        bindI18n: 'loaded languageChanged',
+      },
+    });
+
+    return new AppTranslationApiImpl(i18n, options);
+  }
+
+  private readonly cache = new WeakSet<TranslationRef>();
+  private readonly lazyCache = new WeakMap<TranslationRef, Set<string>>();
+
+  getI18n() {
+    return this.i18n;
+  }
+
+  initMessages(options?: ExperimentalI18n) {
+    if (options?.messages?.length) {
+      options.messages.forEach(appMessage => {
+        if (appMessage.messages) {
+          this.addResources(appMessage.ref, appMessage.messages);
+        }
+
+        if (appMessage.lazyMessages) {
+          this.addLazyResources(appMessage.ref, appMessage.lazyMessages);
+        }
+      });
+    }
+  }
+
+  addResourcesByRef<Messages extends Record<string, string>>(
+    translationRef: TranslationRef<Messages>,
+  ): void {
+    this.addResources(translationRef);
+    this.addLazyResources(translationRef);
+  }
+
+  addResources<Messages extends Record<string, string>>(
+    translationRef: TranslationRef<Messages>,
+    initResources?: Record<
+      string,
+      TranslationMessages<TranslationRef<Messages>>
+    >,
+  ) {
+    const resources = initResources || translationRef.getResources();
+    if (!resources || this.cache.has(translationRef)) {
+      return;
+    }
+    this.cache.add(translationRef);
+    Object.entries(resources).forEach(([language, messages]) => {
+      this.i18n.addResourceBundle(
+        language,
+        translationRef.getId(),
+        messages,
+        true,
+        false,
+      );
+    });
+  }
+
+  addLazyResources<Messages extends Record<string, string>>(
+    translationRef: TranslationRef<Messages>,
+    initResources?: Record<
+      string,
+      () => Promise<{ messages: TranslationMessages<TranslationRef> }>
+    >,
+  ) {
+    let cache = this.lazyCache.get(translationRef);
+
+    if (!cache) {
+      cache = new Set();
+      this.lazyCache.set(translationRef, cache);
+    }
+
+    const {
+      language: currentLanguage,
+      services,
+      options,
+      addResourceBundle,
+      reloadResources,
+    } = this.i18n;
+
+    if (cache.has(currentLanguage)) {
+      return;
+    }
+
+    const namespace = translationRef.getId();
+    const lazyResources = initResources || translationRef.getLazyResources();
+
+    Promise.allSettled((options.supportedLngs || []).map(addLanguage)).then(
+      results => {
+        if (results.some(result => result.status === 'fulfilled')) {
+          this.i18n.emit('loaded');
+        }
+      },
+    );
+
+    async function addLanguage(language: string) {
+      if (cache!.has(language)) {
+        return;
+      }
+
+      cache!.add(language);
+
+      let loadBackend: Promise<void> | undefined;
+
+      if (services.backendConnector?.backend) {
+        loadBackend = reloadResources([language], [namespace]);
+      }
+
+      const loadLazyResources = lazyResources?.[language];
+
+      if (!loadLazyResources) {
+        await loadBackend;
+        return;
+      }
+
+      const [result] = await Promise.allSettled([
+        loadLazyResources(),
+        loadBackend,
+      ]);
+
+      if (result.status === 'rejected') {
+        throw result.reason;
+      }
+
+      addResourceBundle(
+        language,
+        namespace,
+        result.value.messages,
+        true,
+        false,
+      );
+    }
+  }
+
+  private constructor(private readonly i18n: i18n, options?: ExperimentalI18n) {
+    this.initMessages(options);
+  }
+}
diff --git a/packages/core-app-api/src/apis/implementations/AppTranslationApi/index.ts b/packages/core-app-api/src/apis/implementations/AppTranslationApi/index.ts
new file mode 100644
index 0000000000..91d76413d8
--- /dev/null
+++ b/packages/core-app-api/src/apis/implementations/AppTranslationApi/index.ts
@@ -0,0 +1,17 @@
+/*
+ * Copyright 2023 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+export * from './AppTranslationImpl';
diff --git a/packages/core-app-api/src/apis/implementations/auth/oauth2/OAuth2.test.ts b/packages/core-app-api/src/apis/implementations/auth/oauth2/OAuth2.test.ts
index 6f941379a7..8ca818ebd8 100644
--- a/packages/core-app-api/src/apis/implementations/auth/oauth2/OAuth2.test.ts
+++ b/packages/core-app-api/src/apis/implementations/auth/oauth2/OAuth2.test.ts
@@ -76,6 +76,37 @@ describe('OAuth2', () => {
     );
   });
 
+  it('should forward backstage identity', async () => {
+    getSession = jest.fn().mockResolvedValue({
+      providerInfo: { accessToken: 'access-token', expiresAt: theFuture },
+      backstageIdentity: {
+        token: 'a.b.c',
+        expiresAt: theFuture,
+        identity: {
+          type: 'user',
+          userEntityRef: 'user:default/mock',
+          ownershipEntityRefs: [],
+        },
+      },
+    });
+    const oauth2 = OAuth2.create({
+      configApi: configApi,
+      scopeTransform: scopes => scopes.map(scope => `my-prefix/${scope}`),
+      oauthRequestApi: new MockOAuthApi(),
+      discoveryApi: UrlPatternDiscovery.compile('http://example.com'),
+    });
+
+    await expect(oauth2.getBackstageIdentity()).resolves.toEqual({
+      token: 'a.b.c',
+      expiresAt: theFuture,
+      identity: {
+        type: 'user',
+        userEntityRef: 'user:default/mock',
+        ownershipEntityRefs: [],
+      },
+    });
+  });
+
   it('should get refreshed id token', async () => {
     getSession = jest.fn().mockResolvedValue({
       providerInfo: { idToken: 'id-token', expiresAt: theFuture },
diff --git a/packages/core-app-api/src/apis/implementations/auth/oauth2/OAuth2.ts b/packages/core-app-api/src/apis/implementations/auth/oauth2/OAuth2.ts
index fd40a9c8fb..6be7cfc89d 100644
--- a/packages/core-app-api/src/apis/implementations/auth/oauth2/OAuth2.ts
+++ b/packages/core-app-api/src/apis/implementations/auth/oauth2/OAuth2.ts
@@ -30,6 +30,7 @@ import {
   SessionState,
   SessionApi,
   BackstageIdentityApi,
+  BackstageUserIdentity,
 } from '@backstage/core-plugin-api';
 import { Observable } from '@backstage/types';
 import { OAuth2Session } from './types';
@@ -49,10 +50,14 @@ export type OAuth2Response = {
     accessToken: string;
     idToken: string;
     scope: string;
-    expiresInSeconds: number;
+    expiresInSeconds?: number;
   };
   profile: ProfileInfo;
-  backstageIdentity: BackstageIdentityResponse;
+  backstageIdentity: {
+    token: string;
+    expiresInSeconds?: number;
+    identity: BackstageUserIdentity;
+  };
 };
 
 const DEFAULT_PROVIDER = {
@@ -92,8 +97,11 @@ export default class OAuth2
       environment,
       provider,
       oauthRequestApi: oauthRequestApi,
-      sessionTransform(res: OAuth2Response): OAuth2Session {
-        return {
+      sessionTransform({
+        backstageIdentity,
+        ...res
+      }: OAuth2Response): OAuth2Session {
+        const session: OAuth2Session = {
           ...res,
           providerInfo: {
             idToken: res.providerInfo.idToken,
@@ -102,11 +110,26 @@ export default class OAuth2
               scopeTransform,
               res.providerInfo.scope,
             ),
-            expiresAt: new Date(
-              Date.now() + res.providerInfo.expiresInSeconds * 1000,
-            ),
+            expiresAt: res.providerInfo.expiresInSeconds
+              ? new Date(Date.now() + res.providerInfo.expiresInSeconds * 1000)
+              : undefined,
           },
         };
+        if (backstageIdentity) {
+          // TODO(Rugvip): This fallback can be removed a few releases after 1.18. It's there to avoid
+          //               breaking deployments that update their frontend before updating their backend.
+          const expInSec =
+            backstageIdentity.expiresInSeconds ??
+            res.providerInfo.expiresInSeconds;
+          session.backstageIdentity = {
+            token: backstageIdentity.token,
+            identity: backstageIdentity.identity,
+            expiresAt: expInSec
+              ? new Date(Date.now() + expInSec * 1000)
+              : undefined,
+          };
+        }
+        return session;
       },
       popupOptions,
     });
@@ -116,9 +139,21 @@ export default class OAuth2
       defaultScopes: new Set(defaultScopes),
       sessionScopes: (session: OAuth2Session) => session.providerInfo.scopes,
       sessionShouldRefresh: (session: OAuth2Session) => {
-        const expiresInSec =
-          (session.providerInfo.expiresAt.getTime() - Date.now()) / 1000;
-        return expiresInSec < 60 * 5;
+        // TODO(Rugvip): Optimize to use separate checks for provider vs backstage session expiration
+        let min = Infinity;
+        if (session.providerInfo?.expiresAt) {
+          min = Math.min(
+            min,
+            (session.providerInfo.expiresAt.getTime() - Date.now()) / 1000,
+          );
+        }
+        if (session.backstageIdentity?.expiresAt) {
+          min = Math.min(
+            min,
+            (session.backstageIdentity.expiresAt.getTime() - Date.now()) / 1000,
+          );
+        }
+        return min < 60 * 5;
       },
     });
 
diff --git a/packages/core-app-api/src/apis/implementations/auth/oauth2/types.ts b/packages/core-app-api/src/apis/implementations/auth/oauth2/types.ts
index bd3bb95ba6..e51de63dbe 100644
--- a/packages/core-app-api/src/apis/implementations/auth/oauth2/types.ts
+++ b/packages/core-app-api/src/apis/implementations/auth/oauth2/types.ts
@@ -31,8 +31,8 @@ export type OAuth2Session = {
     idToken: string;
     accessToken: string;
     scopes: Set<string>;
-    expiresAt: Date;
+    expiresAt?: Date;
   };
   profile: ProfileInfo;
-  backstageIdentity: BackstageIdentityResponse;
+  backstageIdentity?: BackstageIdentityResponse;
 };
diff --git a/packages/core-app-api/src/app/AppManager.test.tsx b/packages/core-app-api/src/app/AppManager.test.tsx
index db0d3ea9af..1b68cfd6ca 100644
--- a/packages/core-app-api/src/app/AppManager.test.tsx
+++ b/packages/core-app-api/src/app/AppManager.test.tsx
@@ -260,6 +260,46 @@ describe('Integration Test', () => {
     expect(screen.getByText('extLink4: <none>')).toBeInTheDocument();
   });
 
+  it('runs success with __experimentalI18n', async () => {
+    const app = new AppManager({
+      apis: [noOpAnalyticsApi],
+      defaultApis: [],
+      themes,
+      icons,
+      plugins: [],
+      components,
+      configLoader: async () => [],
+      bindRoutes: ({ bind }) => {
+        bind(plugin1.externalRoutes, {
+          extRouteRef1: plugin1RouteRef,
+          extRouteRef2: plugin2RouteRef,
+        });
+      },
+      __experimentalI18n: {
+        supportedLanguages: ['en'],
+      },
+    });
+
+    const Provider = app.getProvider();
+    const Router = app.getRouter();
+
+    await renderWithEffects(
+      <Provider>
+        <Router>
+          <Routes>
+            <Route path="/" element={<ExposedComponent />} />
+            <Route path="/foo" element={<HiddenComponent />} />
+          </Routes>
+        </Router>
+      </Provider>,
+    );
+
+    expect(screen.getByText('extLink1: /')).toBeInTheDocument();
+    expect(screen.getByText('extLink2: /foo')).toBeInTheDocument();
+    expect(screen.getByText('extLink3: <none>')).toBeInTheDocument();
+    expect(screen.getByText('extLink4: <none>')).toBeInTheDocument();
+  });
+
   it('should wait for the config to load before calling feature flags', async () => {
     const storageFlags = new LocalStorageFeatureFlags();
     jest.spyOn(storageFlags, 'registerFlag');
diff --git a/packages/core-app-api/src/app/AppManager.tsx b/packages/core-app-api/src/app/AppManager.tsx
index 470f7f8d75..de078c0ffc 100644
--- a/packages/core-app-api/src/app/AppManager.tsx
+++ b/packages/core-app-api/src/app/AppManager.tsx
@@ -42,6 +42,10 @@ import {
   BackstagePlugin,
   FeatureFlag,
 } from '@backstage/core-plugin-api';
+import {
+  AppTranslationApi,
+  appTranslationApiRef,
+} from '@backstage/core-plugin-api/alpha';
 import { ApiFactoryRegistry, ApiResolver } from '../apis/system';
 import {
   childDiscoverer,
@@ -75,6 +79,8 @@ import { resolveRouteBindings } from './resolveRouteBindings';
 import { isReactRouterBeta } from './isReactRouterBeta';
 import { InternalAppContext } from './InternalAppContext';
 import { AppRouter, getBasePath } from './AppRouter';
+import { AppTranslationProvider } from './AppTranslationProvider';
+import { AppTranslationApiImpl } from '../apis/implementations/AppTranslationApi';
 
 type CompatiblePlugin =
   | BackstagePlugin
@@ -209,6 +215,7 @@ export class AppManager implements BackstageApp {
   private readonly configLoader?: AppConfigLoader;
   private readonly defaultApis: Iterable<AnyApiFactory>;
   private readonly bindRoutes: AppOptions['bindRoutes'];
+  private readonly appTranslationApi: AppTranslationApi;
 
   private readonly appIdentityProxy = new AppIdentityProxy();
   private readonly apiFactoryRegistry: ApiFactoryRegistry;
@@ -224,6 +231,9 @@ export class AppManager implements BackstageApp {
     this.defaultApis = options.defaultApis ?? [];
     this.bindRoutes = options.bindRoutes;
     this.apiFactoryRegistry = new ApiFactoryRegistry();
+    this.appTranslationApi = AppTranslationApiImpl.create(
+      options.__experimentalI18n,
+    );
   }
 
   getPlugins(): BackstagePlugin[] {
@@ -379,24 +389,26 @@ export class AppManager implements BackstageApp {
       return (
         <ApiProvider apis={this.getApiHolder()}>
           <AppContextProvider appContext={appContext}>
-            <ThemeProvider>
-              <RoutingProvider
-                routePaths={routing.paths}
-                routeParents={routing.parents}
-                routeObjects={routing.objects}
-                routeBindings={routeBindings}
-                basePath={getBasePath(loadedConfig.api)}
-              >
-                <InternalAppContext.Provider
-                  value={{
-                    routeObjects: routing.objects,
-                    appIdentityProxy: this.appIdentityProxy,
-                  }}
+            <AppTranslationProvider>
+              <ThemeProvider>
+                <RoutingProvider
+                  routePaths={routing.paths}
+                  routeParents={routing.parents}
+                  routeObjects={routing.objects}
+                  routeBindings={routeBindings}
+                  basePath={getBasePath(loadedConfig.api)}
                 >
-                  {children}
-                </InternalAppContext.Provider>
-              </RoutingProvider>
-            </ThemeProvider>
+                  <InternalAppContext.Provider
+                    value={{
+                      routeObjects: routing.objects,
+                      appIdentityProxy: this.appIdentityProxy,
+                    }}
+                  >
+                    {children}
+                  </InternalAppContext.Provider>
+                </RoutingProvider>
+              </ThemeProvider>
+            </AppTranslationProvider>
           </AppContextProvider>
         </ApiProvider>
       );
@@ -447,6 +459,11 @@ export class AppManager implements BackstageApp {
       deps: {},
       factory: () => this.appIdentityProxy,
     });
+    this.apiFactoryRegistry.register('static', {
+      api: appTranslationApiRef,
+      deps: {},
+      factory: () => this.appTranslationApi,
+    });
 
     // It's possible to replace the feature flag API, but since we must have at least
     // one implementation we add it here directly instead of through the defaultApis.
diff --git a/packages/core-app-api/src/app/AppTranslationProvider.tsx b/packages/core-app-api/src/app/AppTranslationProvider.tsx
new file mode 100644
index 0000000000..3d5e7e57e1
--- /dev/null
+++ b/packages/core-app-api/src/app/AppTranslationProvider.tsx
@@ -0,0 +1,27 @@
+/*
+ * 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, { PropsWithChildren } from 'react';
+import { useApi } from '@backstage/core-plugin-api';
+import { appTranslationApiRef } from '@backstage/core-plugin-api/alpha';
+import { I18nextProvider } from 'react-i18next';
+
+/** @alpha */
+export function AppTranslationProvider({ children }: PropsWithChildren<{}>) {
+  const appTranslationAPi = useApi(appTranslationApiRef);
+  const i18n = appTranslationAPi.getI18n();
+  return <I18nextProvider i18n={i18n}>{children}</I18nextProvider>;
+}
diff --git a/packages/core-app-api/src/app/TranslationResource.ts b/packages/core-app-api/src/app/TranslationResource.ts
new file mode 100644
index 0000000000..65f1c4622c
--- /dev/null
+++ b/packages/core-app-api/src/app/TranslationResource.ts
@@ -0,0 +1,34 @@
+/*
+ * 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 { TranslationRef } from '@backstage/core-plugin-api/alpha';
+
+/** @alpha */
+export type TranslationMessages<T> = T extends TranslationRef<infer R>
+  ? Partial<R>
+  : never;
+
+/** @alpha */
+export function createTranslationResource<T extends TranslationRef>(options: {
+  ref: T;
+  messages?: Record<string, TranslationMessages<T>>;
+  lazyMessages: Record<
+    string,
+    () => Promise<{ messages: TranslationMessages<T> }>
+  >;
+}) {
+  return options;
+}
diff --git a/packages/core-app-api/src/app/types.ts b/packages/core-app-api/src/app/types.ts
index 7f38e2d006..3d4b9cf8c5 100644
--- a/packages/core-app-api/src/app/types.ts
+++ b/packages/core-app-api/src/app/types.ts
@@ -27,6 +27,7 @@ import {
   FeatureFlag,
 } from '@backstage/core-plugin-api';
 import { AppConfig } from '@backstage/config';
+import { TranslationRef } from '@backstage/core-plugin-api/alpha';
 
 /**
  * Props for the `BootErrorPage` component of {@link AppComponents}.
@@ -177,6 +178,16 @@ export type AppRouteBinder = <
   >,
 ) => void;
 
+/**
+ * TODO: To be remove when TranslationMessages in packages/core-app-api/src/app/TranslationResource.ts
+ * come to be public
+ *
+ * @ignore
+ * */
+type TranslationMessages<T> = T extends TranslationRef<infer R>
+  ? Partial<R>
+  : never;
+
 /**
  * The options accepted by {@link createSpecializedApp}.
  *
@@ -278,6 +289,23 @@ export type AppOptions = {
    * ```
    */
   bindRoutes?(context: { bind: AppRouteBinder }): void;
+
+  /**
+   * TODO: Change to ExperimentalI18n type when packages/core-app-api/src/apis/implementations/AppTranslationApi/AppTranslationImpl.ts
+   * become to public
+   */
+  __experimentalI18n?: {
+    supportedLanguages: string[];
+    fallbackLanguage?: string | string[];
+    messages?: Array<{
+      ref: TranslationRef;
+      messages?: Record<string, TranslationMessages<TranslationRef>>;
+      lazyMessages: Record<
+        string,
+        () => Promise<{ messages: TranslationMessages<TranslationRef> }>
+      >;
+    }>;
+  };
 };
 
 /**
diff --git a/packages/core-components/CHANGELOG.md b/packages/core-components/CHANGELOG.md
index 4ebd92ceb6..8fb94136e0 100644
--- a/packages/core-components/CHANGELOG.md
+++ b/packages/core-components/CHANGELOG.md
@@ -1,5 +1,54 @@
 # @backstage/core-components
 
+## 0.13.5-next.2
+
+### Patch Changes
+
+- 8cec7664e146: Removed `@types/node` dependency
+- db92d1244897: Updated dependency `rc-progress` to `3.5.1`.
+- Updated dependencies
+  - @backstage/core-plugin-api@1.6.0-next.2
+  - @backstage/config@1.1.0-next.1
+  - @backstage/errors@1.2.1
+  - @backstage/theme@0.4.1
+  - @backstage/version-bridge@1.0.4
+
+## 0.13.5-next.1
+
+### Patch Changes
+
+- 0c9907645aab: Fixed an issue causing `StructuredMetadataTable` to crash in case metadata contained `null` values.
+- Updated dependencies
+  - @backstage/config@1.1.0-next.0
+  - @backstage/core-plugin-api@1.6.0-next.1
+  - @backstage/errors@1.2.1
+  - @backstage/theme@0.4.1
+  - @backstage/version-bridge@1.0.4
+
+## 0.13.5-next.0
+
+### Patch Changes
+
+- 47782f4bfa5b: Add loading indicator to Table
+- Updated dependencies
+  - @backstage/core-plugin-api@1.6.0-next.0
+  - @backstage/config@1.0.8
+  - @backstage/errors@1.2.1
+  - @backstage/theme@0.4.1
+  - @backstage/version-bridge@1.0.4
+
+## 0.13.4
+
+### Patch Changes
+
+- 3d86be999fdf: Prefer simple `theme.spacing` without string interpolation
+- Updated dependencies
+  - @backstage/core-plugin-api@1.5.3
+  - @backstage/config@1.0.8
+  - @backstage/errors@1.2.1
+  - @backstage/theme@0.4.1
+  - @backstage/version-bridge@1.0.4
+
 ## 0.13.4-next.0
 
 ### Patch Changes
diff --git a/packages/core-components/api-report.md b/packages/core-components/api-report.md
index df34abdd03..54c26039a3 100644
--- a/packages/core-components/api-report.md
+++ b/packages/core-components/api-report.md
@@ -54,7 +54,9 @@ import { TooltipProps } from '@material-ui/core/Tooltip';
 import { WithStyles } from '@material-ui/core/styles';
 
 // @public
-export function AlertDisplay(props: AlertDisplayProps): JSX.Element | null;
+export function AlertDisplay(
+  props: AlertDisplayProps,
+): React_2.JSX.Element | null;
 
 // @public
 export type AlertDisplayProps = {
@@ -66,7 +68,7 @@ export type AlertDisplayProps = {
 };
 
 // @public
-export function Avatar(props: AvatarProps): JSX.Element;
+export function Avatar(props: AvatarProps): React_2.JSX.Element;
 
 // @public (undocumented)
 export type AvatarClassKey = 'avatar';
@@ -94,7 +96,7 @@ export type BackstageOverrides = Overrides & {
 export type BoldHeaderClassKey = 'root' | 'title' | 'subheader';
 
 // @public
-export function BottomLink(props: BottomLinkProps): JSX.Element;
+export function BottomLink(props: BottomLinkProps): React_2.JSX.Element;
 
 // @public (undocumented)
 export type BottomLinkClassKey = 'root' | 'boxTitle' | 'arrow';
@@ -109,7 +111,7 @@ export type BottomLinkProps = {
 // 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;
+export function Breadcrumbs(props: Props_19): React_2.JSX.Element;
 
 // @public (undocumented)
 export type BreadcrumbsClickableTextClassKey = 'root';
@@ -120,7 +122,7 @@ export type BreadcrumbsStyledBoxClassKey = 'root';
 // Warning: (ae-forgotten-export) The symbol "IconComponentProps" needs to be exported by the entry point index.d.ts
 //
 // @public
-export function BrokenImageIcon(props: IconComponentProps): JSX.Element;
+export function BrokenImageIcon(props: IconComponentProps): React_2.JSX.Element;
 
 // @public @deprecated (undocumented)
 export const Button: (props: LinkButtonProps) => JSX.Element;
@@ -134,22 +136,24 @@ export type CardActionsTopRightClassKey = 'root';
 // Warning: (ae-forgotten-export) The symbol "CardTabProps" needs to be exported by the entry point index.d.ts
 //
 // @public
-export function CardTab(props: PropsWithChildren<CardTabProps>): JSX.Element;
+export function CardTab(
+  props: PropsWithChildren<CardTabProps>,
+): React_2.JSX.Element;
 
 // @public (undocumented)
 export type CardTabClassKey = 'root' | 'selected';
 
 // @public (undocumented)
-export function CatalogIcon(props: IconComponentProps): JSX.Element;
+export function CatalogIcon(props: IconComponentProps): React_2.JSX.Element;
 
 // @public (undocumented)
-export function ChatIcon(props: IconComponentProps): JSX.Element;
+export function ChatIcon(props: IconComponentProps): React_2.JSX.Element;
 
 // @public (undocumented)
 export type ClosedDropdownClassKey = 'icon';
 
 // @public
-export function CodeSnippet(props: CodeSnippetProps): JSX.Element;
+export function CodeSnippet(props: CodeSnippetProps): React_2.JSX.Element;
 
 // @public
 export interface CodeSnippetProps {
@@ -164,14 +168,16 @@ export interface CodeSnippetProps {
 // 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;
+export function Content(
+  props: PropsWithChildren<Props_13>,
+): React_2.JSX.Element;
 
 // Warning: (ae-forgotten-export) The symbol "ContentHeaderProps" needs to be exported by the entry point index.d.ts
 //
 // @public
 export function ContentHeader(
   props: PropsWithChildren<ContentHeaderProps>,
-): JSX.Element;
+): React_2.JSX.Element;
 
 // @public (undocumented)
 export type ContentHeaderClassKey =
@@ -182,7 +188,7 @@ export type ContentHeaderClassKey =
   | 'title';
 
 // @public
-export function CopyTextButton(props: CopyTextButtonProps): JSX.Element;
+export function CopyTextButton(props: CopyTextButtonProps): React_2.JSX.Element;
 
 // @public
 export interface CopyTextButtonProps {
@@ -193,7 +199,9 @@ export interface CopyTextButtonProps {
 }
 
 // @public
-export function CreateButton(props: CreateButtonProps): JSX.Element | null;
+export function CreateButton(
+  props: CreateButtonProps,
+): React_2.JSX.Element | null;
 
 // @public
 export type CreateButtonProps = {
@@ -204,12 +212,12 @@ export type CreateButtonProps = {
 export type CustomProviderClassKey = 'form' | 'button';
 
 // @public (undocumented)
-export function DashboardIcon(props: IconComponentProps): JSX.Element;
+export function DashboardIcon(props: IconComponentProps): React_2.JSX.Element;
 
 // @public
 export function DependencyGraph<NodeData, EdgeData>(
   props: DependencyGraphProps<NodeData, EdgeData>,
-): JSX.Element;
+): React_2.JSX.Element;
 
 // @public (undocumented)
 export type DependencyGraphDefaultLabelClassKey = 'text';
@@ -301,7 +309,7 @@ export namespace DependencyGraphTypes {
 // Warning: (ae-forgotten-export) The symbol "Props" needs to be exported by the entry point index.d.ts
 //
 // @public (undocumented)
-export const DismissableBanner: (props: Props) => JSX.Element;
+export const DismissableBanner: (props: Props) => React_2.JSX.Element;
 
 // @public (undocumented)
 export type DismissableBannerClassKey =
@@ -317,15 +325,15 @@ export type DismissableBannerClassKey =
 export type DismissbleBannerClassKey = DismissableBannerClassKey;
 
 // @public (undocumented)
-export function DocsIcon(props: IconComponentProps): JSX.Element;
+export function DocsIcon(props: IconComponentProps): React_2.JSX.Element;
 
 // @public (undocumented)
-export function EmailIcon(props: IconComponentProps): JSX.Element;
+export function EmailIcon(props: IconComponentProps): React_2.JSX.Element;
 
 // 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;
+export function EmptyState(props: Props_2): React_2.JSX.Element;
 
 // @public (undocumented)
 export type EmptyStateClassKey = 'root' | 'action' | 'imageContainer';
@@ -347,7 +355,7 @@ export type ErrorBoundaryProps = {
 // Warning: (ae-forgotten-export) The symbol "IErrorPageProps" needs to be exported by the entry point index.d.ts
 //
 // @public
-export function ErrorPage(props: IErrorPageProps): JSX.Element;
+export function ErrorPage(props: IErrorPageProps): React_2.JSX.Element;
 
 // @public (undocumented)
 export type ErrorPageClassKey = 'container' | 'title' | 'subtitle';
@@ -355,7 +363,7 @@ export type ErrorPageClassKey = 'container' | 'title' | 'subtitle';
 // @public
 export function ErrorPanel(
   props: PropsWithChildren<ErrorPanelProps>,
-): JSX.Element;
+): React_2.JSX.Element;
 
 // @public (undocumented)
 export type ErrorPanelClassKey = 'text' | 'divider';
@@ -382,18 +390,18 @@ export type FeatureCalloutCircleClassKey =
 // @public
 export function FeatureCalloutCircular(
   props: PropsWithChildren<Props_4>,
-): JSX.Element;
+): React_2.JSX.Element;
 
 // @public (undocumented)
 export type FiltersContainerClassKey = 'root' | 'title';
 
 // @public
-export function Gauge(props: GaugeProps): JSX.Element;
+export function Gauge(props: GaugeProps): React_2.JSX.Element;
 
 // 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;
+export function GaugeCard(props: Props_10): React_2.JSX.Element;
 
 // @public (undocumented)
 export type GaugeCardClassKey = 'root';
@@ -429,18 +437,20 @@ export type GaugePropsGetColorOptions = {
 };
 
 // @public (undocumented)
-export function GitHubIcon(props: IconComponentProps): JSX.Element;
+export function GitHubIcon(props: IconComponentProps): React_2.JSX.Element;
 
 // @public (undocumented)
-export function GroupIcon(props: IconComponentProps): JSX.Element;
+export function GroupIcon(props: IconComponentProps): React_2.JSX.Element;
 
 // 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;
+export function Header(props: PropsWithChildren<Props_14>): React_2.JSX.Element;
 
 // @public (undocumented)
-export function HeaderActionMenu(props: HeaderActionMenuProps): JSX.Element;
+export function HeaderActionMenu(
+  props: HeaderActionMenuProps,
+): React_2.JSX.Element;
 
 // @public (undocumented)
 export type HeaderActionMenuItem = {
@@ -471,7 +481,7 @@ export type HeaderClassKey =
 // 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;
+export function HeaderIconLinkRow(props: Props_5): React_2.JSX.Element;
 
 // @public (undocumented)
 export type HeaderIconLinkRowClassKey = 'links';
@@ -479,7 +489,7 @@ export type HeaderIconLinkRowClassKey = 'links';
 // Warning: (ae-forgotten-export) The symbol "HeaderLabelProps" needs to be exported by the entry point index.d.ts
 //
 // @public
-export function HeaderLabel(props: HeaderLabelProps): JSX.Element;
+export function HeaderLabel(props: HeaderLabelProps): React_2.JSX.Element;
 
 // @public (undocumented)
 export type HeaderLabelClassKey = 'root' | 'label' | 'value';
@@ -487,7 +497,7 @@ export type HeaderLabelClassKey = 'root' | 'label' | 'value';
 // Warning: (ae-forgotten-export) The symbol "HeaderTabsProps" needs to be exported by the entry point index.d.ts
 //
 // @public
-export function HeaderTabs(props: HeaderTabsProps): JSX.Element;
+export function HeaderTabs(props: HeaderTabsProps): React_2.JSX.Element;
 
 // @public (undocumented)
 export type HeaderTabsClassKey =
@@ -497,14 +507,14 @@ export type HeaderTabsClassKey =
   | 'tabRoot';
 
 // @public (undocumented)
-export function HelpIcon(props: IconComponentProps): JSX.Element;
+export function HelpIcon(props: IconComponentProps): React_2.JSX.Element;
 
 // Warning: (ae-forgotten-export) The symbol "Props_6" needs to be exported by the entry point index.d.ts
 //
 // @public
 export function HorizontalScrollGrid(
   props: PropsWithChildren<Props_6>,
-): JSX.Element;
+): React_2.JSX.Element;
 
 // @public (undocumented)
 export type HorizontalScrollGridClassKey =
@@ -563,16 +573,16 @@ export type InfoCardVariants = 'flex' | 'fullHeight' | 'gridItem';
 // Warning: (ae-forgotten-export) The symbol "IntroCardProps" needs to be exported by the entry point index.d.ts
 //
 // @public
-export function IntroCard(props: IntroCardProps): JSX.Element;
+export function IntroCard(props: IntroCardProps): React_2.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 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;
+export function ItemCard(props: ItemCardProps): React_2.JSX.Element;
 
 // @public
-export function ItemCardGrid(props: ItemCardGridProps): JSX.Element;
+export function ItemCardGrid(props: ItemCardGridProps): React_2.JSX.Element;
 
 // @public (undocumented)
 export type ItemCardGridClassKey = 'root';
@@ -585,7 +595,7 @@ export type ItemCardGridProps = Partial<WithStyles<typeof styles>> & {
 };
 
 // @public
-export function ItemCardHeader(props: ItemCardHeaderProps): JSX.Element;
+export function ItemCardHeader(props: ItemCardHeaderProps): React_2.JSX.Element;
 
 // @public (undocumented)
 export type ItemCardHeaderClassKey = 'root';
@@ -603,7 +613,7 @@ export type ItemCardHeaderProps = Partial<WithStyles<typeof styles_2>> & {
 // 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;
+export function Lifecycle(props: Props_7): React_2.JSX.Element;
 
 // 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)
 //
@@ -614,7 +624,7 @@ export type LifecycleClassKey = 'alpha' | 'beta';
 // 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;
+export function LinearGauge(props: Props_11): React_2.JSX.Element | null;
 
 // 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)
 //
@@ -644,7 +654,7 @@ export type LinkProps = Omit<LinkProps_2, 'to'> &
 export type LoginRequestListItemClassKey = 'root';
 
 // @public
-export function LogViewer(props: LogViewerProps): JSX.Element;
+export function LogViewer(props: LogViewerProps): React_2.JSX.Element;
 
 // @public
 export type LogViewerClassKey =
@@ -691,7 +701,7 @@ export interface LogViewerProps {
 // 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;
+export function MarkdownContent(props: Props_8): React_2.JSX.Element;
 
 // 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)
 //
@@ -727,7 +737,9 @@ export type MicDropClassKey = 'micDrop';
 // 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;
+export function MissingAnnotationEmptyState(
+  props: Props_3,
+): React_2.JSX.Element;
 
 // 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)
 //
@@ -735,7 +747,9 @@ export function MissingAnnotationEmptyState(props: Props_3): JSX.Element;
 export type MissingAnnotationEmptyStateClassKey = 'code';
 
 // @public
-export const MobileSidebar: (props: MobileSidebarProps) => JSX.Element | null;
+export const MobileSidebar: (
+  props: MobileSidebarProps,
+) => React_2.JSX.Element | null;
 
 // @public
 export type MobileSidebarProps = {
@@ -745,7 +759,7 @@ export type MobileSidebarProps = {
 // 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;
+export function OAuthRequestDialog(_props: {}): React_2.JSX.Element;
 
 // 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)
 //
@@ -765,7 +779,7 @@ export type OpenedDropdownClassKey = 'icon';
 // 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;
+export function OverflowTooltip(props: Props_9): React_2.JSX.Element;
 
 // 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)
 //
@@ -776,7 +790,7 @@ export type OverflowTooltipClassKey = 'container';
 // 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;
+export function Page(props: Props_16): React_2.JSX.Element;
 
 // 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)
 //
@@ -789,19 +803,19 @@ export type PageClassKey = 'root';
 // @public (undocumented)
 export function PageWithHeader(
   props: PropsWithChildren<PageWithHeaderProps>,
-): JSX.Element;
+): React_2.JSX.Element;
 
 // 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(
   props: PropsWithChildren<LinearProgressProps>,
-): JSX.Element;
+): React_2.JSX.Element;
 
 // @public
 export const ProxiedSignInPage: (
   props: ProxiedSignInPageProps,
-) => JSX.Element | null;
+) => React_2.JSX.Element | null;
 
 // @public
 export type ProxiedSignInPageProps = SignInPageProps & {
@@ -812,7 +826,7 @@ export type ProxiedSignInPageProps = SignInPageProps & {
 // 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;
+export function ResponseErrorPanel(props: ErrorPanelProps): React_2.JSX.Element;
 
 // 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)
 //
@@ -822,12 +836,14 @@ export type ResponseErrorPanelClassKey = 'text' | 'divider';
 // 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;
+export function RoutedTabs(props: {
+  routes: SubRoute_2[];
+}): React_2.JSX.Element;
 
 // Warning: (ae-forgotten-export) The symbol "SelectProps" needs to be exported by the entry point index.d.ts
 //
 // @public (undocumented)
-export function Select(props: SelectProps): JSX.Element;
+export function Select(props: SelectProps): React_2.JSX.Element;
 
 // @public (undocumented)
 export type SelectClassKey =
@@ -851,7 +867,7 @@ export type SelectItem = {
 };
 
 // @public
-export const Sidebar: (props: SidebarProps) => JSX.Element;
+export const Sidebar: (props: SidebarProps) => React_2.JSX.Element;
 
 // 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)
 //
@@ -905,10 +921,10 @@ export const SidebarDivider: React_2.ComponentType<
 export type SidebarDividerClassKey = 'root';
 
 // @public
-export const SidebarExpandButton: () => JSX.Element | null;
+export const SidebarExpandButton: () => React_2.JSX.Element | null;
 
 // @public
-export const SidebarGroup: (props: SidebarGroupProps) => JSX.Element;
+export const SidebarGroup: (props: SidebarGroupProps) => React_2.JSX.Element;
 
 // @public
 export interface SidebarGroupProps extends BottomNavigationActionProps {
@@ -920,7 +936,7 @@ export interface SidebarGroupProps extends BottomNavigationActionProps {
 // 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;
+export function SidebarIntro(_props: {}): React_2.JSX.Element | null;
 
 // @public (undocumented)
 export type SidebarIntroClassKey =
@@ -967,7 +983,7 @@ export type SidebarOpenState = {
 export function SidebarOpenStateProvider(props: {
   children: ReactNode;
   value: SidebarOpenState;
-}): JSX.Element;
+}): React_2.JSX.Element;
 
 // @public (undocumented)
 export type SidebarOptions = {
@@ -978,7 +994,7 @@ export type SidebarOptions = {
 // 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;
+export function SidebarPage(props: SidebarPageProps): React_2.JSX.Element;
 
 // 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)
 //
@@ -1011,7 +1027,7 @@ export type SidebarPinStateContextType = {
 export function SidebarPinStateProvider(props: {
   children: ReactNode;
   value: SidebarPinStateContextType;
-}): JSX.Element;
+}): React_2.JSX.Element;
 
 // @public (undocumented)
 export type SidebarProps = {
@@ -1036,7 +1052,9 @@ export const SidebarScrollWrapper: React_2.ComponentType<
 // 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;
+export function SidebarSearchField(
+  props: SidebarSearchFieldProps,
+): React_2.JSX.Element;
 
 // 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)
 //
@@ -1067,12 +1085,14 @@ export const SidebarSpacer: React_2.ComponentType<
 export type SidebarSpacerClassKey = 'root';
 
 // @public
-export const SidebarSubmenu: (props: SidebarSubmenuProps) => JSX.Element;
+export const SidebarSubmenu: (
+  props: SidebarSubmenuProps,
+) => React_2.JSX.Element;
 
 // @public
 export const SidebarSubmenuItem: (
   props: SidebarSubmenuItemProps,
-) => JSX.Element;
+) => React_2.JSX.Element;
 
 // @public
 export type SidebarSubmenuItemDropdownItem = {
@@ -1100,7 +1120,7 @@ export type SidebarSubmenuProps = {
 // 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;
+export function SignInPage(props: Props_17): React_2.JSX.Element;
 
 // 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)
 //
@@ -1123,7 +1143,7 @@ export type SignInProviderConfig = {
 // @public (undocumented)
 export function SimpleStepper(
   props: PropsWithChildren<StepperProps>,
-): JSX.Element;
+): React_2.JSX.Element;
 
 // 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)
 //
@@ -1136,7 +1156,7 @@ export type SimpleStepperFooterClassKey = 'root';
 // @public (undocumented)
 export function SimpleStepperStep(
   props: PropsWithChildren<StepProps>,
-): JSX.Element;
+): React_2.JSX.Element;
 
 // 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)
 //
@@ -1146,7 +1166,9 @@ export type SimpleStepperStepClassKey = 'end';
 // 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;
+export function StatusAborted(
+  props: PropsWithChildren<{}>,
+): React_2.JSX.Element;
 
 // 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)
 //
@@ -1163,33 +1185,39 @@ export type StatusClassKey =
 // 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;
+export function StatusError(props: PropsWithChildren<{}>): React_2.JSX.Element;
 
 // 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;
+export function StatusOK(props: PropsWithChildren<{}>): React_2.JSX.Element;
 
 // 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;
+export function StatusPending(
+  props: PropsWithChildren<{}>,
+): React_2.JSX.Element;
 
 // 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;
+export function StatusRunning(
+  props: PropsWithChildren<{}>,
+): React_2.JSX.Element;
 
 // 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;
+export function StatusWarning(
+  props: PropsWithChildren<{}>,
+): React_2.JSX.Element;
 
 // 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;
+export function StructuredMetadataTable(props: Props_12): React_2.JSX.Element;
 
 // 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)
 //
@@ -1211,7 +1239,7 @@ export type SubmenuOptions = {
 // 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;
+export function SubvalueCell(props: SubvalueCellProps): React_2.JSX.Element;
 
 // 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)
 //
@@ -1222,7 +1250,7 @@ export type SubvalueCellClassKey = 'value' | 'subvalue';
 // 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;
+export function SupportButton(props: SupportButtonProps): React_2.JSX.Element;
 
 // 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)
 //
@@ -1272,7 +1300,9 @@ export type Tab = {
 // 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;
+export function TabbedCard(
+  props: PropsWithChildren<Props_18>,
+): React_2.JSX.Element;
 
 // 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)
 //
@@ -1283,7 +1313,7 @@ export type TabbedCardClassKey = 'root' | 'indicator';
 // 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;
+export function TabbedLayout(props: PropsWithChildren<{}>): React_2.JSX.Element;
 
 // @public (undocumented)
 export namespace TabbedLayout {
@@ -1296,7 +1326,9 @@ export namespace TabbedLayout {
 // 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;
+export function Table<T extends object = {}>(
+  props: TableProps<T>,
+): React_2.JSX.Element;
 
 // @public (undocumented)
 export namespace Table {
@@ -1356,6 +1388,8 @@ export interface TableProps<T extends object = {}>
   // (undocumented)
   initialState?: TableState;
   // (undocumented)
+  isLoading?: boolean;
+  // (undocumented)
   onStateChange?: (state: TableState) => any;
   // (undocumented)
   subtitle?: string;
@@ -1383,7 +1417,7 @@ export function TrendLine(
     Pick<SparklinesLineProps, 'color'> & {
       title?: string;
     },
-): JSX.Element | null;
+): React_2.JSX.Element | null;
 
 // @public
 export function useContent(): {
@@ -1401,7 +1435,7 @@ export function useQueryParamState<T>(
 ): [T | undefined, SetQueryParams<T>];
 
 // @public (undocumented)
-export function UserIcon(props: IconComponentProps): JSX.Element;
+export function UserIcon(props: IconComponentProps): React_2.JSX.Element;
 
 // @public
 export class UserIdentity implements IdentityApi {
@@ -1447,13 +1481,13 @@ export const useSidebarPinState: () => SidebarPinState;
 export function useSupportConfig(): SupportConfig;
 
 // @public (undocumented)
-export function WarningIcon(props: IconComponentProps): JSX.Element;
+export function WarningIcon(props: IconComponentProps): React_2.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 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;
+export function WarningPanel(props: WarningProps): React_2.JSX.Element;
 
 // 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)
 //
diff --git a/packages/core-components/catalog-info.yaml b/packages/core-components/catalog-info.yaml
new file mode 100644
index 0000000000..ba189b8c39
--- /dev/null
+++ b/packages/core-components/catalog-info.yaml
@@ -0,0 +1,10 @@
+apiVersion: backstage.io/v1alpha1
+kind: Component
+metadata:
+  name: backstage-core-components
+  title: '@backstage/core-components'
+  description: Core components used by Backstage plugins and apps
+spec:
+  lifecycle: experimental
+  type: backstage-web-library
+  owner: maintainers
diff --git a/packages/core-components/package.json b/packages/core-components/package.json
index c9b1584b85..e2e534da56 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.13.4-next.0",
+  "version": "0.13.5-next.2",
   "publishConfig": {
     "access": "public",
     "main": "dist/index.esm.js",
@@ -22,6 +22,7 @@
   "license": "Apache-2.0",
   "main": "src/index.ts",
   "types": "src/index.ts",
+  "sideEffects": false,
   "scripts": {
     "build": "backstage-cli package build",
     "lint": "backstage-cli package lint",
@@ -60,7 +61,7 @@
     "pluralize": "^8.0.0",
     "prop-types": "^15.7.2",
     "qs": "^6.9.4",
-    "rc-progress": "3.4.2",
+    "rc-progress": "3.5.1",
     "react-helmet": "6.1.0",
     "react-hook-form": "^7.12.2",
     "react-markdown": "^8.0.0",
@@ -95,7 +96,6 @@
     "@types/d3-zoom": "^3.0.1",
     "@types/dagre": "^0.7.44",
     "@types/google-protobuf": "^3.7.2",
-    "@types/node": "^16.11.26",
     "@types/react-helmet": "^6.1.0",
     "@types/react-syntax-highlighter": "^15.0.0",
     "@types/react-virtualized-auto-sizer": "^1.0.1",
diff --git a/packages/core-components/src/components/LogViewer/RealLogViewer.tsx b/packages/core-components/src/components/LogViewer/RealLogViewer.tsx
index adb9eeb760..cbeb249815 100644
--- a/packages/core-components/src/components/LogViewer/RealLogViewer.tsx
+++ b/packages/core-components/src/components/LogViewer/RealLogViewer.tsx
@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 import Box from '@material-ui/core/Box';
 import IconButton from '@material-ui/core/IconButton';
 import CopyIcon from '@material-ui/icons/FileCopy';
@@ -69,7 +70,7 @@ export function RealLogViewer(props: RealLogViewerProps) {
 
   return (
     <AutoSizer>
-      {({ height, width }) => (
+      {({ height, width }: { height?: number; width?: number }) => (
         <Box style={{ width, height }} className={classes.root}>
           <Box className={classes.header}>
             <LogViewerControls {...search} />
diff --git a/packages/core-components/src/components/StructuredMetadataTable/StructuredMetadataTable.test.tsx b/packages/core-components/src/components/StructuredMetadataTable/StructuredMetadataTable.test.tsx
index 7ebe15c931..db7c53897d 100644
--- a/packages/core-components/src/components/StructuredMetadataTable/StructuredMetadataTable.test.tsx
+++ b/packages/core-components/src/components/StructuredMetadataTable/StructuredMetadataTable.test.tsx
@@ -21,7 +21,7 @@ import { StructuredMetadataTable } from './StructuredMetadataTable';
 
 describe('<StructuredMetadataTable />', () => {
   it('renders without exploding', () => {
-    const metadata = { hello: 'world' };
+    const metadata = { hello: 'world', foo: null };
     const { getByText } = render(
       <StructuredMetadataTable metadata={metadata} />,
     );
diff --git a/packages/core-components/src/components/StructuredMetadataTable/StructuredMetadataTable.tsx b/packages/core-components/src/components/StructuredMetadataTable/StructuredMetadataTable.tsx
index 6114054bbe..2b18f6ad19 100644
--- a/packages/core-components/src/components/StructuredMetadataTable/StructuredMetadataTable.tsx
+++ b/packages/core-components/src/components/StructuredMetadataTable/StructuredMetadataTable.tsx
@@ -113,7 +113,7 @@ function toValue(
     return <Fragment>{value}</Fragment>;
   }
 
-  if (typeof value === 'object' && !Array.isArray(value)) {
+  if (value !== null && typeof value === 'object' && !Array.isArray(value)) {
     return renderMap(value, options, nested);
   }
 
diff --git a/packages/core-components/src/components/Table/Table.stories.tsx b/packages/core-components/src/components/Table/Table.stories.tsx
index 807d58057d..b38941012c 100644
--- a/packages/core-components/src/components/Table/Table.stories.tsx
+++ b/packages/core-components/src/components/Table/Table.stories.tsx
@@ -89,6 +89,43 @@ export const DefaultTable = () => {
   );
 };
 
+export const LoadingTable = () => {
+  const classes = useStyles();
+  const columns: TableColumn[] = [
+    {
+      title: 'Column 1',
+      field: 'col1',
+      highlight: true,
+    },
+    {
+      title: 'Column 2',
+      field: 'col2',
+    },
+    {
+      title: 'Numeric value',
+      field: 'number',
+      type: 'numeric',
+    },
+    {
+      title: 'A Date',
+      field: 'date',
+      type: 'date',
+    },
+  ];
+
+  return (
+    <div className={classes.container}>
+      <Table
+        options={{ paging: false }}
+        data={[]}
+        columns={columns}
+        isLoading
+        title="Backstage Table"
+      />
+    </div>
+  );
+};
+
 export const EmptyTable = () => {
   const classes = useStyles();
   const columns: TableColumn[] = [
diff --git a/packages/core-components/src/components/Table/Table.test.tsx b/packages/core-components/src/components/Table/Table.test.tsx
index ffdca26d98..43c8cfe41d 100644
--- a/packages/core-components/src/components/Table/Table.test.tsx
+++ b/packages/core-components/src/components/Table/Table.test.tsx
@@ -48,6 +48,11 @@ describe('<Table />', () => {
     expect(rendered.getByText('second value, second row')).toBeInTheDocument();
   });
 
+  it('renders loading without exploding', async () => {
+    const rendered = await renderInTestApp(<Table {...minProps} isLoading />);
+    expect(rendered.getByTestId('loading-indicator')).toBeInTheDocument();
+  });
+
   describe('with style rows', () => {
     describe('with CSS Properties object', () => {
       const styledColumn2 = {
diff --git a/packages/core-components/src/components/Table/Table.tsx b/packages/core-components/src/components/Table/Table.tsx
index 5cea3dd6b6..9f2b04c214 100644
--- a/packages/core-components/src/components/Table/Table.tsx
+++ b/packages/core-components/src/components/Table/Table.tsx
@@ -53,6 +53,7 @@ import React, {
 
 import { SelectProps } from '../Select/Select';
 import { Filter, Filters, SelectedFilters, Without } from './Filters';
+import CircularProgress from '@material-ui/core/CircularProgress';
 
 // Material-table is not using the standard icons available in in material-ui. https://github.com/mbrn/material-table/issues/51
 const tableIcons: Icons = {
@@ -236,6 +237,7 @@ export interface TableProps<T extends object = {}>
   filters?: TableFilter[];
   initialState?: TableState;
   emptyContent?: ReactNode;
+  isLoading?: boolean;
   onStateChange?: (state: TableState) => any;
 }
 
@@ -309,6 +311,7 @@ export function Table<T extends object = {}>(props: TableProps<T>) {
     emptyContent,
     onStateChange,
     components,
+    isLoading: isLoading,
     ...restProps
   } = props;
   const tableClasses = useTableStyles();
@@ -470,6 +473,28 @@ export function Table<T extends object = {}>(props: TableProps<T>) {
   const columnCount = columns.length;
   const Body = useCallback(
     bodyProps => {
+      if (isLoading) {
+        return (
+          <tbody data-testid="loading-indicator">
+            <tr>
+              <td colSpan={columnCount}>
+                <Box
+                  sx={{
+                    display: 'flex',
+                    justifyContent: 'center',
+                    alignItems: 'center',
+                    width: '100%',
+                    minHeight: '15rem',
+                  }}
+                >
+                  <CircularProgress size="5rem" />
+                </Box>
+              </td>
+            </tr>
+          </tbody>
+        );
+      }
+
       if (emptyContent && hasNoRows) {
         return (
           <tbody>
@@ -482,7 +507,7 @@ export function Table<T extends object = {}>(props: TableProps<T>) {
 
       return <MTableBody {...bodyProps} />;
     },
-    [hasNoRows, emptyContent, columnCount],
+    [hasNoRows, emptyContent, columnCount, isLoading],
   );
 
   return (
diff --git a/packages/core-plugin-api/CHANGELOG.md b/packages/core-plugin-api/CHANGELOG.md
index 62b7d0fbdb..33060653c1 100644
--- a/packages/core-plugin-api/CHANGELOG.md
+++ b/packages/core-plugin-api/CHANGELOG.md
@@ -1,5 +1,41 @@
 # @backstage/core-plugin-api
 
+## 1.6.0-next.2
+
+### Minor Changes
+
+- 6e30769cc627: Introduced experimental support for internationalization.
+
+### Patch Changes
+
+- 8cec7664e146: Removed `@types/node` dependency
+- Updated dependencies
+  - @backstage/config@1.1.0-next.1
+  - @backstage/types@1.1.0
+  - @backstage/version-bridge@1.0.4
+
+## 1.6.0-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config@1.1.0-next.0
+  - @backstage/types@1.1.0
+  - @backstage/version-bridge@1.0.4
+
+## 1.6.0-next.0
+
+### Minor Changes
+
+- 18619f793c94: Added the optional `expiresAt` field that may now be part of a `BackstageIdentityResponse`.
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config@1.0.8
+  - @backstage/types@1.1.0
+  - @backstage/version-bridge@1.0.4
+
 ## 1.5.3
 
 ### Patch Changes
diff --git a/packages/core-plugin-api/alpha-api-report.md b/packages/core-plugin-api/alpha-api-report.md
index 379e186df8..57cf4a2cb4 100644
--- a/packages/core-plugin-api/alpha-api-report.md
+++ b/packages/core-plugin-api/alpha-api-report.md
@@ -3,9 +3,29 @@
 > Do not edit this file. It is a report generated by [API Extractor](https://api-extractor.com/).
 
 ```ts
+import { ApiRef } from '@backstage/core-plugin-api';
 import { BackstagePlugin } from '@backstage/core-plugin-api';
+import { i18n } from 'i18next';
 import { ReactNode } from 'react';
 
+// @alpha (undocumented)
+export type AppTranslationApi = {
+  getI18n(): i18n;
+  addResourcesByRef<Messages extends Record<string, string>>(
+    translationRef: TranslationRef<Messages>,
+  ): void;
+};
+
+// @alpha (undocumented)
+export const appTranslationApiRef: ApiRef<AppTranslationApi>;
+
+// @alpha (undocumented)
+export const createTranslationRef: <
+  Messages extends Record<keyof Messages, string> = {},
+>(
+  config: TranslationRefConfig<Messages>,
+) => TranslationRef<Messages>;
+
 // @alpha
 export interface PluginOptionsProviderProps {
   // (undocumented)
@@ -17,10 +37,92 @@ export interface PluginOptionsProviderProps {
 // @alpha
 export const PluginProvider: (props: PluginOptionsProviderProps) => JSX.Element;
 
+// @alpha (undocumented)
+export type TranslationOptions<
+  Messages extends Record<keyof Messages, string> = Record<string, string>,
+> = Messages;
+
+// @alpha (undocumented)
+export interface TranslationRef<
+  Messages extends Record<keyof Messages, string> = Record<string, string>,
+> {
+  // (undocumented)
+  getDefaultMessages(): Messages;
+  // (undocumented)
+  getId(): string;
+  // (undocumented)
+  getLazyResources():
+    | Record<
+        string,
+        () => Promise<{
+          messages: Messages;
+        }>
+      >
+    | undefined;
+  // (undocumented)
+  getResources(): Record<string, Messages> | undefined;
+}
+
+// @alpha (undocumented)
+export interface TranslationRefConfig<
+  Messages extends Record<keyof Messages, string>,
+> {
+  // (undocumented)
+  id: string;
+  // (undocumented)
+  lazyResources?: Record<
+    string,
+    () => Promise<{
+      messages: Messages;
+    }>
+  >;
+  // (undocumented)
+  messages: Messages;
+  // (undocumented)
+  resources?: Record<string, Messages>;
+}
+
+// @alpha (undocumented)
+export class TranslationRefImpl<Messages extends Record<keyof Messages, string>>
+  implements TranslationRef<Messages>
+{
+  // (undocumented)
+  static create<Messages extends Record<keyof Messages, string>>(
+    config: TranslationRefConfig<Messages>,
+  ): TranslationRefImpl<Messages>;
+  // (undocumented)
+  getDefaultMessages(): Messages;
+  // (undocumented)
+  getId(): string;
+  // (undocumented)
+  getLazyResources():
+    | Record<
+        string,
+        () => Promise<{
+          messages: Messages;
+        }>
+      >
+    | undefined;
+  // (undocumented)
+  getResources(): Record<string, Messages> | undefined;
+  // (undocumented)
+  toString(): string;
+}
+
 // @alpha
 export function usePluginOptions<
   TPluginOptions extends {} = {},
 >(): TPluginOptions;
 
+// @alpha (undocumented)
+export const useTranslationRef: <
+  Messages extends Record<keyof Messages, string>,
+>(
+  translationRef: TranslationRef<Messages>,
+) => <Tkey extends keyof Messages>(
+  key: Tkey,
+  options?: TranslationOptions,
+) => Messages[Tkey];
+
 // (No @packageDocumentation comment for this package)
 ```
diff --git a/packages/core-plugin-api/api-report.md b/packages/core-plugin-api/api-report.md
index 5577d94359..930f1f979d 100644
--- a/packages/core-plugin-api/api-report.md
+++ b/packages/core-plugin-api/api-report.md
@@ -45,7 +45,7 @@ export const analyticsApiRef: ApiRef<AnalyticsApi>;
 export const AnalyticsContext: (options: {
   attributes: Partial<AnalyticsContextValue>;
   children: ReactNode;
-}) => JSX.Element;
+}) => React_2.JSX.Element;
 
 // @public
 export type AnalyticsContextValue = CommonAnalyticsContext & {
@@ -214,6 +214,7 @@ export type BackstageIdentityApi = {
 // @public
 export type BackstageIdentityResponse = {
   token: string;
+  expiresAt?: Date;
   identity: BackstageUserIdentity;
 };
 
@@ -782,7 +783,9 @@ export function withApis<T extends {}>(
 ): <TProps extends T>(
   WrappedComponent: React_2.ComponentType<TProps>,
 ) => {
-  (props: React_2.PropsWithChildren<Omit<TProps, keyof T>>): JSX.Element;
+  (
+    props: React_2.PropsWithChildren<Omit<TProps, keyof T>>,
+  ): React_2.JSX.Element;
   displayName: string;
 };
 ```
diff --git a/packages/core-plugin-api/catalog-info.yaml b/packages/core-plugin-api/catalog-info.yaml
new file mode 100644
index 0000000000..2f0fa2d4eb
--- /dev/null
+++ b/packages/core-plugin-api/catalog-info.yaml
@@ -0,0 +1,10 @@
+apiVersion: backstage.io/v1alpha1
+kind: Component
+metadata:
+  name: backstage-core-plugin-api
+  title: '@backstage/core-plugin-api'
+  description: Core API used by Backstage plugins
+spec:
+  lifecycle: production
+  type: backstage-web-library
+  owner: maintainers
diff --git a/packages/core-plugin-api/package.json b/packages/core-plugin-api/package.json
index 138ad24249..38af96585c 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.5.3",
+  "version": "1.6.0-next.2",
   "publishConfig": {
     "access": "public"
   },
@@ -35,6 +35,7 @@
   "license": "Apache-2.0",
   "main": "src/index.ts",
   "types": "src/index.ts",
+  "sideEffects": false,
   "scripts": {
     "build": "backstage-cli package build",
     "lint": "backstage-cli package lint",
@@ -50,7 +51,9 @@
     "@backstage/version-bridge": "workspace:^",
     "@types/react": "^16.13.1 || ^17.0.0",
     "history": "^5.0.0",
+    "i18next": "^22.4.15",
     "prop-types": "^15.7.2",
+    "react-i18next": "^12.3.1",
     "zen-observable": "^0.10.0"
   },
   "peerDependencies": {
@@ -67,7 +70,6 @@
     "@testing-library/react": "^12.1.3",
     "@testing-library/react-hooks": "^8.0.0",
     "@testing-library/user-event": "^14.0.0",
-    "@types/node": "^16.11.26",
     "@types/prop-types": "^15.7.3",
     "@types/zen-observable": "^0.8.0",
     "msw": "^1.0.0"
diff --git a/packages/core-plugin-api/src/alpha.ts b/packages/core-plugin-api/src/alpha.ts
index 09983a48e9..505fd9b818 100644
--- a/packages/core-plugin-api/src/alpha.ts
+++ b/packages/core-plugin-api/src/alpha.ts
@@ -15,3 +15,5 @@
  */
 
 export * from './plugin-options';
+export * from './translation';
+export * from './apis/alpha';
diff --git a/packages/core-plugin-api/src/apis/alpha.ts b/packages/core-plugin-api/src/apis/alpha.ts
new file mode 100644
index 0000000000..b22d3df574
--- /dev/null
+++ b/packages/core-plugin-api/src/apis/alpha.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 * from './definitions/alpha';
diff --git a/packages/core-plugin-api/src/apis/definitions/AppTranslationApi.ts b/packages/core-plugin-api/src/apis/definitions/AppTranslationApi.ts
new file mode 100644
index 0000000000..463aee02bf
--- /dev/null
+++ b/packages/core-plugin-api/src/apis/definitions/AppTranslationApi.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 { type i18n } from 'i18next';
+import { TranslationRef } from '../../translation';
+import { ApiRef, createApiRef } from '@backstage/core-plugin-api';
+
+/** @alpha */
+export type AppTranslationApi = {
+  getI18n(): i18n;
+
+  addResourcesByRef<Messages extends Record<string, string>>(
+    translationRef: TranslationRef<Messages>,
+  ): void;
+};
+
+/**
+ * @alpha
+ */
+export const appTranslationApiRef: ApiRef<AppTranslationApi> = createApiRef({
+  id: 'core.apptranslation',
+});
diff --git a/packages/core-plugin-api/src/apis/definitions/alpha.ts b/packages/core-plugin-api/src/apis/definitions/alpha.ts
new file mode 100644
index 0000000000..691af96e32
--- /dev/null
+++ b/packages/core-plugin-api/src/apis/definitions/alpha.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 * from './AppTranslationApi';
diff --git a/packages/core-plugin-api/src/apis/definitions/auth.ts b/packages/core-plugin-api/src/apis/definitions/auth.ts
index 62d0d5c810..d9aec2ca5a 100644
--- a/packages/core-plugin-api/src/apis/definitions/auth.ts
+++ b/packages/core-plugin-api/src/apis/definitions/auth.ts
@@ -226,6 +226,11 @@ export type BackstageIdentityResponse = {
    */
   token: string;
 
+  /**
+   * The time at which the token expires. If not set, it can be assumed that the token does not expire.
+   */
+  expiresAt?: Date;
+
   /**
    * Identity information derived from the token.
    */
diff --git a/packages/core-plugin-api/src/translation/TranslationRef.test.ts b/packages/core-plugin-api/src/translation/TranslationRef.test.ts
new file mode 100644
index 0000000000..155624a122
--- /dev/null
+++ b/packages/core-plugin-api/src/translation/TranslationRef.test.ts
@@ -0,0 +1,60 @@
+/*
+ * 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 { TranslationRefImpl, createTranslationRef } from './TranslationRef';
+
+describe('TranslationRefImpl', () => {
+  it('should create a TranslationRef instance', () => {
+    const config = {
+      id: 'testId',
+      messages: { key: 'value' },
+    };
+
+    const translationRef = TranslationRefImpl.create(config);
+
+    expect(translationRef.getId()).toBe('testId');
+    expect(translationRef.getDefaultMessages()).toEqual({ key: 'value' });
+  });
+
+  it('should create a TranslationRef instance using the factory function', () => {
+    const config = {
+      id: 'testId',
+      messages: { key: 'value' },
+    };
+
+    const translationRef = createTranslationRef(config);
+
+    expect(translationRef.getId()).toBe('testId');
+    expect(translationRef.getDefaultMessages()).toEqual({ key: 'value' });
+  });
+
+  it('should get lazy resources', async () => {
+    const config = {
+      id: 'testId',
+      messages: { key: 'value' },
+      lazyResources: {
+        en: () => Promise.resolve({ messages: { key: 'value' } }),
+      },
+    };
+
+    const translationRef = TranslationRefImpl.create(config);
+
+    const lazyResources = translationRef.getLazyResources();
+
+    const messages = await lazyResources?.en();
+
+    expect(messages).toEqual({ messages: { key: 'value' } });
+  });
+});
diff --git a/packages/core-plugin-api/src/translation/TranslationRef.ts b/packages/core-plugin-api/src/translation/TranslationRef.ts
new file mode 100644
index 0000000000..d01f7ca261
--- /dev/null
+++ b/packages/core-plugin-api/src/translation/TranslationRef.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 { TranslationRef, TranslationRefConfig } from './types';
+
+/** @alpha */
+export class TranslationRefImpl<Messages extends Record<keyof Messages, string>>
+  implements TranslationRef<Messages>
+{
+  static create<Messages extends Record<keyof Messages, string>>(
+    config: TranslationRefConfig<Messages>,
+  ) {
+    return new TranslationRefImpl(config);
+  }
+
+  getId() {
+    return this.config.id;
+  }
+
+  getDefaultMessages(): Messages {
+    return this.config.messages;
+  }
+
+  getLazyResources():
+    | Record<string, () => Promise<{ messages: Messages }>>
+    | undefined {
+    return this.config.lazyResources;
+  }
+
+  getResources(): Record<string, Messages> | undefined {
+    return this.config.resources;
+  }
+
+  toString() {
+    return `TranslationRef(${this.getId()})`;
+  }
+
+  private constructor(
+    private readonly config: TranslationRefConfig<Messages>,
+  ) {}
+}
+
+/** @alpha */
+export const createTranslationRef = <
+  Messages extends Record<keyof Messages, string> = {},
+>(
+  config: TranslationRefConfig<Messages>,
+): TranslationRef<Messages> => TranslationRefImpl.create(config);
diff --git a/packages/core-plugin-api/src/translation/index.ts b/packages/core-plugin-api/src/translation/index.ts
new file mode 100644
index 0000000000..9eaef57206
--- /dev/null
+++ b/packages/core-plugin-api/src/translation/index.ts
@@ -0,0 +1,19 @@
+/*
+ * Copyright 2023 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+export * from './TranslationRef';
+export * from './types';
+export * from './useTranslationRef';
diff --git a/packages/core-plugin-api/src/translation/types.ts b/packages/core-plugin-api/src/translation/types.ts
new file mode 100644
index 0000000000..4811c82eb7
--- /dev/null
+++ b/packages/core-plugin-api/src/translation/types.ts
@@ -0,0 +1,45 @@
+/*
+ * 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.
+ */
+
+/** @alpha */
+export interface TranslationRefConfig<
+  Messages extends Record<keyof Messages, string>,
+> {
+  id: string;
+  messages: Messages;
+  lazyResources?: Record<string, () => Promise<{ messages: Messages }>>;
+  resources?: Record<string, Messages>;
+}
+
+/** @alpha */
+export interface TranslationRef<
+  Messages extends Record<keyof Messages, string> = Record<string, string>,
+> {
+  getId(): string;
+
+  getDefaultMessages(): Messages;
+
+  getResources(): Record<string, Messages> | undefined;
+
+  getLazyResources():
+    | Record<string, () => Promise<{ messages: Messages }>>
+    | undefined;
+}
+
+/** @alpha */
+export type TranslationOptions<
+  Messages extends Record<keyof Messages, string> = Record<string, string>,
+> = Messages;
diff --git a/packages/core-plugin-api/src/translation/useTranslationRef.test.ts b/packages/core-plugin-api/src/translation/useTranslationRef.test.ts
new file mode 100644
index 0000000000..372d72eb23
--- /dev/null
+++ b/packages/core-plugin-api/src/translation/useTranslationRef.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 { renderHook } from '@testing-library/react-hooks';
+import { useTranslation } from 'react-i18next';
+import { useApi } from '../apis';
+import { useTranslationRef } from './useTranslationRef';
+import { createTranslationRef } from './TranslationRef';
+
+jest.mock('../apis', () => ({
+  ...jest.requireActual('../apis'),
+  useApi: jest.fn(),
+}));
+
+jest.mock('react-i18next', () => ({
+  useTranslation: jest.fn(),
+}));
+
+describe('useTranslationRef', () => {
+  beforeEach(() => {
+    jest.clearAllMocks();
+  });
+
+  it('should return correct t', () => {
+    const translationRef = createTranslationRef({
+      id: 'ref-id',
+      messages: {
+        key1: 'default1',
+        key2: 'default2',
+      },
+    });
+
+    const tMock = jest.fn();
+    tMock.mockReturnValue('translatedValue');
+
+    const i18nMock = {
+      language: 'en',
+      t: tMock,
+    };
+
+    (useApi as jest.Mock).mockReturnValue({
+      addResourcesByRef: jest.fn(),
+    });
+
+    (useTranslation as jest.Mock).mockReturnValue(i18nMock);
+
+    const { result } = renderHook(() => useTranslationRef(translationRef));
+
+    const t = result.current;
+
+    t('key1', { condition: 'v1' });
+    expect(tMock).toHaveBeenCalledWith('key1', 'default1', { condition: 'v1' });
+    t('key2');
+    expect(tMock).toHaveBeenCalledWith('key2', 'default2', undefined);
+  });
+});
diff --git a/packages/core-plugin-api/src/translation/useTranslationRef.ts b/packages/core-plugin-api/src/translation/useTranslationRef.ts
new file mode 100644
index 0000000000..083bcd1f0e
--- /dev/null
+++ b/packages/core-plugin-api/src/translation/useTranslationRef.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 { useTranslation } from 'react-i18next';
+
+import { TranslationOptions, TranslationRef } from './types';
+import { useApi } from '../apis';
+import { appTranslationApiRef } from '../apis/alpha';
+
+/** @alpha */
+export const useTranslationRef = <
+  Messages extends Record<keyof Messages, string>,
+>(
+  translationRef: TranslationRef<Messages>,
+) => {
+  const appTranslationApi = useApi(appTranslationApiRef);
+
+  appTranslationApi.addResourcesByRef(translationRef);
+
+  const { t } = useTranslation(translationRef.getId());
+
+  const defaulteMessage = translationRef.getDefaultMessages();
+
+  return <Tkey extends keyof Messages>(
+    key: Tkey,
+    options?: TranslationOptions,
+  ): Messages[Tkey] => t(key as string, defaulteMessage[key], options);
+};
diff --git a/packages/create-app/CHANGELOG.md b/packages/create-app/CHANGELOG.md
index eb2f048d62..3fd4a7cc1c 100644
--- a/packages/create-app/CHANGELOG.md
+++ b/packages/create-app/CHANGELOG.md
@@ -1,5 +1,49 @@
 # @backstage/create-app
 
+## 0.5.5-next.2
+
+### Patch Changes
+
+- 8db70ecbb325: Updated Dockerfile to include `apt-get update` when installing the SQLite dependency
+- 8cec7664e146: Removed `@types/node` dependency
+- Updated dependencies
+  - @backstage/cli-common@0.1.12
+
+## 0.5.5-next.1
+
+### Patch Changes
+
+- Bumped create-app version.
+- Updated dependencies
+  - @backstage/cli-common@0.1.12
+
+## 0.5.5-next.0
+
+### Patch Changes
+
+- Bumped create-app version.
+- Updated dependencies
+  - @backstage/cli-common@0.1.12
+
+## 0.5.4
+
+### Patch Changes
+
+- b441642fbe0d: Bumped create-app version.
+- 572abc7edf55: Bumped create-app version.
+- 74f77f151a96: Bumped create-app version.
+- 5cc0ac5ef3d1: Bump to a newer version of the `concurrently` library
+- 46c9a798e41d: Updated the `app-config.yaml` template to use `proxy.endpoints`.
+- 971bdd6a4732: Bumped internal `nodemon` dependency.
+- Updated dependencies
+  - @backstage/cli-common@0.1.12
+
+## 0.5.4-next.2
+
+### Patch Changes
+
+- Bumped create-app version.
+
 ## 0.5.4-next.1
 
 ### Patch Changes
diff --git a/packages/create-app/catalog-info.yaml b/packages/create-app/catalog-info.yaml
new file mode 100644
index 0000000000..7da321f091
--- /dev/null
+++ b/packages/create-app/catalog-info.yaml
@@ -0,0 +1,10 @@
+apiVersion: backstage.io/v1alpha1
+kind: Component
+metadata:
+  name: backstage-create-app
+  title: '@backstage/create-app'
+  description: A CLI that helps you create your own Backstage app
+spec:
+  lifecycle: experimental
+  type: backstage-cli
+  owner: maintainers
diff --git a/packages/create-app/package.json b/packages/create-app/package.json
index de1a9791ae..bcbcaa321d 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.5.4-next.1",
+  "version": "0.5.5-next.2",
   "publishConfig": {
     "access": "public"
   },
@@ -49,7 +49,7 @@
     "@types/node": "^16.11.26",
     "@types/recursive-readdir": "^2.2.0",
     "mock-fs": "^5.1.1",
-    "nodemon": "^2.0.2",
+    "nodemon": "^3.0.1",
     "ts-node": "^10.0.0"
   },
   "nodemonConfig": {
diff --git a/packages/create-app/src/lib/tasks.ts b/packages/create-app/src/lib/tasks.ts
index f158a2d1f1..1943b0c3cc 100644
--- a/packages/create-app/src/lib/tasks.ts
+++ b/packages/create-app/src/lib/tasks.ts
@@ -31,6 +31,7 @@ import { promisify } from 'util';
 import os from 'os';
 
 const TASK_NAME_MAX_LENGTH = 14;
+const TEN_MINUTES_MS = 1000 * 60 * 10;
 const exec = promisify(execCb);
 
 export type GitConfig = {
@@ -222,7 +223,13 @@ export async function buildAppTask(appDir: string) {
     });
   };
 
-  await runCmd('yarn install');
+  const installTimeout = setTimeout(() => {
+    Task.error(
+      "\n⏱️  It's taking a long time to install dependencies, you may want to exit (Ctrl-C) and run 'yarn install' and 'yarn tsc' manually",
+    );
+  }, TEN_MINUTES_MS);
+
+  await runCmd('yarn install').finally(() => clearTimeout(installTimeout));
   await runCmd('yarn tsc');
 }
 
diff --git a/packages/create-app/templates/default-app/app-config.yaml.hbs b/packages/create-app/templates/default-app/app-config.yaml.hbs
index 194549f079..08d2abff59 100644
--- a/packages/create-app/templates/default-app/app-config.yaml.hbs
+++ b/packages/create-app/templates/default-app/app-config.yaml.hbs
@@ -46,9 +46,10 @@ integrations:
 proxy:
   ### Example for how to add a proxy endpoint for the frontend.
   ### A typical reason to do this is to handle HTTPS and CORS for internal services.
-  # '/test':
-  #   target: 'https://example.com'
-  #   changeOrigin: true
+  # endpoints:
+  #   '/test':
+  #     target: 'https://example.com'
+  #     changeOrigin: true
 
 # Reference documentation http://backstage.io/docs/features/techdocs/configuration
 # Note: After experimenting with basic setup, use CI/CD to generate docs
diff --git a/packages/create-app/templates/default-app/package.json.hbs b/packages/create-app/templates/default-app/package.json.hbs
index 0682114a35..a4fcb556ea 100644
--- a/packages/create-app/templates/default-app/package.json.hbs
+++ b/packages/create-app/templates/default-app/package.json.hbs
@@ -17,6 +17,7 @@
     "clean": "backstage-cli repo clean",
     "test": "backstage-cli repo test",
     "test:all": "backstage-cli repo test --coverage",
+    "fix": "backstage-cli repo fix",
     "lint": "backstage-cli repo lint --since origin/{{defaultBranch}}",
     "lint:all": "backstage-cli repo lint",
     "prettier:check": "prettier --check .",
@@ -31,7 +32,7 @@
   "devDependencies": {
     "@backstage/cli": "^{{version '@backstage/cli'}}",
     "@spotify/prettier-config": "^12.0.0",
-    "concurrently": "^6.0.0",
+    "concurrently": "^8.0.0",
     "lerna": "^4.0.0",
     "node-gyp": "^9.0.0",
     "prettier": "^2.3.2",
diff --git a/packages/create-app/templates/default-app/packages/app/package.json.hbs b/packages/create-app/templates/default-app/packages/app/package.json.hbs
index 02535e217c..6793a91dd0 100644
--- a/packages/create-app/templates/default-app/packages/app/package.json.hbs
+++ b/packages/create-app/templates/default-app/packages/app/package.json.hbs
@@ -58,7 +58,6 @@
     "@testing-library/react": "^12.1.3",
     "@testing-library/user-event": "^14.0.0",
     "@testing-library/dom": "^8.0.0",
-    "@types/node": "^16.11.26",
     "@types/react-dom": "*",
     "cross-env": "^7.0.0",
     "cypress": "^9.7.0",
diff --git a/packages/create-app/templates/default-app/packages/backend/Dockerfile b/packages/create-app/templates/default-app/packages/backend/Dockerfile
index d065e4a248..a60fee7a9c 100644
--- a/packages/create-app/templates/default-app/packages/backend/Dockerfile
+++ b/packages/create-app/templates/default-app/packages/backend/Dockerfile
@@ -22,6 +22,7 @@ RUN --mount=type=cache,target=/var/cache/apt,sharing=locked \
 # in which case you should also move better-sqlite3 to "devDependencies" in package.json.
 RUN --mount=type=cache,target=/var/cache/apt,sharing=locked \
     --mount=type=cache,target=/var/lib/apt,sharing=locked \
+    apt-get update && \
     apt-get install -y --no-install-recommends libsqlite3-dev
 
 # From here on we use the least-privileged `node` user to run the backend.
diff --git a/packages/dev-utils/CHANGELOG.md b/packages/dev-utils/CHANGELOG.md
index 132f330d8f..f9f376bc36 100644
--- a/packages/dev-utils/CHANGELOG.md
+++ b/packages/dev-utils/CHANGELOG.md
@@ -1,5 +1,75 @@
 # @backstage/dev-utils
 
+## 1.0.21-next.2
+
+### Patch Changes
+
+- 8cec7664e146: Removed `@types/node` dependency
+- Updated dependencies
+  - @backstage/integration-react@1.1.19-next.2
+  - @backstage/core-components@0.13.5-next.2
+  - @backstage/core-plugin-api@1.6.0-next.2
+  - @backstage/app-defaults@1.4.3-next.2
+  - @backstage/core-app-api@1.10.0-next.2
+  - @backstage/test-utils@1.4.3-next.2
+  - @backstage/plugin-catalog-react@1.8.4-next.2
+  - @backstage/catalog-model@1.4.2-next.1
+  - @backstage/theme@0.4.1
+
+## 1.0.21-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.8.4-next.1
+  - @backstage/core-components@0.13.5-next.1
+  - @backstage/app-defaults@1.4.3-next.1
+  - @backstage/integration-react@1.1.19-next.1
+  - @backstage/catalog-model@1.4.2-next.0
+  - @backstage/core-app-api@1.10.0-next.1
+  - @backstage/core-plugin-api@1.6.0-next.1
+  - @backstage/test-utils@1.4.3-next.1
+  - @backstage/theme@0.4.1
+
+## 1.0.20-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/integration-react@1.1.18-next.0
+  - @backstage/core-app-api@1.10.0-next.0
+  - @backstage/core-plugin-api@1.6.0-next.0
+  - @backstage/core-components@0.13.5-next.0
+  - @backstage/app-defaults@1.4.3-next.0
+  - @backstage/catalog-model@1.4.1
+  - @backstage/test-utils@1.4.3-next.0
+  - @backstage/theme@0.4.1
+  - @backstage/plugin-catalog-react@1.8.3-next.0
+
+## 1.0.18
+
+### Patch Changes
+
+- 254ad469f053: Removed deprecated calls to `app.getProvider()` and `app.getRouter()` in `DevAppBuilder`
+- Updated dependencies
+  - @backstage/core-app-api@1.9.1
+  - @backstage/integration-react@1.1.16
+  - @backstage/core-components@0.13.4
+  - @backstage/plugin-catalog-react@1.8.1
+  - @backstage/app-defaults@1.4.2
+  - @backstage/core-plugin-api@1.5.3
+  - @backstage/test-utils@1.4.2
+  - @backstage/catalog-model@1.4.1
+  - @backstage/theme@0.4.1
+
+## 1.0.18-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.8.1-next.1
+  - @backstage/integration-react@1.1.16-next.1
+
 ## 1.0.18-next.1
 
 ### Patch Changes
diff --git a/packages/dev-utils/catalog-info.yaml b/packages/dev-utils/catalog-info.yaml
new file mode 100644
index 0000000000..c67eecec83
--- /dev/null
+++ b/packages/dev-utils/catalog-info.yaml
@@ -0,0 +1,10 @@
+apiVersion: backstage.io/v1alpha1
+kind: Component
+metadata:
+  name: backstage-dev-utils
+  title: '@backstage/dev-utils'
+  description: Utilities for developing Backstage plugins.
+spec:
+  lifecycle: production
+  type: backstage-web-library
+  owner: maintainers
diff --git a/packages/dev-utils/package.json b/packages/dev-utils/package.json
index 730d8ffe4e..ef059cba25 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.18-next.1",
+  "version": "1.0.21-next.2",
   "publishConfig": {
     "access": "public",
     "main": "dist/index.esm.js",
@@ -22,6 +22,7 @@
   "license": "Apache-2.0",
   "main": "src/index.ts",
   "types": "src/index.ts",
+  "sideEffects": false,
   "scripts": {
     "build": "backstage-cli package build",
     "lint": "backstage-cli package lint",
@@ -57,8 +58,7 @@
     "react-router-dom": "6.0.0-beta.0 || ^6.3.0"
   },
   "devDependencies": {
-    "@backstage/cli": "workspace:^",
-    "@types/node": "^16.0.0"
+    "@backstage/cli": "workspace:^"
   },
   "files": [
     "dist"
diff --git a/packages/dev-utils/src/devApp/render.tsx b/packages/dev-utils/src/devApp/render.tsx
index 36e87855ed..5f2b21b8d2 100644
--- a/packages/dev-utils/src/devApp/render.tsx
+++ b/packages/dev-utils/src/devApp/render.tsx
@@ -15,7 +15,7 @@
  */
 
 import { createApp } from '@backstage/app-defaults';
-import { FlatRoutes } from '@backstage/core-app-api';
+import { AppRouter, FlatRoutes } from '@backstage/core-app-api';
 import {
   AlertDisplay,
   OAuthRequestDialog,
@@ -195,35 +195,30 @@ export class DevAppBuilder {
       },
     });
 
-    const AppProvider = app.getProvider();
-    const AppRouter = app.getRouter();
+    const DevApp = (
+      <>
+        <AlertDisplay />
+        <OAuthRequestDialog />
+        {this.rootChildren}
+        <AppRouter>
+          <SidebarPage>
+            <Sidebar>
+              <SidebarSpacer />
+              {this.sidebarItems}
+              <SidebarSpace />
+              <SidebarDivider />
+              <SidebarThemeSwitcher />
+            </Sidebar>
+            <FlatRoutes>
+              {this.routes}
+              <Route path="/_external_route" element={<FakePage />} />
+            </FlatRoutes>
+          </SidebarPage>
+        </AppRouter>
+      </>
+    );
 
-    const DevApp = () => {
-      return (
-        <AppProvider>
-          <AlertDisplay />
-          <OAuthRequestDialog />
-          {this.rootChildren}
-          <AppRouter>
-            <SidebarPage>
-              <Sidebar>
-                <SidebarSpacer />
-                {this.sidebarItems}
-                <SidebarSpace />
-                <SidebarDivider />
-                <SidebarThemeSwitcher />
-              </Sidebar>
-              <FlatRoutes>
-                {this.routes}
-                <Route path="/_external_route" element={<FakePage />} />
-              </FlatRoutes>
-            </SidebarPage>
-          </AppRouter>
-        </AppProvider>
-      );
-    };
-
-    return DevApp;
+    return app.createRoot(DevApp);
   }
 
   /**
diff --git a/packages/e2e-test/CHANGELOG.md b/packages/e2e-test/CHANGELOG.md
index a334051aae..2c8e1300ac 100644
--- a/packages/e2e-test/CHANGELOG.md
+++ b/packages/e2e-test/CHANGELOG.md
@@ -1,5 +1,48 @@
 # e2e-test
 
+## 0.2.7-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/create-app@0.5.5-next.2
+  - @backstage/cli-common@0.1.12
+  - @backstage/errors@1.2.1
+
+## 0.2.7-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/create-app@0.5.5-next.1
+  - @backstage/cli-common@0.1.12
+  - @backstage/errors@1.2.1
+
+## 0.2.7-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/create-app@0.5.5-next.0
+  - @backstage/cli-common@0.1.12
+  - @backstage/errors@1.2.1
+
+## 0.2.6
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/create-app@0.5.4
+  - @backstage/cli-common@0.1.12
+  - @backstage/errors@1.2.1
+
+## 0.2.6-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/create-app@0.5.4-next.2
+
 ## 0.2.6-next.1
 
 ### Patch Changes
diff --git a/packages/e2e-test/catalog-info.yaml b/packages/e2e-test/catalog-info.yaml
new file mode 100644
index 0000000000..55bce03e8b
--- /dev/null
+++ b/packages/e2e-test/catalog-info.yaml
@@ -0,0 +1,10 @@
+apiVersion: backstage.io/v1alpha1
+kind: Component
+metadata:
+  name: e2e-test
+  title: e2e-test
+  description: E2E test for verifying Backstage packages
+spec:
+  lifecycle: experimental
+  type: backstage-cli
+  owner: maintainers
diff --git a/packages/e2e-test/package.json b/packages/e2e-test/package.json
index 3708f1bae4..4cd3988745 100644
--- a/packages/e2e-test/package.json
+++ b/packages/e2e-test/package.json
@@ -1,7 +1,7 @@
 {
   "name": "e2e-test",
   "description": "E2E test for verifying Backstage packages",
-  "version": "0.2.6-next.1",
+  "version": "0.2.7-next.2",
   "private": true,
   "backstage": {
     "role": "cli"
@@ -35,7 +35,8 @@
     "cross-fetch": "^3.1.5",
     "fs-extra": "10.1.0",
     "handlebars": "^4.7.3",
-    "pgtools": "^0.3.0",
+    "mysql2": "^2.2.5",
+    "pgtools": "^1.0.0",
     "puppeteer": "^17.0.0",
     "tree-kill": "^1.2.2"
   },
@@ -44,7 +45,7 @@
     "@types/fs-extra": "^9.0.1",
     "@types/node": "^16.11.26",
     "@types/puppeteer": "^5.4.4",
-    "nodemon": "^2.0.2",
+    "nodemon": "^3.0.1",
     "ts-node": "^10.0.0"
   },
   "nodemonConfig": {
diff --git a/packages/e2e-test/src/commands/run.ts b/packages/e2e-test/src/commands/run.ts
index b3fb8d9a3c..20b2753f6b 100644
--- a/packages/e2e-test/src/commands/run.ts
+++ b/packages/e2e-test/src/commands/run.ts
@@ -31,7 +31,10 @@ import {
   waitForExit,
   print,
 } from '../lib/helpers';
+
+import mysql from 'mysql2/promise';
 import pgtools from 'pgtools';
+
 import { findPaths } from '@backstage/cli-common';
 
 // eslint-disable-next-line no-restricted-syntax
@@ -66,9 +69,12 @@ export async function run() {
   print('Starting the app');
   await testAppServe(pluginId, appDir);
 
-  if (Boolean(process.env.POSTGRES_USER)) {
-    print('Testing the PostgreSQL backend startup');
-    await preCleanPostgres();
+  if (
+    Boolean(process.env.POSTGRES_USER) ||
+    Boolean(process.env.MYSQL_CONNECTION)
+  ) {
+    print('Testing the database backend startup');
+    await preCleanDatabase();
     const appConfig = path.resolve(appDir, 'app-config.yaml');
     const productionConfig = path.resolve(appDir, 'app-config.production.yaml');
     await testBackendStart(
@@ -79,7 +85,7 @@ export async function run() {
       productionConfig,
     );
   }
-  print('Testing the SQLite backend startup');
+  print('Testing the Database backend startup');
   await testBackendStart(appDir);
 
   if (process.env.CI) {
@@ -427,24 +433,39 @@ async function testAppServe(pluginId: string, appDir: string) {
 }
 
 /** Drops PG databases */
-async function dropDB(database: string) {
-  const config = {
-    host: process.env.POSTGRES_HOST,
-    port: process.env.POSTGRES_PORT,
-    user: process.env.POSTGRES_USER,
-    password: process.env.POSTGRES_PASSWORD,
-  };
-
+async function dropDB(database: string, client: string) {
   try {
-    await pgtools.dropdb(config, database);
+    if (client === 'postgres') {
+      const config = {
+        host: process.env.POSTGRES_HOST,
+        port: process.env.POSTGRES_PORT,
+        user: process.env.POSTGRES_USER,
+        password: process.env.POSTGRES_PASSWORD,
+      };
+      await pgtools.dropdb(config, database);
+    } else if (client === 'mysql') {
+      const connectionString = process.env.MYSQL_CONNECTION ?? '';
+      const connection = await mysql.createConnection(connectionString);
+      await connection.execute('DROP DATABASE ?', [database]);
+    }
   } catch (_) {
-    /* do nothing*/
+    /* do nothing */
   }
 }
 
 /** Clean remnants from prior e2e runs */
-async function preCleanPostgres() {
+async function preCleanDatabase() {
   print('Dropping old DBs');
+  if (Boolean(process.env.POSTGRES_HOST)) {
+    await dropClientDatabases('postgres');
+  }
+  if (Boolean(process.env.MYSQL_CONNECTION)) {
+    await dropClientDatabases('mysql');
+  }
+  print('Dropped DBs');
+}
+
+async function dropClientDatabases(client: string) {
   await Promise.all(
     [
       'catalog',
@@ -454,9 +475,8 @@ async function preCleanPostgres() {
       'proxy',
       'techdocs',
       'search',
-    ].map(name => dropDB(`backstage_plugin_${name}`)),
+    ].map(name => dropDB(`backstage_plugin_${name}`, client)),
   );
-  print('Created DBs');
 }
 
 /**
diff --git a/packages/errors/catalog-info.yaml b/packages/errors/catalog-info.yaml
new file mode 100644
index 0000000000..ee97045b20
--- /dev/null
+++ b/packages/errors/catalog-info.yaml
@@ -0,0 +1,10 @@
+apiVersion: backstage.io/v1alpha1
+kind: Component
+metadata:
+  name: backstage-errors
+  title: '@backstage/errors'
+  description: Common utilities for error handling within Backstage
+spec:
+  lifecycle: production
+  type: backstage-common-library
+  owner: maintainers
diff --git a/packages/errors/package.json b/packages/errors/package.json
index 05d04031ca..1afeb662ca 100644
--- a/packages/errors/package.json
+++ b/packages/errors/package.json
@@ -23,6 +23,7 @@
   "keywords": [
     "backstage"
   ],
+  "sideEffects": false,
   "scripts": {
     "build": "backstage-cli package build",
     "lint": "backstage-cli package lint",
diff --git a/packages/frontend-app-api/.eslintrc.js b/packages/frontend-app-api/.eslintrc.js
new file mode 100644
index 0000000000..e2a53a6ad2
--- /dev/null
+++ b/packages/frontend-app-api/.eslintrc.js
@@ -0,0 +1 @@
+module.exports = require('@backstage/cli/config/eslint-factory')(__dirname);
diff --git a/packages/frontend-app-api/CHANGELOG.md b/packages/frontend-app-api/CHANGELOG.md
new file mode 100644
index 0000000000..6cb9af631d
--- /dev/null
+++ b/packages/frontend-app-api/CHANGELOG.md
@@ -0,0 +1,22 @@
+# @backstage/frontend-app-api
+
+## 0.0.1-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-plugin-api@1.6.0-next.2
+  - @backstage/plugin-graphiql@0.2.54-next.2
+  - @backstage/config@1.1.0-next.1
+  - @backstage/frontend-plugin-api@0.0.1-next.0
+  - @backstage/types@1.1.0
+
+## 0.0.1-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config@1.1.0-next.0
+  - @backstage/plugin-graphiql@0.2.54-next.1
+  - @backstage/frontend-plugin-api@0.0.0
+  - @backstage/types@1.1.0
diff --git a/packages/frontend-app-api/README.md b/packages/frontend-app-api/README.md
new file mode 100644
index 0000000000..8b2fe5dc23
--- /dev/null
+++ b/packages/frontend-app-api/README.md
@@ -0,0 +1,9 @@
+# @backstage/frontend-app-api
+
+**This package is EXPERIMENTAL, we recommend against using it for production deployments**
+
+This package provides the core API used by Backstage frontend apps. It implements the design outlined in [RFC: Frontend System Evolution](https://github.com/backstage/backstage/issues/18372).
+
+## Documentation
+
+- [Backstage Documentation](https://backstage.io/docs)
diff --git a/packages/frontend-app-api/api-report.md b/packages/frontend-app-api/api-report.md
new file mode 100644
index 0000000000..bf7db4451b
--- /dev/null
+++ b/packages/frontend-app-api/api-report.md
@@ -0,0 +1,14 @@
+## API Report File for "@backstage/frontend-app-api"
+
+> Do not edit this file. It is a report generated by [API Extractor](https://api-extractor.com/).
+
+```ts
+/// <reference types="react" />
+
+import { BackstagePlugin } from '@backstage/frontend-plugin-api';
+
+// @public (undocumented)
+export function createApp(options: { plugins: BackstagePlugin[] }): {
+  createRoot(): JSX.Element;
+};
+```
diff --git a/packages/frontend-app-api/catalog-info.yaml b/packages/frontend-app-api/catalog-info.yaml
new file mode 100644
index 0000000000..332650f083
--- /dev/null
+++ b/packages/frontend-app-api/catalog-info.yaml
@@ -0,0 +1,9 @@
+apiVersion: backstage.io/v1alpha1
+kind: Component
+metadata:
+  name: backstage-frontend-app-api
+  title: '@backstage/frontend-app-api'
+spec:
+  lifecycle: experimental
+  type: backstage-web-library
+  owner: maintainers
diff --git a/packages/frontend-app-api/config.d.ts b/packages/frontend-app-api/config.d.ts
new file mode 100644
index 0000000000..81c24d1185
--- /dev/null
+++ b/packages/frontend-app-api/config.d.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.
+ */
+
+export interface Config {
+  app?: {
+    /**
+     * @deepVisibility frontend
+     */
+    extensions?:
+      | string
+      | {
+          [extensionId: string]:
+            | boolean
+            | string
+            | {
+                at?: string;
+                extension?: string;
+                config?: unknown;
+              };
+        };
+  };
+}
diff --git a/packages/frontend-app-api/package.json b/packages/frontend-app-api/package.json
new file mode 100644
index 0000000000..451a1c0c5a
--- /dev/null
+++ b/packages/frontend-app-api/package.json
@@ -0,0 +1,47 @@
+{
+  "name": "@backstage/frontend-app-api",
+  "version": "0.0.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"
+  },
+  "backstage": {
+    "role": "web-library"
+  },
+  "sideEffects": false,
+  "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"
+  },
+  "devDependencies": {
+    "@backstage/cli": "workspace:^",
+    "@testing-library/jest-dom": "^5.10.1",
+    "@types/react": "^16.13.1 || ^17.0.0"
+  },
+  "configSchema": "config.d.ts",
+  "files": [
+    "config.d.ts",
+    "dist"
+  ],
+  "dependencies": {
+    "@backstage/config": "workspace:^",
+    "@backstage/core-plugin-api": "workspace:^",
+    "@backstage/frontend-plugin-api": "workspace:^",
+    "@backstage/plugin-graphiql": "workspace:^",
+    "@backstage/types": "workspace:^",
+    "lodash": "^4.17.21"
+  },
+  "peerDependencies": {
+    "react": "^16.13.1 || ^17.0.0",
+    "react-router-dom": "6.0.0-beta.0 || ^6.3.0"
+  }
+}
diff --git a/packages/frontend-app-api/src/createApp.tsx b/packages/frontend-app-api/src/createApp.tsx
new file mode 100644
index 0000000000..c50b507642
--- /dev/null
+++ b/packages/frontend-app-api/src/createApp.tsx
@@ -0,0 +1,172 @@
+/*
+ * 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 { ConfigReader } from '@backstage/config';
+import {
+  BackstagePlugin,
+  coreExtensionData,
+} from '@backstage/frontend-plugin-api';
+import { CoreRouter } from './extensions/CoreRouter';
+import {
+  createExtensionInstance,
+  ExtensionInstance,
+} from './createExtensionInstance';
+import {
+  ExtensionInstanceParameters,
+  mergeExtensionParameters,
+  readAppExtensionParameters,
+} from './wiring/parameters';
+import { RoutingProvider } from './routing/RoutingContext';
+import { RouteRef } from '@backstage/core-plugin-api';
+import { getAvailablePlugins } from './wiring/discovery';
+
+/** @public */
+export function createApp(options: { plugins: BackstagePlugin[] }): {
+  createRoot(): JSX.Element;
+} {
+  const appConfig = ConfigReader.fromConfigs(process.env.APP_CONFIG as any);
+
+  const builtinExtensions = [CoreRouter];
+  const discoveredPlugins = getAvailablePlugins();
+
+  // pull in default extension instance from discovered packages
+  // apply config to adjust default extension instances and add more
+  const extensionParams = mergeExtensionParameters({
+    sources: [...options.plugins, ...discoveredPlugins],
+    builtinExtensions,
+    parameters: readAppExtensionParameters(appConfig),
+  });
+
+  // TODO: validate the config of all extension instances
+  // We do it at this point to ensure that merging (if any) of config has already happened
+
+  // Create attachment map so that we can look attachments up during instance creation
+  const attachmentMap = new Map<
+    string,
+    Map<string, ExtensionInstanceParameters[]>
+  >();
+  for (const instanceParams of extensionParams) {
+    const [extensionId, pointId = 'default'] = instanceParams.at.split('/');
+
+    let pointMap = attachmentMap.get(extensionId);
+    if (!pointMap) {
+      pointMap = new Map();
+      attachmentMap.set(extensionId, pointMap);
+    }
+
+    let instances = pointMap.get(pointId);
+    if (!instances) {
+      instances = [];
+      pointMap.set(pointId, instances);
+    }
+
+    instances.push(instanceParams);
+  }
+
+  const instances = new Map<string, ExtensionInstance>();
+
+  function createInstance(
+    instanceParams: ExtensionInstanceParameters,
+  ): ExtensionInstance {
+    const existingInstance = instances.get(instanceParams.extension.id);
+    if (existingInstance) {
+      return existingInstance;
+    }
+
+    const attachments = new Map(
+      Array.from(
+        attachmentMap.get(instanceParams.extension.id)?.entries() ?? [],
+      ).map(([inputName, attachmentConfigs]) => [
+        inputName,
+        attachmentConfigs.map(createInstance),
+      ]),
+    );
+
+    const newInstance = createExtensionInstance({
+      extension: instanceParams.extension,
+      source: instanceParams.source,
+      config: instanceParams.config,
+      attachments,
+    });
+
+    instances.set(instanceParams.extension.id, newInstance);
+
+    return newInstance;
+  }
+
+  const rootConfigs = attachmentMap.get('root')?.get('default') ?? [];
+  const rootInstances = rootConfigs.map(instanceParams =>
+    createInstance(instanceParams),
+  );
+
+  const routePaths = extractRouteInfoFromInstanceTree(rootInstances);
+
+  return {
+    createRoot() {
+      const rootComponents = rootInstances.map(
+        e =>
+          e.data.get(
+            coreExtensionData.reactComponent.id,
+          ) as typeof coreExtensionData.reactComponent.T,
+      );
+      return (
+        <RoutingProvider routePaths={routePaths}>
+          {rootComponents.map((Component, i) => (
+            <Component key={i} />
+          ))}
+        </RoutingProvider>
+      );
+    },
+  };
+}
+
+/** @internal */
+export function extractRouteInfoFromInstanceTree(
+  roots: ExtensionInstance[],
+): Map<RouteRef, string> {
+  const results = new Map<RouteRef, string>();
+
+  function visit(current: ExtensionInstance, basePath: string) {
+    const routePath = current.data.get(coreExtensionData.routePath.id) ?? '';
+    const routeRef = current.data.get(
+      coreExtensionData.routeRef.id,
+    ) as RouteRef;
+
+    // TODO: join paths in a more robust way
+    const fullPath = basePath + routePath;
+    if (routeRef) {
+      const routeRefId = (routeRef as any).id; // TODO: properly
+      if (routeRefId !== current.id) {
+        throw new Error(
+          `Route ref '${routeRefId}' must have the same ID as extension '${current.id}'`,
+        );
+      }
+      results.set(routeRef, fullPath);
+    }
+
+    for (const children of current.attachments.values()) {
+      for (const child of children) {
+        visit(child, fullPath);
+      }
+    }
+  }
+
+  for (const root of roots) {
+    visit(root, '');
+  }
+  return results;
+}
diff --git a/packages/frontend-app-api/src/createExtensionInstance.ts b/packages/frontend-app-api/src/createExtensionInstance.ts
new file mode 100644
index 0000000000..d767f21d58
--- /dev/null
+++ b/packages/frontend-app-api/src/createExtensionInstance.ts
@@ -0,0 +1,90 @@
+/*
+ * Copyright 2023 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import { BackstagePlugin, Extension } from '@backstage/frontend-plugin-api';
+import mapValues from 'lodash/mapValues';
+
+/** @internal */
+export interface ExtensionInstance {
+  readonly id: string;
+  /**
+   * Maps extension data ref IDs to extensions produced.
+   */
+  readonly data: Map<string, unknown>;
+  /**
+   * Maps input names to the actual instances given to them.
+   */
+  readonly attachments: Map<string, ExtensionInstance[]>;
+  readonly $$type: 'extension-instance';
+}
+
+/** @internal */
+export function createExtensionInstance(options: {
+  extension: Extension<unknown>;
+  config: unknown;
+  source?: BackstagePlugin;
+  attachments: Map<string, ExtensionInstance[]>;
+}): ExtensionInstance {
+  const { extension, config, source, attachments } = options;
+  const extensionData = new Map<string, unknown>();
+
+  let parsedConfig: unknown;
+  try {
+    parsedConfig = extension.configSchema?.parse(config ?? {});
+  } catch (e) {
+    throw new Error(
+      `Invalid configuration for extension instance '${extension.id}', ${e}`,
+    );
+  }
+
+  try {
+    extension.factory({
+      source,
+      config: parsedConfig,
+      bind: namedOutputs => {
+        for (const [name, output] of Object.entries(namedOutputs)) {
+          const ref = extension.output[name];
+          if (!ref) {
+            throw new Error(
+              `Extension instance '${extension.id}' tried to bind unknown output '${name}'`,
+            );
+          }
+          extensionData.set(ref.id, output);
+        }
+      },
+      inputs: mapValues(
+        extension.inputs,
+        ({ extensionData: pointData }, inputName) => {
+          // TODO: validation
+          return (attachments.get(inputName) ?? []).map(attachment =>
+            mapValues(pointData, ref => attachment.data.get(ref.id)),
+          );
+        },
+      ),
+    });
+  } catch (e) {
+    throw new Error(
+      `Failed to instantiate extension instance '${extension.id}', ${e}`,
+    );
+  }
+
+  return {
+    id: options.extension.id,
+    data: extensionData,
+    attachments,
+    $$type: 'extension-instance',
+  };
+}
diff --git a/packages/frontend-app-api/src/extensions/CoreRouter.tsx b/packages/frontend-app-api/src/extensions/CoreRouter.tsx
new file mode 100644
index 0000000000..05f84aba6d
--- /dev/null
+++ b/packages/frontend-app-api/src/extensions/CoreRouter.tsx
@@ -0,0 +1,58 @@
+/*
+ * 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 {
+  createExtension,
+  coreExtensionData,
+} from '@backstage/frontend-plugin-api';
+import { BrowserRouter, useRoutes } from 'react-router-dom';
+
+export const CoreRouter = createExtension({
+  id: 'core.router',
+  at: 'root',
+  inputs: {
+    routes: {
+      extensionData: {
+        path: coreExtensionData.routePath,
+        ref: coreExtensionData.routeRef,
+        component: coreExtensionData.reactComponent,
+      },
+    },
+  },
+  output: {
+    component: coreExtensionData.reactComponent,
+  },
+  factory({ bind, inputs }) {
+    const Routes = () => {
+      const element = useRoutes(
+        inputs.routes.map(route => ({
+          path: route.path,
+          element: <route.component />,
+        })),
+      );
+
+      return element;
+    };
+    bind({
+      component: () => (
+        <BrowserRouter>
+          <Routes />
+        </BrowserRouter>
+      ),
+    });
+  },
+});
diff --git a/packages/frontend-app-api/src/index.ts b/packages/frontend-app-api/src/index.ts
new file mode 100644
index 0000000000..9674eb345d
--- /dev/null
+++ b/packages/frontend-app-api/src/index.ts
@@ -0,0 +1,23 @@
+/*
+ * 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.
+ */
+
+/**
+ * Core API used by Backstage frontend apps.
+ *
+ * @packageDocumentation
+ */
+
+export { createApp } from './createApp';
diff --git a/packages/frontend-app-api/src/routing/RoutingContext.tsx b/packages/frontend-app-api/src/routing/RoutingContext.tsx
new file mode 100644
index 0000000000..237c8aa5df
--- /dev/null
+++ b/packages/frontend-app-api/src/routing/RoutingContext.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 { RouteRef } from '@backstage/core-plugin-api';
+import React, { createContext, ReactNode } from 'react';
+
+export interface RoutingContextType {
+  resolve(
+    routeRef: RouteRef,
+    options: { pathname: string },
+  ): (() => string) | undefined;
+}
+
+export const RoutingContext = createContext<RoutingContextType>({
+  resolve: () => () => '',
+});
+
+export class RouteResolver {
+  constructor(private readonly routePaths: Map<RouteRef, string>) {}
+
+  resolve(anyRouteRef: RouteRef<{}>): (() => string) | undefined {
+    const basePath = this.routePaths.get(anyRouteRef);
+    if (!basePath) {
+      return undefined;
+    }
+    return () => basePath;
+  }
+}
+
+export function RoutingProvider(props: {
+  routePaths: Map<RouteRef, string>;
+  children?: ReactNode;
+}) {
+  return (
+    <RoutingContext.Provider value={new RouteResolver(props.routePaths)}>
+      {props.children}
+    </RoutingContext.Provider>
+  );
+}
diff --git a/packages/frontend-app-api/src/setupTests.ts b/packages/frontend-app-api/src/setupTests.ts
new file mode 100644
index 0000000000..c30f1d15cb
--- /dev/null
+++ b/packages/frontend-app-api/src/setupTests.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.
+ */
+
+import '@testing-library/jest-dom';
diff --git a/packages/frontend-app-api/src/wiring/discovery.test.ts b/packages/frontend-app-api/src/wiring/discovery.test.ts
new file mode 100644
index 0000000000..5f1c4df718
--- /dev/null
+++ b/packages/frontend-app-api/src/wiring/discovery.test.ts
@@ -0,0 +1,81 @@
+/*
+ * 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 { createPlugin } from '@backstage/frontend-plugin-api';
+import { getAvailablePlugins } from './discovery';
+
+const globalSpy = jest.fn();
+Object.defineProperty(global, '__@backstage/discovered__', {
+  get: globalSpy,
+});
+
+describe('getAvailablePlugins', () => {
+  afterEach(jest.resetAllMocks);
+
+  it('should discover nothing with undefined global', () => {
+    expect(getAvailablePlugins()).toEqual([]);
+  });
+
+  it('should discover nothing with empty global', () => {
+    globalSpy.mockReturnValue({
+      modules: [],
+    });
+    expect(getAvailablePlugins()).toEqual([]);
+  });
+
+  it('should discover a plugin', () => {
+    const testPlugin = createPlugin({ id: 'test' });
+    globalSpy.mockReturnValue({
+      modules: [{ default: testPlugin }],
+    });
+    expect(getAvailablePlugins()).toEqual([testPlugin]);
+  });
+
+  it('should ignore garbage', () => {
+    globalSpy.mockReturnValueOnce({ modules: [{ default: null }] });
+    expect(getAvailablePlugins()).toEqual([]);
+    globalSpy.mockReturnValueOnce({ modules: [{ default: undefined }] });
+    expect(getAvailablePlugins()).toEqual([]);
+    globalSpy.mockReturnValueOnce({ modules: [{ default: Symbol() }] });
+    expect(getAvailablePlugins()).toEqual([]);
+    globalSpy.mockReturnValueOnce({ modules: [{ default: () => {} }] });
+    expect(getAvailablePlugins()).toEqual([]);
+    globalSpy.mockReturnValueOnce({ modules: [{ default: 0 }] });
+    expect(getAvailablePlugins()).toEqual([]);
+    globalSpy.mockReturnValueOnce({ modules: [{ default: false }] });
+    expect(getAvailablePlugins()).toEqual([]);
+    globalSpy.mockReturnValueOnce({ modules: [{ default: true }] });
+    expect(getAvailablePlugins()).toEqual([]);
+  });
+
+  it('should discover multiple plugins', () => {
+    const test1Plugin = createPlugin({ id: 'test1' });
+    const test2Plugin = createPlugin({ id: 'test2' });
+    const test3Plugin = createPlugin({ id: 'test3' });
+    globalSpy.mockReturnValue({
+      modules: [
+        { default: test1Plugin },
+        { default: test2Plugin },
+        { default: test3Plugin },
+      ],
+    });
+    expect(getAvailablePlugins()).toEqual([
+      test1Plugin,
+      test2Plugin,
+      test3Plugin,
+    ]);
+  });
+});
diff --git a/packages/frontend-app-api/src/wiring/discovery.ts b/packages/frontend-app-api/src/wiring/discovery.ts
new file mode 100644
index 0000000000..d872ae4441
--- /dev/null
+++ b/packages/frontend-app-api/src/wiring/discovery.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 { BackstagePlugin } from '@backstage/frontend-plugin-api';
+
+interface DiscoveryGlobal {
+  modules: Array<{ name: string; default: unknown }>;
+}
+
+/**
+ * @public
+ */
+export function getAvailablePlugins(): BackstagePlugin[] {
+  const discovered = (
+    window as { '__@backstage/discovered__'?: DiscoveryGlobal }
+  )['__@backstage/discovered__'];
+
+  return (
+    discovered?.modules.map(m => m.default).filter(isBackstagePlugin) ?? []
+  );
+}
+
+function isBackstagePlugin(obj: unknown): obj is BackstagePlugin {
+  if (obj !== null && typeof obj === 'object' && '$$type' in obj) {
+    return obj.$$type === 'backstage-plugin';
+  }
+  return false;
+}
diff --git a/packages/frontend-app-api/src/wiring/parameters.test.ts b/packages/frontend-app-api/src/wiring/parameters.test.ts
new file mode 100644
index 0000000000..10b0e2fc6f
--- /dev/null
+++ b/packages/frontend-app-api/src/wiring/parameters.test.ts
@@ -0,0 +1,375 @@
+/*
+ * 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 { ConfigReader } from '@backstage/config';
+import { createPlugin, Extension } from '@backstage/frontend-plugin-api';
+import { JsonValue } from '@backstage/types';
+import {
+  expandShorthandExtensionParameters,
+  mergeExtensionParameters,
+  readAppExtensionParameters,
+} from './parameters';
+
+function makeExt(id: string, status: 'disabled' | 'enabled' = 'enabled') {
+  return {
+    id,
+    at: 'root',
+    disabled: status === 'disabled',
+  } as Extension<unknown>;
+}
+
+describe('mergeExtensionParameters', () => {
+  it('should filter out disabled extension instances', () => {
+    expect(
+      mergeExtensionParameters({
+        sources: [],
+        builtinExtensions: [makeExt('a', 'disabled')],
+        parameters: [],
+      }),
+    ).toEqual([]);
+  });
+
+  it('should pass through extension instances', () => {
+    const a = makeExt('a');
+    const b = makeExt('b');
+    expect(
+      mergeExtensionParameters({
+        sources: [],
+        builtinExtensions: [a, b],
+        parameters: [],
+      }),
+    ).toEqual([
+      { extension: a, at: 'root' },
+      { extension: b, at: 'root' },
+    ]);
+  });
+
+  it('should override attachment points', () => {
+    const a = makeExt('a');
+    const b = makeExt('b');
+    const pluginA = createPlugin({ id: 'test', extensions: [a] });
+    expect(
+      mergeExtensionParameters({
+        sources: [pluginA],
+        builtinExtensions: [b],
+        parameters: [
+          {
+            id: 'b',
+            at: 'derp',
+          },
+        ],
+      }),
+    ).toEqual([
+      { extension: a, at: 'root', source: pluginA },
+      { extension: b, at: 'derp' },
+    ]);
+  });
+
+  it('should fully override configuration and duplicate', () => {
+    const a = makeExt('a');
+    const b = makeExt('b');
+    const plugin = createPlugin({ id: 'test', extensions: [a, b] });
+    expect(
+      mergeExtensionParameters({
+        sources: [plugin],
+        builtinExtensions: [],
+        parameters: [
+          {
+            id: 'a',
+            config: { foo: { bar: 1 } },
+          },
+          {
+            id: 'b',
+            config: { foo: { bar: 2 } },
+          },
+          {
+            id: 'b',
+            config: { foo: { qux: 3 } },
+          },
+        ],
+      }),
+    ).toEqual([
+      { extension: a, at: 'root', source: plugin, config: { foo: { bar: 1 } } },
+      { extension: b, at: 'root', source: plugin, config: { foo: { qux: 3 } } },
+    ]);
+  });
+
+  it('should place enabled instances in the order that they were enabled', () => {
+    const a = makeExt('a', 'disabled');
+    const b = makeExt('b', 'disabled');
+    expect(
+      mergeExtensionParameters({
+        sources: [createPlugin({ id: 'empty', extensions: [] })],
+        builtinExtensions: [a, b],
+        parameters: [
+          {
+            id: 'b',
+            disabled: false,
+          },
+          {
+            id: 'a',
+            disabled: false,
+          },
+        ],
+      }),
+    ).toEqual([
+      { extension: b, at: 'root' },
+      { extension: a, at: 'root' },
+    ]);
+  });
+});
+
+describe('readAppExtensionParameters', () => {
+  it('should disable extension with shorthand notation', () => {
+    expect(
+      readAppExtensionParameters(
+        new ConfigReader({ app: { extensions: [{ 'core.router': false }] } }),
+      ),
+    ).toEqual([
+      {
+        id: 'core.router',
+        disabled: true,
+      },
+    ]);
+    expect(
+      readAppExtensionParameters(
+        new ConfigReader({
+          app: { extensions: [{ 'core.router': { disabled: true } }] },
+        }),
+      ),
+    ).toEqual([
+      {
+        at: undefined,
+        config: undefined,
+        disabled: true,
+        id: 'core.router',
+      },
+    ]);
+  });
+
+  it('should enable extension with shorthand notation', () => {
+    expect(
+      readAppExtensionParameters(
+        new ConfigReader({ app: { extensions: ['core.router'] } }),
+      ),
+    ).toEqual([
+      {
+        id: 'core.router',
+        disabled: false,
+      },
+    ]);
+    expect(
+      readAppExtensionParameters(
+        new ConfigReader({ app: { extensions: [{ 'core.router': true }] } }),
+      ),
+    ).toEqual([
+      {
+        id: 'core.router',
+        disabled: false,
+      },
+    ]);
+    expect(
+      readAppExtensionParameters(
+        new ConfigReader({
+          app: { extensions: [{ 'core.router': { disabled: false } }] },
+        }),
+      ),
+    ).toEqual([
+      {
+        id: 'core.router',
+        disabled: false,
+      },
+    ]);
+  });
+
+  it('should not allow string keys', () => {
+    expect(() =>
+      readAppExtensionParameters(
+        new ConfigReader({
+          app: {
+            extensions: [{ 'core.router': 'some-string' }],
+          },
+        }),
+      ),
+    ).toThrow(
+      'Invalid extension configuration at app.extensions[0][core.router], value must be a boolean or object',
+    );
+  });
+
+  it('should not allow invalid keys', () => {
+    expect(() =>
+      readAppExtensionParameters(
+        new ConfigReader({
+          app: {
+            extensions: [
+              {
+                'core.router/routes': {
+                  extension: 'example-package#MyPage',
+                  config: { foo: 'bar' },
+                },
+              },
+            ],
+          },
+        }),
+      ),
+    ).toThrowErrorMatchingInlineSnapshot(
+      `"Invalid extension configuration at app.extensions[0], extension ID must not contain slashes; got 'core.router/routes', did you mean 'core.router'?"`,
+    );
+  });
+});
+
+describe('expandShorthandExtensionParameters', () => {
+  const run = (value: JsonValue) => {
+    return expandShorthandExtensionParameters(value, 1);
+  };
+
+  it('rejects unknown keys', () => {
+    expect(() => run(null)).toThrowErrorMatchingInlineSnapshot(
+      `"Invalid extension configuration at app.extensions[1], must be a string or an object"`,
+    );
+    expect(() => run(1)).toThrowErrorMatchingInlineSnapshot(
+      `"Invalid extension configuration at app.extensions[1], must be a string or an object"`,
+    );
+    expect(() => run([])).toThrowErrorMatchingInlineSnapshot(
+      `"Invalid extension configuration at app.extensions[1], must be a string or an object"`,
+    );
+  });
+
+  it('rejects the wrong number of keys', () => {
+    expect(() => run({})).toThrowErrorMatchingInlineSnapshot(
+      `"Invalid extension configuration at app.extensions[1], must have exactly one key, got none"`,
+    );
+    expect(() => run({ a: {}, b: {} })).toThrowErrorMatchingInlineSnapshot(
+      `"Invalid extension configuration at app.extensions[1], must have exactly one key, got 'a', 'b'"`,
+    );
+  });
+
+  it('rejects unknown values', () => {
+    expect(() => run({ a: 1 })).toThrowErrorMatchingInlineSnapshot(
+      `"Invalid extension configuration at app.extensions[1][a], value must be a boolean or object"`,
+    );
+    expect(() => run({ a: [] })).toThrowErrorMatchingInlineSnapshot(
+      `"Invalid extension configuration at app.extensions[1][a], value must be a boolean or object"`,
+    );
+  });
+
+  it('supports string key', () => {
+    expect(run('core.router')).toEqual({
+      id: 'core.router',
+      disabled: false,
+    });
+    expect(() => run('')).toThrowErrorMatchingInlineSnapshot(
+      `"Invalid extension configuration at app.extensions[1], extension ID must not be empty or contain whitespace"`,
+    );
+    expect(() => run(' a')).toThrowErrorMatchingInlineSnapshot(
+      `"Invalid extension configuration at app.extensions[1], extension ID must not be empty or contain whitespace"`,
+    );
+    expect(() => run('core.router/routes')).toThrowErrorMatchingInlineSnapshot(
+      `"Invalid extension configuration at app.extensions[1], extension ID must not contain slashes; got 'core.router/routes', did you mean 'core.router'?"`,
+    );
+  });
+
+  it('supports null value', () => {
+    // this is the result of typing:
+    // - core.router:
+    // The missing value is interpreted as null by the yaml parser so we deal with that
+    expect(run({ 'core.router': null })).toEqual({
+      id: 'core.router',
+      disabled: false,
+    });
+  });
+
+  it('supports boolean value', () => {
+    expect(run({ 'core.router': true })).toEqual({
+      id: 'core.router',
+      disabled: false,
+    });
+    expect(run({ 'core.router': false })).toEqual({
+      id: 'core.router',
+      disabled: true,
+    });
+  });
+
+  it('should not support string values', () => {
+    expect(() =>
+      run({ 'core.router': 'example-package#MyRouter' }),
+    ).toThrowErrorMatchingInlineSnapshot(
+      `"Invalid extension configuration at app.extensions[1][core.router], value must be a boolean or object"`,
+    );
+  });
+
+  it('supports object id only in the key', () => {
+    expect(() =>
+      run({ 'core.router': { id: 'some.id' } }),
+    ).toThrowErrorMatchingInlineSnapshot(
+      `"Invalid extension configuration at app.extensions[1][core.router].id, unknown parameter; expected one of 'at', 'disabled', 'config'"`,
+    );
+  });
+
+  it('supports object at', () => {
+    expect(run({ 'core.router': { at: 'other.root/inputs' } })).toEqual({
+      id: 'core.router',
+      at: 'other.root/inputs',
+    });
+    expect(() =>
+      run({
+        'core.router': {
+          id: 'other-id',
+        },
+      }),
+    ).toThrowErrorMatchingInlineSnapshot(
+      `"Invalid extension configuration at app.extensions[1][core.router].id, unknown parameter; expected one of 'at', 'disabled', 'config'"`,
+    );
+  });
+
+  it('supports object disabled', () => {
+    expect(run({ 'core.router': { disabled: true } })).toEqual({
+      id: 'core.router',
+      disabled: true,
+    });
+    expect(run({ 'core.router': { disabled: false } })).toEqual({
+      id: 'core.router',
+      disabled: false,
+    });
+    expect(() =>
+      run({ 'core.router': { disabled: 0 } }),
+    ).toThrowErrorMatchingInlineSnapshot(
+      `"Invalid extension configuration at app.extensions[1][core.router].disabled, must be a boolean"`,
+    );
+  });
+
+  it('supports object config', () => {
+    expect(
+      run({ 'core.router': { config: { disableRedirects: true } } }),
+    ).toEqual({
+      id: 'core.router',
+      config: { disableRedirects: true },
+    });
+    expect(() =>
+      run({ 'core.router': { config: 0 } }),
+    ).toThrowErrorMatchingInlineSnapshot(
+      `"Invalid extension configuration at app.extensions[1][core.router].config, must be an object"`,
+    );
+  });
+
+  it('rejects unknown object keys', () => {
+    expect(() =>
+      run({ 'core.router': { foo: { settings: true } } }),
+    ).toThrowErrorMatchingInlineSnapshot(
+      `"Invalid extension configuration at app.extensions[1][core.router].foo, unknown parameter; expected one of 'at', 'disabled', 'config'"`,
+    );
+  });
+});
diff --git a/packages/frontend-app-api/src/wiring/parameters.ts b/packages/frontend-app-api/src/wiring/parameters.ts
new file mode 100644
index 0000000000..1b2831aaca
--- /dev/null
+++ b/packages/frontend-app-api/src/wiring/parameters.ts
@@ -0,0 +1,258 @@
+/*
+ * 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 { BackstagePlugin, Extension } from '@backstage/frontend-plugin-api';
+import { JsonValue } from '@backstage/types';
+
+export interface ExtensionParameters {
+  id: string;
+  at?: string;
+  disabled?: boolean;
+  config?: unknown;
+}
+
+const knownExtensionParameters = ['at', 'disabled', 'config'];
+
+// Since we'll never merge arrays in config the config reader context
+// isn't too much of a help. Fall back to manual config reading logic
+// as the Config interface makes it quite hard for us otherwise.
+/** @internal */
+export function readAppExtensionParameters(
+  rootConfig: Config,
+): ExtensionParameters[] {
+  const arr = rootConfig.getOptional('app.extensions');
+  if (!Array.isArray(arr)) {
+    if (arr === undefined) {
+      return [];
+    }
+    // This will throw, and show which part of config had the wrong type
+    rootConfig.getConfigArray('app.extensions');
+    return [];
+  }
+
+  return arr.map((arrayEntry, arrayIndex) =>
+    expandShorthandExtensionParameters(arrayEntry, arrayIndex),
+  );
+}
+
+/** @internal */
+export function expandShorthandExtensionParameters(
+  arrayEntry: JsonValue,
+  arrayIndex: number,
+): ExtensionParameters {
+  function errorMsg(msg: string, key?: string, prop?: string) {
+    return `Invalid extension configuration at app.extensions[${arrayIndex}]${
+      key ? `[${key}]` : ''
+    }${prop ? `.${prop}` : ''}, ${msg}`;
+  }
+
+  // NOTE(freben): This check is intentionally not complete and doesn't check
+  // whether letters and digits are used, etc. It's not up to the config reading
+  // logic to decide what constitutes a valid extension ID; that should be
+  // decided by the logic that loads and instantiates the extensions. This check
+  // is just here to catch real mistakes or truly conceptually wrong input.
+  function assertValidId(id: string) {
+    if (!id || id !== id.trim()) {
+      throw new Error(
+        errorMsg('extension ID must not be empty or contain whitespace'),
+      );
+    }
+
+    if (id.includes('/')) {
+      let message = `extension ID must not contain slashes; got '${id}'`;
+      const good = id.split('/')[0];
+      if (good) {
+        message += `, did you mean '${good}'?`;
+      }
+      throw new Error(errorMsg(message));
+    }
+  }
+
+  // Example YAML:
+  // - entity.card.about
+  if (typeof arrayEntry === 'string') {
+    assertValidId(arrayEntry);
+    return {
+      id: arrayEntry,
+      disabled: false,
+    };
+  }
+
+  // All remaining cases are single-key objects
+  if (
+    typeof arrayEntry !== 'object' ||
+    arrayEntry === null ||
+    Array.isArray(arrayEntry)
+  ) {
+    throw new Error(errorMsg('must be a string or an object'));
+  }
+  const keys = Object.keys(arrayEntry);
+  if (keys.length !== 1) {
+    const joinedKeys = keys.length ? `'${keys.join("', '")}'` : 'none';
+    throw new Error(errorMsg(`must have exactly one key, got ${joinedKeys}`));
+  }
+
+  const id = String(keys[0]);
+  const value = arrayEntry[id];
+  assertValidId(id);
+
+  // This example covers a potentially common mistake in the syntax
+  // Example YAML:
+  // - entity.card.about:
+  if (value === null) {
+    return {
+      id,
+      disabled: false,
+    };
+  }
+
+  // Example YAML:
+  // - catalog.page.cicd: false
+  if (typeof value === 'boolean') {
+    return {
+      id,
+      disabled: !value,
+    };
+  }
+
+  // The remaining case is the generic object. Example YAML:
+  //  - tech-radar.page:
+  //      at: core.router/routes
+  //      disabled: false
+  //      config:
+  //        path: /tech-radar
+  //        width: 1500
+  //        height: 800
+  if (typeof value !== 'object' || Array.isArray(value)) {
+    // We don't mention null here - we don't want people to explicitly enter
+    // - entity.card.about: null
+    throw new Error(errorMsg('value must be a boolean or object', id));
+  }
+
+  const at = value.at;
+  const disabled = value.disabled;
+  const config = value.config;
+
+  if (at !== undefined && typeof at !== 'string') {
+    throw new Error(errorMsg('must be a string', id, 'at'));
+  } else if (disabled !== undefined && typeof disabled !== 'boolean') {
+    throw new Error(errorMsg('must be a boolean', id, 'disabled'));
+  } else if (
+    config !== undefined &&
+    (typeof config !== 'object' || config === null || Array.isArray(config))
+  ) {
+    throw new Error(errorMsg('must be an object', id, 'config'));
+  }
+
+  const unknownKeys = Object.keys(value).filter(
+    k => !knownExtensionParameters.includes(k),
+  );
+  if (unknownKeys.length > 0) {
+    throw new Error(
+      errorMsg(
+        `unknown parameter; expected one of '${knownExtensionParameters.join(
+          "', '",
+        )}'`,
+        id,
+        unknownKeys.join(', '),
+      ),
+    );
+  }
+
+  return {
+    id,
+    at,
+    disabled,
+    config,
+  };
+}
+
+export interface ExtensionInstanceParameters {
+  extension: Extension<unknown>;
+  source?: BackstagePlugin;
+  at: string;
+  config?: unknown;
+}
+
+/** @internal */
+export function mergeExtensionParameters(options: {
+  sources: BackstagePlugin[];
+  builtinExtensions: Extension<unknown>[];
+  parameters: Array<ExtensionParameters>;
+}): ExtensionInstanceParameters[] {
+  const { sources, builtinExtensions, parameters } = options;
+
+  const overrides = [
+    ...sources.flatMap(plugin =>
+      plugin.extensions.map(extension => ({
+        extension,
+        params: {
+          source: plugin,
+          at: extension.at,
+          disabled: extension.disabled,
+          config: undefined as unknown,
+        },
+      })),
+    ),
+    ...builtinExtensions.map(extension => ({
+      extension,
+      params: {
+        source: undefined,
+        at: extension.at,
+        disabled: extension.disabled,
+        config: undefined as unknown,
+      },
+    })),
+  ];
+
+  for (const overrideParam of parameters) {
+    const existingIndex = overrides.findIndex(
+      e => e.extension.id === overrideParam.id,
+    );
+    if (existingIndex !== -1) {
+      const existing = overrides[existingIndex];
+      if (overrideParam.at) {
+        existing.params.at = overrideParam.at;
+      }
+      if (overrideParam.config) {
+        // TODO: merge config?
+        existing.params.config = overrideParam.config;
+      }
+      if (
+        Boolean(existing.params.disabled) !== Boolean(overrideParam.disabled)
+      ) {
+        existing.params.disabled = Boolean(overrideParam.disabled);
+        if (!existing.params.disabled) {
+          // bump
+          overrides.splice(existingIndex, 1);
+          overrides.push(existing);
+        }
+      }
+    } else {
+      throw new Error(`Extension ${overrideParam.id} does not exist`);
+    }
+  }
+
+  return overrides
+    .filter(override => !override.params.disabled)
+    .map(param => ({
+      extension: param.extension,
+      at: param.params.at,
+      source: param.params.source,
+      config: param.params.config,
+    }));
+}
diff --git a/packages/frontend-plugin-api/.eslintrc.js b/packages/frontend-plugin-api/.eslintrc.js
new file mode 100644
index 0000000000..e2a53a6ad2
--- /dev/null
+++ b/packages/frontend-plugin-api/.eslintrc.js
@@ -0,0 +1 @@
+module.exports = require('@backstage/cli/config/eslint-factory')(__dirname);
diff --git a/packages/frontend-plugin-api/CHANGELOG.md b/packages/frontend-plugin-api/CHANGELOG.md
new file mode 100644
index 0000000000..3070b37d9f
--- /dev/null
+++ b/packages/frontend-plugin-api/CHANGELOG.md
@@ -0,0 +1,9 @@
+# @backstage/frontend-plugin-api
+
+## 0.0.1-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-plugin-api@1.6.0-next.2
+  - @backstage/types@1.1.0
diff --git a/packages/frontend-plugin-api/README.md b/packages/frontend-plugin-api/README.md
new file mode 100644
index 0000000000..1fd3da79d8
--- /dev/null
+++ b/packages/frontend-plugin-api/README.md
@@ -0,0 +1,9 @@
+# @backstage/frontend-plugin-api
+
+**This package is EXPERIMENTAL, we recommend against using it for production deployments**
+
+This package provides the core API used by Backstage frontend plugins. It implements the design outlined in [RFC: Frontend System Evolution](https://github.com/backstage/backstage/issues/18372).
+
+## Documentation
+
+- [Backstage Documentation](https://backstage.io/docs)
diff --git a/packages/frontend-plugin-api/api-report.md b/packages/frontend-plugin-api/api-report.md
new file mode 100644
index 0000000000..2959dcb92e
--- /dev/null
+++ b/packages/frontend-plugin-api/api-report.md
@@ -0,0 +1,290 @@
+## API Report File for "@backstage/frontend-plugin-api"
+
+> Do not edit this file. It is a report generated by [API Extractor](https://api-extractor.com/).
+
+```ts
+/// <reference types="react" />
+
+import { AnyApiFactory } from '@backstage/core-plugin-api';
+import { AnyApiRef } from '@backstage/core-plugin-api';
+import { ComponentType } from 'react';
+import { JsonObject } from '@backstage/types';
+import { default as React_2 } from 'react';
+import { ReactNode } from 'react';
+import { RouteRef } from '@backstage/core-plugin-api';
+import { z } from 'zod';
+import { ZodSchema } from 'zod';
+import { ZodTypeDef } from 'zod';
+
+// @public (undocumented)
+export type AnyExtensionDataMap = {
+  [name in string]: ExtensionDataRef<any, any>;
+};
+
+// @public (undocumented)
+export interface BackstagePlugin {
+  // (undocumented)
+  $$type: 'backstage-plugin';
+  // (undocumented)
+  extensions: Extension<unknown>[];
+  // (undocumented)
+  id: string;
+}
+
+// @public (undocumented)
+export interface ConfigurableExtensionDataRef<
+  TData,
+  TConfig extends {
+    optional?: true;
+  } = {},
+> extends ExtensionDataRef<TData, TConfig> {
+  // (undocumented)
+  optional(): ConfigurableExtensionDataRef<
+    TData,
+    TData & {
+      optional: true;
+    }
+  >;
+}
+
+// @public (undocumented)
+export const coreExtensionData: {
+  reactComponent: ConfigurableExtensionDataRef<ComponentType<{}>, {}>;
+  routePath: ConfigurableExtensionDataRef<string, {}>;
+  apiFactory: ConfigurableExtensionDataRef<AnyApiFactory, {}>;
+  routeRef: ConfigurableExtensionDataRef<RouteRef<any>, {}>;
+};
+
+// @public (undocumented)
+export function createApiExtension<
+  TConfig extends {},
+  TInputs extends Record<
+    string,
+    {
+      extensionData: AnyExtensionDataMap;
+    }
+  >,
+>(
+  options: (
+    | {
+        api: AnyApiRef;
+        factory: (options: {
+          config: TConfig;
+          inputs: ExtensionDataInputValues<TInputs>;
+        }) => AnyApiFactory;
+      }
+    | {
+        factory: AnyApiFactory;
+      }
+  ) & {
+    configSchema?: PortableSchema<TConfig>;
+    inputs?: TInputs;
+  },
+): Extension<TConfig>;
+
+// @public (undocumented)
+export function createExtension<
+  TOutput extends AnyExtensionDataMap,
+  TInputs extends Record<
+    string,
+    {
+      extensionData: AnyExtensionDataMap;
+    }
+  >,
+  TConfig = never,
+>(
+  options: CreateExtensionOptions<TOutput, TInputs, TConfig>,
+): Extension<TConfig>;
+
+// @public (undocumented)
+export function createExtensionDataRef<TData>(
+  id: string,
+): ConfigurableExtensionDataRef<TData>;
+
+// @public (undocumented)
+export interface CreateExtensionOptions<
+  TOutput extends AnyExtensionDataMap,
+  TInputs extends Record<
+    string,
+    {
+      extensionData: AnyExtensionDataMap;
+    }
+  >,
+  TConfig,
+> {
+  // (undocumented)
+  at: string;
+  // (undocumented)
+  configSchema?: PortableSchema<TConfig>;
+  // (undocumented)
+  disabled?: boolean;
+  // (undocumented)
+  factory(options: {
+    source?: BackstagePlugin;
+    bind: ExtensionDataBind<TOutput>;
+    config: TConfig;
+    inputs: ExtensionDataInputValues<TInputs>;
+  }): void;
+  // (undocumented)
+  id: string;
+  // (undocumented)
+  inputs?: TInputs;
+  // (undocumented)
+  output: TOutput;
+}
+
+// @public
+export function createPageExtension<
+  TConfig extends {
+    path: string;
+  },
+  TInputs extends Record<
+    string,
+    {
+      extensionData: AnyExtensionDataMap;
+    }
+  >,
+>(
+  options: (
+    | {
+        defaultPath: string;
+      }
+    | {
+        configSchema: PortableSchema<TConfig>;
+      }
+  ) & {
+    id: string;
+    at?: string;
+    disabled?: boolean;
+    inputs?: TInputs;
+    routeRef?: RouteRef;
+    component: (props: {
+      config: TConfig;
+      inputs: ExtensionDataInputValues<TInputs>;
+    }) => Promise<JSX.Element>;
+  },
+): Extension<TConfig>;
+
+// @public (undocumented)
+export function createPlugin(options: PluginOptions): BackstagePlugin;
+
+// @public (undocumented)
+export function createSchemaFromZod<TOutput, TInput>(
+  schemaCreator: (zImpl: typeof z) => ZodSchema<TOutput, ZodTypeDef, TInput>,
+): PortableSchema<TOutput>;
+
+// @public (undocumented)
+export interface Extension<TConfig> {
+  // (undocumented)
+  $$type: 'extension';
+  // (undocumented)
+  at: string;
+  // (undocumented)
+  configSchema?: PortableSchema<TConfig>;
+  // (undocumented)
+  disabled: boolean;
+  // (undocumented)
+  factory(options: {
+    source?: BackstagePlugin;
+    bind: ExtensionDataBind<AnyExtensionDataMap>;
+    config: TConfig;
+    inputs: Record<string, Array<Record<string, unknown>>>;
+  }): void;
+  // (undocumented)
+  id: string;
+  // (undocumented)
+  inputs: Record<
+    string,
+    {
+      extensionData: AnyExtensionDataMap;
+    }
+  >;
+  // (undocumented)
+  output: AnyExtensionDataMap;
+}
+
+// @public (undocumented)
+export function ExtensionBoundary(
+  props: ExtensionBoundaryProps,
+): React_2.JSX.Element;
+
+// @public (undocumented)
+export interface ExtensionBoundaryProps {
+  // (undocumented)
+  children: ReactNode;
+  // (undocumented)
+  source?: BackstagePlugin;
+}
+
+// @public (undocumented)
+export type ExtensionDataBind<TMap extends AnyExtensionDataMap> = (
+  values: {
+    [DataName in keyof TMap as TMap[DataName]['config'] extends {
+      optional: true;
+    }
+      ? never
+      : DataName]: TMap[DataName]['T'];
+  } & {
+    [DataName in keyof TMap as TMap[DataName]['config'] extends {
+      optional: true;
+    }
+      ? DataName
+      : never]?: TMap[DataName]['T'];
+  },
+) => void;
+
+// @public (undocumented)
+export type ExtensionDataInputValues<
+  TInputs extends {
+    [name in string]: {
+      extensionData: AnyExtensionDataMap;
+    };
+  },
+> = {
+  [InputName in keyof TInputs]: Array<
+    {
+      [DataName in keyof TInputs[InputName]['extensionData'] as TInputs[InputName]['extensionData'][DataName]['config'] extends {
+        optional: true;
+      }
+        ? never
+        : DataName]: TInputs[InputName]['extensionData'][DataName]['T'];
+    } & {
+      [DataName in keyof TInputs[InputName]['extensionData'] as TInputs[InputName]['extensionData'][DataName]['config'] extends {
+        optional: true;
+      }
+        ? DataName
+        : never]?: TInputs[InputName]['extensionData'][DataName]['T'];
+    }
+  >;
+};
+
+// @public (undocumented)
+export type ExtensionDataRef<
+  TData,
+  TConfig extends {
+    optional?: true;
+  } = {},
+> = {
+  id: string;
+  T: TData;
+  config: TConfig;
+  $$type: 'extension-data';
+};
+
+// @public (undocumented)
+export interface PluginOptions {
+  // (undocumented)
+  extensions?: Extension<unknown>[];
+  // (undocumented)
+  id: string;
+}
+
+// @public (undocumented)
+export type PortableSchema<TOutput> = {
+  parse: (input: unknown) => TOutput;
+  schema: JsonObject;
+};
+
+// @public (undocumented)
+export function useRouteRef(routeRef: RouteRef<any>): () => string;
+```
diff --git a/packages/frontend-plugin-api/catalog-info.yaml b/packages/frontend-plugin-api/catalog-info.yaml
new file mode 100644
index 0000000000..4531f6eca3
--- /dev/null
+++ b/packages/frontend-plugin-api/catalog-info.yaml
@@ -0,0 +1,9 @@
+apiVersion: backstage.io/v1alpha1
+kind: Component
+metadata:
+  name: backstage-frontend-plugin-api
+  title: '@backstage/frontend-plugin-api'
+spec:
+  lifecycle: experimental
+  type: backstage-web-library
+  owner: maintainers
diff --git a/packages/frontend-plugin-api/package.json b/packages/frontend-plugin-api/package.json
new file mode 100644
index 0000000000..fda7bd8a05
--- /dev/null
+++ b/packages/frontend-plugin-api/package.json
@@ -0,0 +1,46 @@
+{
+  "name": "@backstage/frontend-plugin-api",
+  "version": "0.0.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"
+  },
+  "backstage": {
+    "role": "web-library"
+  },
+  "sideEffects": false,
+  "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"
+  },
+  "devDependencies": {
+    "@backstage/cli": "workspace:^",
+    "@backstage/frontend-app-api": "workspace:^",
+    "@testing-library/jest-dom": "^5.10.1",
+    "@testing-library/react": "^12.1.3"
+  },
+  "files": [
+    "dist"
+  ],
+  "peerDependencies": {
+    "react": "^16.13.1 || ^17.0.0",
+    "react-router-dom": "6.0.0-beta.0 || ^6.3.0"
+  },
+  "dependencies": {
+    "@backstage/core-plugin-api": "workspace:^",
+    "@backstage/types": "workspace:^",
+    "@types/react": "^16.13.1 || ^17.0.0",
+    "lodash": "^4.17.21",
+    "zod": "^3.21.4",
+    "zod-to-json-schema": "^3.21.4"
+  }
+}
diff --git a/packages/frontend-plugin-api/src/components/ExtensionBoundary.tsx b/packages/frontend-plugin-api/src/components/ExtensionBoundary.tsx
new file mode 100644
index 0000000000..c6a218c15f
--- /dev/null
+++ b/packages/frontend-plugin-api/src/components/ExtensionBoundary.tsx
@@ -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 React, { ReactNode } from 'react';
+import { BackstagePlugin } from '../wiring';
+
+/** @public */
+export interface ExtensionBoundaryProps {
+  children: ReactNode;
+  source?: BackstagePlugin;
+}
+
+/** @public */
+export function ExtensionBoundary(props: ExtensionBoundaryProps) {
+  return <>{props.children}</>;
+}
diff --git a/packages/frontend-plugin-api/src/components/index.ts b/packages/frontend-plugin-api/src/components/index.ts
new file mode 100644
index 0000000000..7056a59271
--- /dev/null
+++ b/packages/frontend-plugin-api/src/components/index.ts
@@ -0,0 +1,20 @@
+/*
+ * 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 {
+  ExtensionBoundary,
+  type ExtensionBoundaryProps,
+} from './ExtensionBoundary';
diff --git a/packages/frontend-plugin-api/src/extensions/createApiExtension.test.ts b/packages/frontend-plugin-api/src/extensions/createApiExtension.test.ts
new file mode 100644
index 0000000000..fadb814d4f
--- /dev/null
+++ b/packages/frontend-plugin-api/src/extensions/createApiExtension.test.ts
@@ -0,0 +1,84 @@
+/*
+ * 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 { createApiExtension } from './createApiExtension';
+import { createApiFactory, createApiRef } from '@backstage/core-plugin-api';
+
+describe('createApiExtension', () => {
+  it('fills in the expected values for an existing factory', () => {
+    const api = createApiRef<{ foo: string }>({ id: 'test' });
+    const factory = createApiFactory({
+      api,
+      deps: {},
+      factory: () => ({ foo: 'bar' }),
+    });
+
+    const extension = createApiExtension({
+      factory,
+    });
+
+    expect(extension).toEqual({
+      $$type: 'extension',
+      id: 'apis.test',
+      at: 'core/apis',
+      disabled: false,
+      configSchema: undefined,
+      inputs: {},
+      output: {
+        api: expect.objectContaining({
+          $$type: 'extension-data',
+          id: 'core.api.factory',
+          config: {},
+        }),
+      },
+      factory: expect.any(Function),
+    });
+  });
+
+  it('fills in the expected values for a ref and custom factory', () => {
+    const api = createApiRef<{ foo: string }>({ id: 'test' });
+    const factory = jest.fn(() => ({ foo: 'bar' }));
+
+    const extension = createApiExtension({
+      api,
+      inputs: {},
+      factory({ config: _config, inputs: _inputs }) {
+        return createApiFactory({
+          api,
+          deps: {},
+          factory,
+        });
+      },
+    });
+
+    expect(extension).toEqual({
+      $$type: 'extension',
+      id: 'apis.test',
+      at: 'core/apis',
+      disabled: false,
+      configSchema: undefined,
+      inputs: {},
+      output: {
+        api: expect.objectContaining({
+          $$type: 'extension-data',
+          id: 'core.api.factory',
+          config: {},
+        }),
+      },
+      factory: expect.any(Function),
+    });
+  });
+});
diff --git a/packages/frontend-plugin-api/src/extensions/createApiExtension.ts b/packages/frontend-plugin-api/src/extensions/createApiExtension.ts
new file mode 100644
index 0000000000..f81f07ca72
--- /dev/null
+++ b/packages/frontend-plugin-api/src/extensions/createApiExtension.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 { AnyApiFactory, AnyApiRef } from '@backstage/core-plugin-api';
+import { PortableSchema } from '../schema';
+import {
+  AnyExtensionDataMap,
+  ExtensionDataInputValues,
+  createExtension,
+  coreExtensionData,
+} from '../wiring';
+
+/** @public */
+export function createApiExtension<
+  TConfig extends {},
+  TInputs extends Record<string, { extensionData: AnyExtensionDataMap }>,
+>(
+  options: (
+    | {
+        api: AnyApiRef;
+        factory: (options: {
+          config: TConfig;
+          inputs: ExtensionDataInputValues<TInputs>;
+        }) => AnyApiFactory;
+      }
+    | {
+        factory: AnyApiFactory;
+      }
+  ) & {
+    configSchema?: PortableSchema<TConfig>;
+    inputs?: TInputs;
+  },
+) {
+  const { factory, configSchema, inputs: extensionInputs } = options;
+
+  const apiRef =
+    'api' in options ? options.api : (factory as { api: AnyApiRef }).api;
+
+  return createExtension({
+    id: `apis.${apiRef.id}`,
+    at: 'core/apis',
+    inputs: extensionInputs,
+    configSchema,
+    output: {
+      api: coreExtensionData.apiFactory,
+    },
+    factory({ bind, config, inputs }) {
+      if (typeof factory === 'function') {
+        bind({ api: factory({ config, inputs }) });
+      } else {
+        bind({ api: factory });
+      }
+    },
+  });
+}
diff --git a/packages/frontend-plugin-api/src/extensions/createPageExtension.test.tsx b/packages/frontend-plugin-api/src/extensions/createPageExtension.test.tsx
new file mode 100644
index 0000000000..db389ae4b1
--- /dev/null
+++ b/packages/frontend-plugin-api/src/extensions/createPageExtension.test.tsx
@@ -0,0 +1,103 @@
+/*
+ * 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 { PortableSchema } from '../schema';
+import { coreExtensionData } from '../wiring';
+import { createPageExtension } from './createPageExtension';
+
+describe('createPageExtension', () => {
+  it('creates the extension properly', () => {
+    const configSchema: PortableSchema<{ path: string }> = {
+      parse: jest.fn(),
+      schema: {} as any,
+    };
+
+    expect(
+      createPageExtension({
+        id: 'test',
+        configSchema,
+        component: async () => <div />,
+      }),
+    ).toEqual({
+      $$type: 'extension',
+      id: 'test',
+      at: 'core.router/routes',
+      configSchema: expect.anything(),
+      disabled: false,
+      inputs: {},
+      output: {
+        component: expect.anything(),
+        path: expect.anything(),
+        routeRef: expect.anything(),
+      },
+      factory: expect.any(Function),
+    });
+
+    expect(
+      createPageExtension({
+        id: 'test',
+        at: 'other/place',
+        disabled: true,
+        configSchema,
+        inputs: {
+          first: {
+            extensionData: { component: coreExtensionData.reactComponent },
+          },
+        },
+        component: async () => <div />,
+      }),
+    ).toEqual({
+      $$type: 'extension',
+      id: 'test',
+      at: 'other/place',
+      configSchema: expect.anything(),
+      disabled: true,
+      inputs: {
+        first: {
+          extensionData: { component: coreExtensionData.reactComponent },
+        },
+      },
+      output: {
+        component: expect.anything(),
+        path: expect.anything(),
+        routeRef: expect.anything(),
+      },
+      factory: expect.any(Function),
+    });
+
+    expect(
+      createPageExtension({
+        id: 'test',
+        defaultPath: '/here',
+        component: async () => <div />,
+      }),
+    ).toEqual({
+      $$type: 'extension',
+      id: 'test',
+      at: 'core.router/routes',
+      configSchema: expect.anything(),
+      disabled: false,
+      inputs: {},
+      output: {
+        component: expect.anything(),
+        path: expect.anything(),
+        routeRef: expect.anything(),
+      },
+      factory: expect.any(Function),
+    });
+  });
+});
diff --git a/packages/frontend-plugin-api/src/extensions/createPageExtension.tsx b/packages/frontend-plugin-api/src/extensions/createPageExtension.tsx
new file mode 100644
index 0000000000..167dd397dd
--- /dev/null
+++ b/packages/frontend-plugin-api/src/extensions/createPageExtension.tsx
@@ -0,0 +1,95 @@
+/*
+ * 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 { RouteRef } from '@backstage/core-plugin-api';
+import React from 'react';
+import { ExtensionBoundary } from '../components';
+import { createSchemaFromZod, PortableSchema } from '../schema';
+import {
+  AnyExtensionDataMap,
+  coreExtensionData,
+  createExtension,
+  Extension,
+  ExtensionDataInputValues,
+} from '../wiring';
+
+/**
+ * Helper for creating extensions for a routable React page component.
+ *
+ * @public
+ */
+export function createPageExtension<
+  TConfig extends { path: string },
+  TInputs extends Record<string, { extensionData: AnyExtensionDataMap }>,
+>(
+  options: (
+    | {
+        defaultPath: string;
+      }
+    | {
+        configSchema: PortableSchema<TConfig>;
+      }
+  ) & {
+    id: string;
+    at?: string;
+    disabled?: boolean;
+    inputs?: TInputs;
+    routeRef?: RouteRef;
+    component: (props: {
+      config: TConfig;
+      inputs: ExtensionDataInputValues<TInputs>;
+    }) => Promise<JSX.Element>;
+  },
+): Extension<TConfig> {
+  const configSchema =
+    'configSchema' in options
+      ? options.configSchema
+      : (createSchemaFromZod(z =>
+          z.object({ path: z.string().default(options.defaultPath) }),
+        ) as PortableSchema<TConfig>);
+
+  return createExtension({
+    id: options.id,
+    at: options.at ?? 'core.router/routes',
+    disabled: options.disabled,
+    output: {
+      component: coreExtensionData.reactComponent,
+      path: coreExtensionData.routePath,
+      routeRef: coreExtensionData.routeRef.optional(),
+    },
+    inputs: options.inputs,
+    configSchema,
+    factory({ bind, config, inputs, source }) {
+      const LazyComponent = React.lazy(() =>
+        options
+          .component({ config, inputs })
+          .then(element => ({ default: () => element })),
+      );
+
+      bind({
+        path: config.path,
+        component: () => (
+          <ExtensionBoundary source={source}>
+            <React.Suspense fallback="...">
+              <LazyComponent />
+            </React.Suspense>
+          </ExtensionBoundary>
+        ),
+        routeRef: options.routeRef,
+      });
+    },
+  });
+}
diff --git a/packages/frontend-plugin-api/src/extensions/index.ts b/packages/frontend-plugin-api/src/extensions/index.ts
new file mode 100644
index 0000000000..fa6e60894f
--- /dev/null
+++ b/packages/frontend-plugin-api/src/extensions/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 { createApiExtension } from './createApiExtension';
+export { createPageExtension } from './createPageExtension';
diff --git a/packages/frontend-plugin-api/src/index.ts b/packages/frontend-plugin-api/src/index.ts
new file mode 100644
index 0000000000..4e1a383899
--- /dev/null
+++ b/packages/frontend-plugin-api/src/index.ts
@@ -0,0 +1,27 @@
+/*
+ * 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.
+ */
+
+/**
+ * Core API used by Backstage frontend plugins.
+ *
+ * @packageDocumentation
+ */
+
+export * from './components';
+export * from './extensions';
+export * from './schema';
+export * from './wiring';
+export * from './routing';
diff --git a/packages/frontend-plugin-api/src/routing/index.ts b/packages/frontend-plugin-api/src/routing/index.ts
new file mode 100644
index 0000000000..4506538fa0
--- /dev/null
+++ b/packages/frontend-plugin-api/src/routing/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 { useRouteRef } from './useRouteRef';
diff --git a/packages/frontend-plugin-api/src/routing/useRouteRef.ts b/packages/frontend-plugin-api/src/routing/useRouteRef.ts
new file mode 100644
index 0000000000..ad1c16ea8e
--- /dev/null
+++ b/packages/frontend-plugin-api/src/routing/useRouteRef.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 { RouteRef } from '@backstage/core-plugin-api';
+// eslint-disable-next-line @backstage/no-forbidden-package-imports
+import { RoutingContext } from '@backstage/frontend-app-api/src/routing/RoutingContext';
+import { useContext, useMemo } from 'react';
+import { useLocation } from 'react-router-dom';
+
+/** @public */
+export function useRouteRef(routeRef: RouteRef<any>): () => string {
+  const { pathname } = useLocation();
+  const resolver = useContext(RoutingContext);
+
+  const routeFunc = useMemo(
+    () => resolver && resolver.resolve(routeRef, { pathname }),
+    [resolver, routeRef, pathname],
+  );
+
+  if (!routeFunc) {
+    throw new Error(`Failed to resolve routeRef ${routeRef}`);
+  }
+
+  return routeFunc;
+}
diff --git a/packages/frontend-plugin-api/src/schema/createSchemaFromZod.test.ts b/packages/frontend-plugin-api/src/schema/createSchemaFromZod.test.ts
new file mode 100644
index 0000000000..90eba44249
--- /dev/null
+++ b/packages/frontend-plugin-api/src/schema/createSchemaFromZod.test.ts
@@ -0,0 +1,34 @@
+/*
+ * 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 { createSchemaFromZod } from './createSchemaFromZod';
+
+describe('createSchemaFromZod', () => {
+  it('should provide nice parse errors', () => {
+    const { parse } = createSchemaFromZod(z =>
+      z.object({
+        foo: z.union([z.string(), z.number()]),
+        derp: z.object({ bar: z.number() }),
+      }),
+    );
+
+    expect(() => parse({ derp: { bar: 'derp' } })).toThrow(
+      `Missing required value at 'foo'; Expected number, received string at 'derp.bar'`,
+    );
+    expect(() => parse(undefined)).toThrow(`Missing required value`);
+    expect(() => parse('derp')).toThrow(`Expected object, received string`);
+  });
+});
diff --git a/packages/frontend-plugin-api/src/schema/createSchemaFromZod.ts b/packages/frontend-plugin-api/src/schema/createSchemaFromZod.ts
new file mode 100644
index 0000000000..bfaf57f522
--- /dev/null
+++ b/packages/frontend-plugin-api/src/schema/createSchemaFromZod.ts
@@ -0,0 +1,54 @@
+/*
+ * Copyright 2023 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import { JsonObject } from '@backstage/types';
+import { z, ZodSchema, ZodTypeDef } from 'zod';
+import zodToJsonSchema from 'zod-to-json-schema';
+import { PortableSchema } from './types';
+
+/** @public */
+export function createSchemaFromZod<TOutput, TInput>(
+  schemaCreator: (zImpl: typeof z) => ZodSchema<TOutput, ZodTypeDef, TInput>,
+): PortableSchema<TOutput> {
+  const schema = schemaCreator(z);
+  return {
+    // TODO: Types allow z.array etc here but it will break stuff
+    parse: input => {
+      const result = schema.safeParse(input);
+      if (result.success) {
+        return result.data;
+      }
+
+      throw new Error(result.error.issues.map(formatIssue).join('; '));
+    },
+    // TODO: Verify why we are not compatible with the latest zodToJsonSchema.
+    schema: zodToJsonSchema(schema) as JsonObject,
+  };
+}
+
+function formatIssue(issue: z.ZodIssue): string {
+  if (issue.code === 'invalid_union') {
+    return formatIssue(issue.unionErrors[0].issues[0]);
+  }
+  let message = issue.message;
+  if (message === 'Required') {
+    message = `Missing required value`;
+  }
+  if (issue.path.length) {
+    message += ` at '${issue.path.join('.')}'`;
+  }
+  return message;
+}
diff --git a/packages/frontend-plugin-api/src/schema/index.ts b/packages/frontend-plugin-api/src/schema/index.ts
new file mode 100644
index 0000000000..7f21c4e07d
--- /dev/null
+++ b/packages/frontend-plugin-api/src/schema/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 { createSchemaFromZod } from './createSchemaFromZod';
+export { type PortableSchema } from './types';
diff --git a/packages/frontend-plugin-api/src/schema/types.ts b/packages/frontend-plugin-api/src/schema/types.ts
new file mode 100644
index 0000000000..9636d3b896
--- /dev/null
+++ b/packages/frontend-plugin-api/src/schema/types.ts
@@ -0,0 +1,23 @@
+/*
+ * 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 { JsonObject } from '@backstage/types';
+
+/** @public */
+export type PortableSchema<TOutput> = {
+  parse: (input: unknown) => TOutput;
+  schema: JsonObject;
+};
diff --git a/packages/frontend-plugin-api/src/setupTests.ts b/packages/frontend-plugin-api/src/setupTests.ts
new file mode 100644
index 0000000000..c30f1d15cb
--- /dev/null
+++ b/packages/frontend-plugin-api/src/setupTests.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.
+ */
+
+import '@testing-library/jest-dom';
diff --git a/packages/frontend-plugin-api/src/wiring/coreExtensionData.ts b/packages/frontend-plugin-api/src/wiring/coreExtensionData.ts
new file mode 100644
index 0000000000..1f4e4370c9
--- /dev/null
+++ b/packages/frontend-plugin-api/src/wiring/coreExtensionData.ts
@@ -0,0 +1,27 @@
+/*
+ * 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 { AnyApiFactory, RouteRef } from '@backstage/core-plugin-api';
+import { ComponentType } from 'react';
+import { createExtensionDataRef } from './createExtensionDataRef';
+
+/** @public */
+export const coreExtensionData = {
+  reactComponent: createExtensionDataRef<ComponentType>('core.reactComponent'),
+  routePath: createExtensionDataRef<string>('core.routing.path'),
+  apiFactory: createExtensionDataRef<AnyApiFactory>('core.api.factory'),
+  routeRef: createExtensionDataRef<RouteRef>('core.routing.ref'),
+};
diff --git a/packages/frontend-plugin-api/src/wiring/createExtension.test.ts b/packages/frontend-plugin-api/src/wiring/createExtension.test.ts
new file mode 100644
index 0000000000..a992642d61
--- /dev/null
+++ b/packages/frontend-plugin-api/src/wiring/createExtension.test.ts
@@ -0,0 +1,156 @@
+/*
+ * 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 { createExtension } from './createExtension';
+import { createExtensionDataRef } from './createExtensionDataRef';
+
+const stringData = createExtensionDataRef<string>('string');
+
+function unused(..._any: any[]) {}
+
+describe('createExtension', () => {
+  it('should create an extension with a simple output', () => {
+    const extension = createExtension({
+      id: 'test',
+      at: 'root',
+      output: {
+        foo: stringData,
+      },
+      factory({ bind }) {
+        bind({
+          foo: 'bar',
+        });
+        bind({
+          // @ts-expect-error
+          foo: 3,
+        });
+        bind({
+          // @ts-expect-error
+          bar: 'bar',
+        });
+        // @ts-expect-error
+        bind({});
+        // @ts-expect-error
+        bind();
+        // @ts-expect-error
+        bind('bar');
+      },
+    });
+    expect(extension.id).toBe('test');
+  });
+
+  it('should create an extension with a some optional output', () => {
+    const extension = createExtension({
+      id: 'test',
+      at: 'root',
+      output: {
+        foo: stringData,
+        bar: stringData.optional(),
+      },
+      factory({ bind }) {
+        bind({
+          foo: 'bar',
+        });
+        bind({
+          foo: 'bar',
+          bar: 'baz',
+        });
+        bind({
+          // @ts-expect-error
+          foo: 3,
+        });
+        bind({
+          foo: 'bar',
+          // @ts-expect-error
+          bar: 3,
+        });
+        // @ts-expect-error
+        bind({ bar: 'bar' });
+        // @ts-expect-error
+        bind({});
+        // @ts-expect-error
+        bind();
+        // @ts-expect-error
+        bind('bar');
+      },
+    });
+    expect(extension.id).toBe('test');
+  });
+
+  it('should create an extension with input', () => {
+    const extension = createExtension({
+      id: 'test',
+      at: 'root',
+      inputs: {
+        mixed: {
+          extensionData: {
+            required: stringData,
+            optional: stringData.optional(),
+          },
+        },
+        onlyRequired: {
+          extensionData: {
+            required: stringData,
+          },
+        },
+        onlyOptional: {
+          extensionData: {
+            optional: stringData.optional(),
+          },
+        },
+      },
+      output: {
+        foo: stringData,
+      },
+      factory({ bind, inputs }) {
+        const a1: string = inputs.mixed?.[0].required;
+        // @ts-expect-error
+        const a2: number = inputs.mixed?.[0].required;
+        // @ts-expect-error
+        const a3: any = inputs.mixed?.[0].nonExistent;
+        unused(a1, a2, a3);
+
+        const b1: string | undefined = inputs.mixed?.[0].optional;
+        // @ts-expect-error
+        const b2: string = inputs.mixed?.[0].optional;
+        // @ts-expect-error
+        const b3: number = inputs.mixed?.[0].optional;
+        // @ts-expect-error
+        const b4: number | undefined = inputs.mixed?.[0].optional;
+        unused(b1, b2, b3, b4);
+
+        const c1: string = inputs.onlyRequired?.[0].required;
+        // @ts-expect-error
+        const c2: number = inputs.onlyRequired?.[0].required;
+        unused(c1, c2);
+
+        const d1: string | undefined = inputs.onlyOptional?.[0].optional;
+        // @ts-expect-error
+        const d2: string = inputs.onlyOptional?.[0].optional;
+        // @ts-expect-error
+        const d3: number = inputs.onlyOptional?.[0].optional;
+        // @ts-expect-error
+        const d4: number | undefined = inputs.onlyOptional?.[0].optional;
+        unused(d1, d2, d3, d4);
+
+        bind({
+          foo: 'bar',
+        });
+      },
+    });
+    expect(extension.id).toBe('test');
+  });
+});
diff --git a/packages/frontend-plugin-api/src/wiring/createExtension.ts b/packages/frontend-plugin-api/src/wiring/createExtension.ts
new file mode 100644
index 0000000000..bcea03595b
--- /dev/null
+++ b/packages/frontend-plugin-api/src/wiring/createExtension.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 { PortableSchema } from '../schema';
+import { BackstagePlugin } from './createPlugin';
+import { AnyExtensionDataMap, Extension } from './types';
+
+/** @public */
+export type ExtensionDataInputValues<
+  TInputs extends { [name in string]: { extensionData: AnyExtensionDataMap } },
+> = {
+  [InputName in keyof TInputs]: Array<
+    {
+      [DataName in keyof TInputs[InputName]['extensionData'] as TInputs[InputName]['extensionData'][DataName]['config'] extends {
+        optional: true;
+      }
+        ? never
+        : DataName]: TInputs[InputName]['extensionData'][DataName]['T'];
+    } & {
+      [DataName in keyof TInputs[InputName]['extensionData'] as TInputs[InputName]['extensionData'][DataName]['config'] extends {
+        optional: true;
+      }
+        ? DataName
+        : never]?: TInputs[InputName]['extensionData'][DataName]['T'];
+    }
+  >;
+};
+
+/** @public */
+export type ExtensionDataBind<TMap extends AnyExtensionDataMap> = (
+  values: {
+    [DataName in keyof TMap as TMap[DataName]['config'] extends {
+      optional: true;
+    }
+      ? never
+      : DataName]: TMap[DataName]['T'];
+  } & {
+    [DataName in keyof TMap as TMap[DataName]['config'] extends {
+      optional: true;
+    }
+      ? DataName
+      : never]?: TMap[DataName]['T'];
+  },
+) => void;
+
+/** @public */
+export interface CreateExtensionOptions<
+  TOutput extends AnyExtensionDataMap,
+  TInputs extends Record<string, { extensionData: AnyExtensionDataMap }>,
+  TConfig,
+> {
+  id: string;
+  at: string;
+  disabled?: boolean;
+  inputs?: TInputs;
+  output: TOutput;
+  configSchema?: PortableSchema<TConfig>;
+  factory(options: {
+    source?: BackstagePlugin;
+    bind: ExtensionDataBind<TOutput>;
+    config: TConfig;
+    inputs: ExtensionDataInputValues<TInputs>;
+  }): void;
+}
+
+/** @public */
+export function createExtension<
+  TOutput extends AnyExtensionDataMap,
+  TInputs extends Record<string, { extensionData: AnyExtensionDataMap }>,
+  TConfig = never,
+>(
+  options: CreateExtensionOptions<TOutput, TInputs, TConfig>,
+): Extension<TConfig> {
+  return {
+    ...options,
+    disabled: options.disabled ?? false,
+    $$type: 'extension',
+    inputs: options.inputs ?? {},
+    factory({ bind, config, inputs }) {
+      // TODO: Simplify this, but TS wouldn't infer the input type for some reason
+      return options.factory({
+        bind,
+        config,
+        inputs: inputs as ExtensionDataInputValues<TInputs>,
+      });
+    },
+  };
+}
diff --git a/packages/frontend-plugin-api/src/wiring/createExtensionDataRef.ts b/packages/frontend-plugin-api/src/wiring/createExtensionDataRef.ts
new file mode 100644
index 0000000000..6d6309bee4
--- /dev/null
+++ b/packages/frontend-plugin-api/src/wiring/createExtensionDataRef.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.
+ */
+
+/** @public */
+export type ExtensionDataRef<
+  TData,
+  TConfig extends { optional?: true } = {},
+> = {
+  id: string;
+  T: TData;
+  config: TConfig;
+  $$type: 'extension-data';
+};
+
+/** @public */
+export interface ConfigurableExtensionDataRef<
+  TData,
+  TConfig extends { optional?: true } = {},
+> extends ExtensionDataRef<TData, TConfig> {
+  optional(): ConfigurableExtensionDataRef<TData, TData & { optional: true }>;
+}
+
+// TODO: change to options object with ID.
+/** @public */
+export function createExtensionDataRef<TData>(
+  id: string,
+): ConfigurableExtensionDataRef<TData> {
+  return {
+    id,
+    $$type: 'extension-data',
+    config: {},
+    optional() {
+      return { ...this, config: { ...this.config, optional: true } };
+    },
+  } as ConfigurableExtensionDataRef<TData>;
+}
diff --git a/packages/frontend-plugin-api/src/wiring/createPlugin.test.ts b/packages/frontend-plugin-api/src/wiring/createPlugin.test.ts
new file mode 100644
index 0000000000..724dad5143
--- /dev/null
+++ b/packages/frontend-plugin-api/src/wiring/createPlugin.test.ts
@@ -0,0 +1,190 @@
+/*
+ * 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 { createApp } from '@backstage/frontend-app-api';
+import { render, screen } from '@testing-library/react';
+import { createSchemaFromZod } from '../schema/createSchemaFromZod';
+import { createPlugin, BackstagePlugin } from './createPlugin';
+import { JsonObject } from '@backstage/types';
+import { createExtension } from './createExtension';
+import { createExtensionDataRef } from './createExtensionDataRef';
+import { coreExtensionData } from './coreExtensionData';
+
+const nameExtensionDataRef = createExtensionDataRef<string>('name');
+
+const TechRadarPage = createExtension({
+  id: 'plugin.techradar.page',
+  at: 'test.output/names',
+  output: {
+    name: nameExtensionDataRef,
+  },
+  factory({ bind }) {
+    bind({ name: 'TechRadar' });
+  },
+});
+
+const CatalogPage = createExtension({
+  id: 'plugin.catalog.page',
+  at: 'test.output/names',
+  output: {
+    name: nameExtensionDataRef,
+  },
+  configSchema: createSchemaFromZod(z =>
+    z.object({ name: z.string().default('Catalog') }),
+  ),
+  factory({ bind, config }) {
+    bind({ name: config.name });
+  },
+});
+
+const TechDocsAddon = createExtension({
+  id: 'plugin.techdocs.addon.example',
+  at: 'plugin.techdocs.page/addons',
+  output: {
+    name: nameExtensionDataRef,
+  },
+  configSchema: createSchemaFromZod(z =>
+    z.object({ name: z.string().default('TechDocsAddon') }),
+  ),
+  factory({ bind, config }) {
+    bind({ name: config.name });
+  },
+});
+
+const TechDocsPage = createExtension({
+  id: 'plugin.techdocs.page',
+  at: 'test.output/names',
+  inputs: {
+    addons: {
+      extensionData: {
+        name: nameExtensionDataRef,
+      },
+    },
+  },
+  output: {
+    name: nameExtensionDataRef,
+  },
+  factory({ bind, inputs }) {
+    bind({ name: `TechDocs-${inputs.addons.map(n => n.name).join('-')}` });
+  },
+});
+
+const outputExtension = createExtension({
+  id: 'test.output',
+  at: 'root',
+  inputs: {
+    names: {
+      extensionData: {
+        name: nameExtensionDataRef,
+      },
+    },
+  },
+  output: {
+    component: coreExtensionData.reactComponent,
+  },
+  factory({ bind, inputs }) {
+    bind({
+      component: () =>
+        React.createElement('span', {}, [
+          `Names: ${inputs.names.map(n => n.name).join(', ')}`,
+        ]),
+    });
+  },
+});
+
+function createTestAppRoot({
+  plugins,
+  config = {},
+}: {
+  plugins: BackstagePlugin[];
+  config: JsonObject;
+}) {
+  Object.defineProperty(process.env, 'APP_CONFIG', {
+    value: [
+      {
+        data: config,
+        context: 'test',
+      },
+    ],
+    configurable: true,
+  });
+
+  return createApp({ plugins: plugins }).createRoot();
+}
+
+describe('createPlugin', () => {
+  it('should create an empty plugin', () => {
+    const plugin = createPlugin({ id: 'empty' });
+
+    expect(plugin).toBeDefined();
+  });
+
+  it('should create a plugin with extension instances', () => {
+    const plugin = createPlugin({
+      id: 'empty',
+      extensions: [TechRadarPage, CatalogPage, outputExtension],
+    });
+    expect(plugin).toBeDefined();
+
+    render(
+      createTestAppRoot({
+        plugins: [plugin],
+        config: { app: { extensions: [{ 'core.router': false }] } },
+      }),
+    );
+
+    expect(screen.getByText('Names: TechRadar, Catalog')).toBeInTheDocument();
+  });
+
+  it('should create a plugin with nested extension instances', () => {
+    const plugin = createPlugin({
+      id: 'empty',
+      extensions: [
+        TechRadarPage,
+        CatalogPage,
+        TechDocsPage,
+        TechDocsAddon,
+        outputExtension,
+      ],
+    });
+    expect(plugin).toBeDefined();
+
+    render(
+      createTestAppRoot({
+        plugins: [plugin],
+        config: {
+          app: {
+            extensions: [
+              { 'core.router': false },
+              {
+                'plugin.catalog.page': {
+                  config: { name: 'CatalogRenamed' },
+                },
+              },
+            ],
+          },
+        },
+      }),
+    );
+
+    expect(
+      screen.getByText(
+        'Names: TechRadar, CatalogRenamed, TechDocs-TechDocsAddon',
+      ),
+    ).toBeInTheDocument();
+  });
+});
diff --git a/packages/frontend-plugin-api/src/wiring/createPlugin.ts b/packages/frontend-plugin-api/src/wiring/createPlugin.ts
new file mode 100644
index 0000000000..7f7e44ff03
--- /dev/null
+++ b/packages/frontend-plugin-api/src/wiring/createPlugin.ts
@@ -0,0 +1,39 @@
+/*
+ * 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 { Extension } from './types';
+
+/** @public */
+export interface PluginOptions {
+  id: string;
+  extensions?: Extension<unknown>[];
+}
+
+/** @public */
+export interface BackstagePlugin {
+  $$type: 'backstage-plugin';
+  id: string;
+  extensions: Extension<unknown>[];
+}
+
+/** @public */
+export function createPlugin(options: PluginOptions): BackstagePlugin {
+  return {
+    ...options,
+    $$type: 'backstage-plugin',
+    extensions: options.extensions ?? [],
+  };
+}
diff --git a/packages/frontend-plugin-api/src/wiring/index.ts b/packages/frontend-plugin-api/src/wiring/index.ts
new file mode 100644
index 0000000000..175200cf0c
--- /dev/null
+++ b/packages/frontend-plugin-api/src/wiring/index.ts
@@ -0,0 +1,34 @@
+/*
+ * 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 { coreExtensionData } from './coreExtensionData';
+export {
+  createExtension,
+  type CreateExtensionOptions,
+  type ExtensionDataBind,
+  type ExtensionDataInputValues,
+} from './createExtension';
+export {
+  createExtensionDataRef,
+  type ExtensionDataRef,
+  type ConfigurableExtensionDataRef,
+} from './createExtensionDataRef';
+export {
+  createPlugin,
+  type BackstagePlugin,
+  type PluginOptions,
+} from './createPlugin';
+export type { AnyExtensionDataMap, Extension } from './types';
diff --git a/packages/frontend-plugin-api/src/wiring/types.ts b/packages/frontend-plugin-api/src/wiring/types.ts
new file mode 100644
index 0000000000..dbe4633ff5
--- /dev/null
+++ b/packages/frontend-plugin-api/src/wiring/types.ts
@@ -0,0 +1,42 @@
+/*
+ * 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 { PortableSchema } from '../schema';
+import { ExtensionDataBind } from './createExtension';
+import { ExtensionDataRef } from './createExtensionDataRef';
+import { BackstagePlugin } from './createPlugin';
+
+/** @public */
+export type AnyExtensionDataMap = {
+  [name in string]: ExtensionDataRef<any, any>;
+};
+
+/** @public */
+export interface Extension<TConfig> {
+  $$type: 'extension';
+  id: string;
+  at: string;
+  disabled: boolean;
+  inputs: Record<string, { extensionData: AnyExtensionDataMap }>;
+  output: AnyExtensionDataMap;
+  configSchema?: PortableSchema<TConfig>;
+  factory(options: {
+    source?: BackstagePlugin;
+    bind: ExtensionDataBind<AnyExtensionDataMap>;
+    config: TConfig;
+    inputs: Record<string, Array<Record<string, unknown>>>;
+  }): void;
+}
diff --git a/packages/integration-aws-node/CHANGELOG.md b/packages/integration-aws-node/CHANGELOG.md
index f6d802fe1c..e251a013ea 100644
--- a/packages/integration-aws-node/CHANGELOG.md
+++ b/packages/integration-aws-node/CHANGELOG.md
@@ -1,5 +1,21 @@
 # @backstage/integration-aws-node
 
+## 0.1.6-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config@1.1.0-next.1
+  - @backstage/errors@1.2.1
+
+## 0.1.6-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config@1.1.0-next.0
+  - @backstage/errors@1.2.1
+
 ## 0.1.5
 
 ### Patch Changes
diff --git a/packages/integration-aws-node/catalog-info.yaml b/packages/integration-aws-node/catalog-info.yaml
new file mode 100644
index 0000000000..4c8264d575
--- /dev/null
+++ b/packages/integration-aws-node/catalog-info.yaml
@@ -0,0 +1,10 @@
+apiVersion: backstage.io/v1alpha1
+kind: Component
+metadata:
+  name: backstage-integration-aws-node
+  title: '@backstage/integration-aws-node'
+  description: Helpers for fetching AWS account credentials
+spec:
+  lifecycle: experimental
+  type: backstage-node-library
+  owner: maintainers
diff --git a/packages/integration-aws-node/package.json b/packages/integration-aws-node/package.json
index 808c976730..34d5aede67 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.5",
+  "version": "0.1.6-next.1",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "publishConfig": {
diff --git a/packages/integration-react/CHANGELOG.md b/packages/integration-react/CHANGELOG.md
index dd43ed34a0..5555d52bc9 100644
--- a/packages/integration-react/CHANGELOG.md
+++ b/packages/integration-react/CHANGELOG.md
@@ -1,5 +1,52 @@
 # @backstage/integration-react
 
+## 1.1.19-next.2
+
+### Patch Changes
+
+- 8cec7664e146: Removed `@types/node` dependency
+- Updated dependencies
+  - @backstage/core-components@0.13.5-next.2
+  - @backstage/core-plugin-api@1.6.0-next.2
+  - @backstage/config@1.1.0-next.1
+  - @backstage/integration@1.7.0-next.2
+  - @backstage/theme@0.4.1
+
+## 1.1.19-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.13.5-next.1
+  - @backstage/config@1.1.0-next.0
+  - @backstage/integration@1.7.0-next.1
+  - @backstage/core-plugin-api@1.6.0-next.1
+  - @backstage/theme@0.4.1
+
+## 1.1.18-next.0
+
+### Patch Changes
+
+- 482bb5c0bbf8: Moved `@types/react` to be a regular dependency
+- Updated dependencies
+  - @backstage/integration@1.7.0-next.0
+  - @backstage/core-plugin-api@1.6.0-next.0
+  - @backstage/core-components@0.13.5-next.0
+  - @backstage/config@1.0.8
+  - @backstage/theme@0.4.1
+
+## 1.1.16
+
+### Patch Changes
+
+- 12a8c94eda8d: Add package repository and homepage metadata
+- Updated dependencies
+  - @backstage/integration@1.6.0
+  - @backstage/core-components@0.13.4
+  - @backstage/core-plugin-api@1.5.3
+  - @backstage/config@1.0.8
+  - @backstage/theme@0.4.1
+
 ## 1.1.16-next.1
 
 ### Patch Changes
diff --git a/packages/integration-react/api-report.md b/packages/integration-react/api-report.md
index 3af0704990..c1a2e34907 100644
--- a/packages/integration-react/api-report.md
+++ b/packages/integration-react/api-report.md
@@ -3,8 +3,6 @@
 > Do not edit this file. It is a report generated by [API Extractor](https://api-extractor.com/).
 
 ```ts
-/// <reference types="react" />
-
 import { ApiFactory } from '@backstage/core-plugin-api';
 import { ApiRef } from '@backstage/core-plugin-api';
 import { AuthRequestOptions } from '@backstage/core-plugin-api';
@@ -13,6 +11,7 @@ import { Config } from '@backstage/config';
 import { OAuthApi } from '@backstage/core-plugin-api';
 import { OpenIdConnectApi } from '@backstage/core-plugin-api';
 import { ProfileInfoApi } from '@backstage/core-plugin-api';
+import { default as React_2 } from 'react';
 import { ScmIntegrationRegistry } from '@backstage/integration';
 import { SessionApi } from '@backstage/core-plugin-api';
 
@@ -108,7 +107,7 @@ export interface ScmAuthTokenResponse {
 // @public
 export const ScmIntegrationIcon: (
   props: ScmIntegrationIconProps,
-) => JSX.Element;
+) => React_2.JSX.Element;
 
 // @public
 export type ScmIntegrationIconProps = {
diff --git a/packages/integration-react/catalog-info.yaml b/packages/integration-react/catalog-info.yaml
new file mode 100644
index 0000000000..8df5e52c95
--- /dev/null
+++ b/packages/integration-react/catalog-info.yaml
@@ -0,0 +1,10 @@
+apiVersion: backstage.io/v1alpha1
+kind: Component
+metadata:
+  name: backstage-integration-react
+  title: '@backstage/integration-react'
+  description: Frontend package for managing integrations towards external systems
+spec:
+  lifecycle: production
+  type: backstage-web-library
+  owner: maintainers
diff --git a/packages/integration-react/package.json b/packages/integration-react/package.json
index 71f7597635..f20d7dd662 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.16-next.1",
+  "version": "1.1.19-next.2",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
@@ -19,6 +19,7 @@
     "url": "https://github.com/backstage/backstage",
     "directory": "packages/integration-react"
   },
+  "sideEffects": false,
   "scripts": {
     "build": "backstage-cli package build",
     "start": "backstage-cli package start",
@@ -37,6 +38,7 @@
     "@material-ui/core": "^4.12.2",
     "@material-ui/icons": "^4.9.1",
     "@material-ui/lab": "4.0.0-alpha.61",
+    "@types/react": "^16.13.1 || ^17.0.0",
     "react-use": "^17.2.4"
   },
   "peerDependencies": {
@@ -52,8 +54,6 @@
     "@testing-library/jest-dom": "^5.10.1",
     "@testing-library/react": "^12.1.3",
     "@testing-library/user-event": "^14.0.0",
-    "@types/node": "^16.11.26",
-    "@types/react": "^16.13.1 || ^17.0.0",
     "msw": "^1.0.0"
   },
   "files": [
diff --git a/packages/integration/CHANGELOG.md b/packages/integration/CHANGELOG.md
index d1f3f46306..c9bb363d4c 100644
--- a/packages/integration/CHANGELOG.md
+++ b/packages/integration/CHANGELOG.md
@@ -1,5 +1,66 @@
 # @backstage/integration
 
+## 1.7.0-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config@1.1.0-next.1
+  - @backstage/errors@1.2.1
+
+## 1.7.0-next.1
+
+### Patch Changes
+
+- 2d2fc9d20ebb: Additional fix for Gitiles auth links
+- Updated dependencies
+  - @backstage/config@1.1.0-next.0
+  - @backstage/errors@1.2.1
+
+## 1.7.0-next.0
+
+### Minor Changes
+
+- 5f1a92b9f19f: Added `AzureDevOpsCredentialsProvider` to support multiple Azure DevOps organizations and **deprecated** `AzureIntegrationConfig.credential` and `AzureIntegrationConfig.token` in favour of `AzureIntegrationConfig.credentials`. You can now use specific credentials for different Azure DevOps (Server) organizations by specifying the `organizations` field on a credential:
+
+  ```yaml
+  integrations:
+    azure:
+      - host: dev.azure.com
+        credentials:
+          - organizations:
+              - my-org
+              - my-other-org
+            clientId: ${AZURE_CLIENT_ID}
+            clientSecret: ${AZURE_CLIENT_SECRET}
+            tenantId: ${AZURE_TENANT_ID}
+          - organizations:
+              - yet-another-org
+            personalAccessToken: ${PERSONAL_ACCESS_TOKEN}
+  ```
+
+  See the [Azure integration documentation](https://backstage.io/docs/integrations/azure/locations) for more information.
+
+### Patch Changes
+
+- cb2e19d82d95: Gitiles: Fixed auth prefix issue
+- Updated dependencies
+  - @backstage/config@1.0.8
+  - @backstage/errors@1.2.1
+
+## 1.6.0
+
+### Minor Changes
+
+- 443afcf7f567: Added `buildGerritGitilesArchiveUrl()` to construct a Gitiles URL to download an archive.
+  Gitiles URL that uses an authenticated prefix (`/a/`) can now be parsed by the integration.
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config@1.0.8
+  - @backstage/errors@1.2.1
+
 ## 1.5.1
 
 ### Patch Changes
diff --git a/packages/integration/api-report.md b/packages/integration/api-report.md
index c2501b4ac2..f64c06257e 100644
--- a/packages/integration/api-report.md
+++ b/packages/integration/api-report.md
@@ -39,16 +39,58 @@ export type AwsS3IntegrationConfig = {
 };
 
 // @public
-export type AzureClientSecretCredential = {
+export type AzureClientSecretCredential = AzureCredentialBase & {
+  kind: 'ClientSecret';
   tenantId: string;
   clientId: string;
   clientSecret: string;
 };
 
 // @public
-export type AzureCredential =
+export type AzureCredentialBase = {
+  kind: AzureDevOpsCredentialKind;
+  organizations?: string[];
+};
+
+// @public
+export type AzureDevOpsCredential =
   | AzureClientSecretCredential
-  | AzureManagedIdentityCredential;
+  | AzureManagedIdentityCredential
+  | PersonalAccessTokenCredential;
+
+// @public
+export type AzureDevOpsCredentialKind =
+  | 'PersonalAccessToken'
+  | 'ClientSecret'
+  | 'ManagedIdentity';
+
+// @public
+export type AzureDevOpsCredentialLike = Omit<
+  Partial<AzureClientSecretCredential> &
+    Partial<AzureManagedIdentityCredential> &
+    Partial<PersonalAccessTokenCredential>,
+  'kind'
+>;
+
+// @public
+export type AzureDevOpsCredentials = {
+  headers: {
+    [name: string]: string;
+  };
+  token: string;
+  type: AzureDevOpsCredentialType;
+};
+
+// @public
+export interface AzureDevOpsCredentialsProvider {
+  // (undocumented)
+  getCredentials(opts: {
+    url: string;
+  }): Promise<AzureDevOpsCredentials | undefined>;
+}
+
+// @public
+export type AzureDevOpsCredentialType = 'bearer' | 'pat';
 
 // @public
 export class AzureIntegration implements ScmIntegration {
@@ -75,11 +117,13 @@ export class AzureIntegration implements ScmIntegration {
 export type AzureIntegrationConfig = {
   host: string;
   token?: string;
-  credential?: AzureCredential;
+  credential?: AzureDevOpsCredential;
+  credentials?: AzureDevOpsCredential[];
 };
 
 // @public
-export type AzureManagedIdentityCredential = {
+export type AzureManagedIdentityCredential = AzureCredentialBase & {
+  kind: 'ManagedIdentity';
   clientId: string;
 };
 
@@ -172,6 +216,28 @@ export type BitbucketServerIntegrationConfig = {
   password?: string;
 };
 
+// @public
+export function buildGerritGitilesArchiveUrl(
+  config: GerritIntegrationConfig,
+  project: string,
+  branch: string,
+  filePath: string,
+): string;
+
+// @public
+export class DefaultAzureDevOpsCredentialsProvider
+  implements AzureDevOpsCredentialsProvider
+{
+  // (undocumented)
+  static fromIntegrations(
+    integrations: ScmIntegrationRegistry,
+  ): DefaultAzureDevOpsCredentialsProvider;
+  // (undocumented)
+  getCredentials(opts: {
+    url: string;
+  }): Promise<AzureDevOpsCredentials | undefined>;
+}
+
 // @public
 export class DefaultGithubCredentialsProvider
   implements GithubCredentialsProvider
@@ -242,7 +308,7 @@ export function getAzureDownloadUrl(url: string): string;
 // @public
 export function getAzureFileFetchUrl(url: string): string;
 
-// @public
+// @public @deprecated
 export function getAzureRequestOptions(
   config: AzureIntegrationConfig,
   additionalHeaders?: Record<string, string>,
@@ -592,6 +658,12 @@ export function parseGerritGitilesUrl(
 // @public
 export function parseGerritJsonResponse(response: Response): Promise<unknown>;
 
+// @public
+export type PersonalAccessTokenCredential = AzureCredentialBase & {
+  kind: 'PersonalAccessToken';
+  personalAccessToken: string;
+};
+
 // @public
 export function readAwsS3IntegrationConfig(
   config: Config,
diff --git a/packages/integration/catalog-info.yaml b/packages/integration/catalog-info.yaml
new file mode 100644
index 0000000000..7f602c42be
--- /dev/null
+++ b/packages/integration/catalog-info.yaml
@@ -0,0 +1,10 @@
+apiVersion: backstage.io/v1alpha1
+kind: Component
+metadata:
+  name: backstage-integration
+  title: '@backstage/integration'
+  description: Helpers for managing integrations towards external systems
+spec:
+  lifecycle: production
+  type: backstage-common-library
+  owner: maintainers
diff --git a/packages/integration/config.d.ts b/packages/integration/config.d.ts
index a1eb7aceb9..9c08ec03a9 100644
--- a/packages/integration/config.d.ts
+++ b/packages/integration/config.d.ts
@@ -30,8 +30,38 @@ export interface Config {
       /**
        * Token used to authenticate requests.
        * @visibility secret
+       * @deprecated Use `credentials` instead.
        */
       token?: string;
+
+      /**
+       * The credential to use for requests.
+       *
+       * If no credential is specified anonymous access is used.
+       *
+       * @visibility secret
+       * @deprecated Use `credentials` instead.
+       */
+      credential?: {
+        clientId?: string;
+        clientSecret?: string;
+        tenantId?: string;
+        personalAccessToken?: string;
+      };
+
+      /**
+       * The credentials to use for requests. If multiple credentials are specified the first one that matches the organization is used.
+       * If not organization matches the first credential without an organization is used.
+       *
+       * If no credentials are specified at all, either a default credential (for Azure DevOps) or anonymous access (for Azure DevOps Server) is used.
+       * @visibility secret
+       */
+      credentials?: {
+        clientId?: string;
+        clientSecret?: string;
+        tenantId?: string;
+        personalAccessToken?: string;
+      }[];
     }>;
 
     /**
diff --git a/packages/integration/package.json b/packages/integration/package.json
index e02e070266..3e4f7ec2f2 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.5.1",
+  "version": "1.7.0-next.2",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
@@ -23,6 +23,7 @@
   "keywords": [
     "backstage"
   ],
+  "sideEffects": false,
   "scripts": {
     "build": "backstage-cli package build",
     "lint": "backstage-cli package lint",
diff --git a/packages/integration/src/azure/AzureIntegration.ts b/packages/integration/src/azure/AzureIntegration.ts
index d036d88c21..fe2cbf349c 100644
--- a/packages/integration/src/azure/AzureIntegration.ts
+++ b/packages/integration/src/azure/AzureIntegration.ts
@@ -29,6 +29,7 @@ export class AzureIntegration implements ScmIntegration {
     const configs = readAzureIntegrationConfigs(
       config.getOptionalConfigArray('integrations.azure') ?? [],
     );
+
     return basicIntegrations(
       configs.map(c => new AzureIntegration(c)),
       i => i.config.host,
diff --git a/packages/integration/src/azure/CachedAzureDevOpsCredentialsProvider.test.ts b/packages/integration/src/azure/CachedAzureDevOpsCredentialsProvider.test.ts
new file mode 100644
index 0000000000..c9fbb4c324
--- /dev/null
+++ b/packages/integration/src/azure/CachedAzureDevOpsCredentialsProvider.test.ts
@@ -0,0 +1,188 @@
+/*
+ * 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 { CachedAzureDevOpsCredentialsProvider } from './CachedAzureDevOpsCredentialsProvider';
+import {
+  AccessToken,
+  ClientSecretCredential,
+  ManagedIdentityCredential,
+} from '@azure/identity';
+
+const MockedClientSecretCredential = ClientSecretCredential as jest.MockedClass<
+  typeof ClientSecretCredential
+>;
+
+const MockedManagedIdentityCredential =
+  ManagedIdentityCredential as jest.MockedClass<
+    typeof ManagedIdentityCredential
+  >;
+
+jest.mock('@azure/identity');
+
+const seconds = (s: number) => s * 1000;
+const minutes = (m: number) => seconds(60) * m;
+const hours = (h: number) => minutes(60) * h;
+
+describe('CachedAzureDevOpsCredentialsProvider', () => {
+  beforeEach(() => {
+    jest.resetAllMocks();
+
+    MockedClientSecretCredential.prototype.getToken.mockImplementation(() =>
+      Promise.resolve({
+        expiresOnTimestamp: Date.now() + hours(8),
+        token: 'fake-client-secret-token',
+      } as AccessToken),
+    );
+
+    MockedManagedIdentityCredential.prototype.getToken.mockImplementation(() =>
+      Promise.resolve({
+        expiresOnTimestamp: Date.now() + hours(8),
+        token: 'fake-managed-identity-token',
+      } as AccessToken),
+    );
+  });
+
+  it('Should return a pat credential when a personal access token is configured', async () => {
+    const manager =
+      CachedAzureDevOpsCredentialsProvider.fromAzureDevOpsCredential({
+        kind: 'PersonalAccessToken',
+        personalAccessToken: 'token',
+      });
+    const { headers, type, token } = await manager.getCredentials();
+
+    expect(headers).toStrictEqual({
+      Authorization: `Basic ${btoa(`:${token}`)}`,
+    });
+
+    expect(type).toBe('pat');
+    expect(token).toBe('token');
+  });
+
+  it('Should return a bearer credential when a client secret is configured', async () => {
+    const manager =
+      CachedAzureDevOpsCredentialsProvider.fromAzureDevOpsCredential({
+        kind: 'ClientSecret',
+        clientId: 'id',
+        clientSecret: 'secret',
+        tenantId: 'tenantId',
+      });
+
+    const { headers, type, token } = await manager.getCredentials();
+
+    expect(headers).toStrictEqual({
+      Authorization: `Bearer fake-client-secret-token`,
+    });
+
+    expect(type).toBe('bearer');
+    expect(token).toBe('fake-client-secret-token');
+  });
+
+  it('Should return a bearer credential when a managed identity is configured', async () => {
+    const manager =
+      CachedAzureDevOpsCredentialsProvider.fromAzureDevOpsCredential({
+        kind: 'ManagedIdentity',
+        clientId: 'id',
+      });
+
+    const { headers, type, token } = await manager.getCredentials();
+
+    expect(headers).toStrictEqual({
+      Authorization: `Bearer fake-managed-identity-token`,
+    });
+
+    expect(type).toBe('bearer');
+    expect(token).toBe('fake-managed-identity-token');
+  });
+
+  it('Should not refresh the client secret token when it does not expire within 10 minutes', async () => {
+    const manager =
+      CachedAzureDevOpsCredentialsProvider.fromAzureDevOpsCredential({
+        kind: 'ClientSecret',
+        clientId: 'id',
+        clientSecret: 'secret',
+        tenantId: 'tenantId',
+      });
+
+    await manager.getCredentials();
+    await manager.getCredentials();
+    await manager.getCredentials();
+
+    expect(
+      MockedClientSecretCredential.prototype.getToken,
+    ).toHaveBeenCalledTimes(1);
+  });
+
+  it('Should return the managed identity token when it does not expire within 10 minutes', async () => {
+    const manager =
+      CachedAzureDevOpsCredentialsProvider.fromAzureDevOpsCredential({
+        kind: 'ManagedIdentity',
+        clientId: 'id',
+      });
+
+    await manager.getCredentials();
+    await manager.getCredentials();
+    await manager.getCredentials();
+
+    expect(
+      MockedManagedIdentityCredential.prototype.getToken,
+    ).toHaveBeenCalledTimes(1);
+  });
+
+  it('Should refresh the client secret token when it expires within 10 minutes', async () => {
+    const manager =
+      CachedAzureDevOpsCredentialsProvider.fromAzureDevOpsCredential({
+        kind: 'ClientSecret',
+        clientId: 'id',
+        clientSecret: 'secret',
+        tenantId: 'tenantId',
+      });
+
+    MockedClientSecretCredential.prototype.getToken.mockImplementation(() =>
+      Promise.resolve({
+        expiresOnTimestamp: Date.now() + minutes(9) + seconds(59),
+        token: 'fake-client-secret-token',
+      } as AccessToken),
+    );
+
+    await manager.getCredentials();
+    await manager.getCredentials();
+
+    expect(
+      MockedClientSecretCredential.prototype.getToken,
+    ).toHaveBeenCalledTimes(2);
+  });
+
+  it('Should refresh the managed identity token when it expires within 10 minutes', async () => {
+    const manager =
+      CachedAzureDevOpsCredentialsProvider.fromAzureDevOpsCredential({
+        kind: 'ManagedIdentity',
+        clientId: 'id',
+      });
+
+    MockedManagedIdentityCredential.prototype.getToken.mockImplementation(() =>
+      Promise.resolve({
+        expiresOnTimestamp: Date.now() + minutes(9) + seconds(59),
+        token: 'fake-managed-identity-token',
+      } as AccessToken),
+    );
+
+    await manager.getCredentials();
+    await manager.getCredentials();
+
+    expect(
+      MockedManagedIdentityCredential.prototype.getToken,
+    ).toHaveBeenCalledTimes(2);
+  });
+});
diff --git a/packages/integration/src/azure/CachedAzureDevOpsCredentialsProvider.ts b/packages/integration/src/azure/CachedAzureDevOpsCredentialsProvider.ts
new file mode 100644
index 0000000000..aee4cefc41
--- /dev/null
+++ b/packages/integration/src/azure/CachedAzureDevOpsCredentialsProvider.ts
@@ -0,0 +1,127 @@
+/*
+ * 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 { AzureDevOpsCredential, PersonalAccessTokenCredential } from './config';
+import {
+  ClientSecretCredential,
+  ManagedIdentityCredential,
+  TokenCredential,
+} from '@azure/identity';
+import {
+  AzureDevOpsCredentials,
+  AzureDevOpsCredentialsProvider,
+} from './types';
+
+type CachedAzureDevOpsCredentials = AzureDevOpsCredentials & {
+  expiresAt?: number;
+};
+
+function exhaustiveCheck(_param: never) {}
+
+const tenMinutes = 1000 * 60 * 10;
+
+/**
+ * A credentials provider that caches the credentials for as long as it is valid.
+ *
+ * @public
+ */
+export class CachedAzureDevOpsCredentialsProvider
+  implements AzureDevOpsCredentialsProvider
+{
+  azureDevOpsScope = '499b84ac-1321-427f-aa17-267ca6975798/.default';
+  cached: CachedAzureDevOpsCredentials | undefined;
+
+  static fromAzureDevOpsCredential(
+    credential: AzureDevOpsCredential,
+  ): CachedAzureDevOpsCredentialsProvider {
+    switch (credential.kind) {
+      case 'PersonalAccessToken':
+        return CachedAzureDevOpsCredentialsProvider.fromPersonalAccessTokenCredential(
+          credential,
+        );
+      case 'ClientSecret':
+        return CachedAzureDevOpsCredentialsProvider.fromTokenCredential(
+          new ClientSecretCredential(
+            credential.tenantId,
+            credential.clientId,
+            credential.clientSecret,
+          ),
+        );
+      case 'ManagedIdentity':
+        return CachedAzureDevOpsCredentialsProvider.fromTokenCredential(
+          new ManagedIdentityCredential(credential.clientId),
+        );
+      default:
+        exhaustiveCheck(credential);
+
+        throw new Error(
+          `Credential kind '${(credential as any).kind}' not supported`,
+        );
+    }
+  }
+
+  static fromTokenCredential(
+    credential: TokenCredential,
+  ): CachedAzureDevOpsCredentialsProvider {
+    return new CachedAzureDevOpsCredentialsProvider(credential);
+  }
+
+  static fromPersonalAccessTokenCredential(
+    credential: PersonalAccessTokenCredential,
+  ) {
+    return new CachedAzureDevOpsCredentialsProvider(
+      credential.personalAccessToken,
+    );
+  }
+
+  private constructor(private readonly credential: TokenCredential | string) {}
+
+  async getCredentials(): Promise<AzureDevOpsCredentials> {
+    if (
+      this.cached === undefined ||
+      (this.cached.expiresAt !== undefined &&
+        Date.now() > this.cached.expiresAt)
+    ) {
+      if (typeof this.credential === 'string') {
+        this.cached = {
+          headers: {
+            Authorization: `Basic ${btoa(`:${this.credential}`)}`,
+          },
+          type: 'pat',
+          token: this.credential,
+        };
+      } else {
+        const accessToken = await this.credential.getToken(
+          this.azureDevOpsScope,
+        );
+
+        if (!accessToken) {
+          throw new Error('Failed to retrieve access token');
+        }
+
+        this.cached = {
+          expiresAt: accessToken.expiresOnTimestamp - tenMinutes,
+          headers: {
+            Authorization: `Bearer ${accessToken.token}`,
+          },
+          type: 'bearer',
+          token: accessToken.token,
+        };
+      }
+    }
+
+    return this.cached;
+  }
+}
diff --git a/packages/integration/src/azure/DefaultAzureDevOpsCredentialsProvider.test.ts b/packages/integration/src/azure/DefaultAzureDevOpsCredentialsProvider.test.ts
new file mode 100644
index 0000000000..8f66d5742d
--- /dev/null
+++ b/packages/integration/src/azure/DefaultAzureDevOpsCredentialsProvider.test.ts
@@ -0,0 +1,465 @@
+/*
+ * 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 { ScmIntegrations } from '../ScmIntegrations';
+import { CachedAzureDevOpsCredentialsProvider } from './CachedAzureDevOpsCredentialsProvider';
+import { AzureDevOpsCredentialLike, AzureIntegrationConfig } from './config';
+import { ConfigReader } from '@backstage/config';
+import { DefaultAzureDevOpsCredentialsProvider } from './DefaultAzureDevOpsCredentialsProvider';
+import {
+  AccessToken,
+  ClientSecretCredential,
+  DefaultAzureCredential,
+  ManagedIdentityCredential,
+} from '@azure/identity';
+import { DateTime } from 'luxon';
+
+type AzureIntegrationConfigLike = Partial<
+  Omit<AzureIntegrationConfig, 'credential' | 'credentials'>
+> & {
+  credential?: Partial<AzureDevOpsCredentialLike>;
+  credentials?: Partial<AzureDevOpsCredentialLike>[];
+};
+
+const MockedClientSecretCredential = ClientSecretCredential as jest.MockedClass<
+  typeof ClientSecretCredential
+>;
+
+const MockedManagedIdentityCredential =
+  ManagedIdentityCredential as jest.MockedClass<
+    typeof ManagedIdentityCredential
+  >;
+
+const MockedDefaultAzureCredential = DefaultAzureCredential as jest.MockedClass<
+  typeof DefaultAzureCredential
+>;
+
+jest.mock('@azure/identity');
+
+describe('DefaultAzureDevOpsCredentialProvider', () => {
+  const buildProvider = (azureIntegrations: AzureIntegrationConfigLike[]) =>
+    DefaultAzureDevOpsCredentialsProvider.fromIntegrations(
+      ScmIntegrations.fromConfig(
+        new ConfigReader({
+          integrations: {
+            azure: azureIntegrations,
+          },
+        }),
+      ),
+    );
+
+  beforeEach(() => {
+    jest.resetAllMocks();
+
+    MockedClientSecretCredential.prototype.getToken.mockImplementation(() =>
+      Promise.resolve({
+        expiresOnTimestamp: DateTime.local().plus({ days: 1 }).toSeconds(),
+        token: 'fake-client-secret-token',
+      } as AccessToken),
+    );
+
+    MockedManagedIdentityCredential.prototype.getToken.mockImplementation(() =>
+      Promise.resolve({
+        expiresOnTimestamp: DateTime.local().plus({ days: 1 }).toSeconds(),
+        token: 'fake-managed-identity-token',
+      } as AccessToken),
+    );
+
+    MockedDefaultAzureCredential.prototype.getToken.mockImplementation(() =>
+      Promise.resolve({
+        expiresOnTimestamp: DateTime.local().plus({ days: 1 }).toSeconds(),
+        token: 'fake-default-azure-credential-token',
+      } as AccessToken),
+    );
+
+    jest.spyOn(
+      CachedAzureDevOpsCredentialsProvider,
+      'fromAzureDevOpsCredential',
+    );
+
+    jest.spyOn(CachedAzureDevOpsCredentialsProvider, 'fromTokenCredential');
+
+    jest.spyOn(
+      CachedAzureDevOpsCredentialsProvider,
+      'fromPersonalAccessTokenCredential',
+    );
+  });
+
+  describe('fromIntegrations', () => {
+    it('Should create a credential provider when a credential is specified', async () => {
+      const provider = buildProvider([
+        {
+          host: 'dev.azure.com',
+          credentials: [
+            {
+              personalAccessToken: 'pat',
+            },
+          ],
+        },
+      ]);
+
+      expect(provider).toBeDefined();
+      expect(
+        CachedAzureDevOpsCredentialsProvider.fromAzureDevOpsCredential,
+      ).toHaveBeenCalledTimes(1);
+    });
+
+    it('Should create a single credential provider per credential', async () => {
+      const provider = buildProvider([
+        {
+          host: 'dev.azure.com',
+          credentials: [
+            {
+              organizations: ['org1', 'org2'],
+              clientId: 'client-id-1',
+            },
+            {
+              organizations: ['org3', 'org4'],
+              clientId: 'client-id-2',
+            },
+          ],
+        },
+      ]);
+
+      expect(provider).toBeDefined();
+      expect(
+        CachedAzureDevOpsCredentialsProvider.fromAzureDevOpsCredential,
+      ).toHaveBeenCalledTimes(2);
+    });
+
+    it('Should create a default credential provider for Azure DevOps when no credential is specified', async () => {
+      const provider = buildProvider([
+        {
+          host: 'dev.azure.com',
+          credentials: [],
+        },
+      ]);
+
+      expect(provider).toBeDefined();
+      expect(
+        CachedAzureDevOpsCredentialsProvider.fromTokenCredential,
+      ).toHaveBeenCalledTimes(1);
+
+      expect(
+        CachedAzureDevOpsCredentialsProvider.fromTokenCredential,
+      ).toHaveBeenCalledWith(new DefaultAzureCredential());
+    });
+
+    it('Should create a default credential provider for Azure DevOps when no default credential is specified', async () => {
+      const provider = buildProvider([
+        {
+          host: 'dev.azure.com',
+          credentials: [
+            {
+              organizations: ['org1', 'org2'],
+              clientId: 'client-id',
+              tenantId: 'tenant-id',
+              clientSecret: 'client-secret',
+            },
+          ],
+        },
+      ]);
+
+      expect(provider).toBeDefined();
+      expect(
+        CachedAzureDevOpsCredentialsProvider.fromTokenCredential,
+      ).toHaveBeenCalledTimes(2);
+
+      expect(
+        CachedAzureDevOpsCredentialsProvider.fromTokenCredential,
+      ).toHaveBeenCalledWith(new DefaultAzureCredential());
+    });
+
+    it('Should not create a default credential provider for Azure DevOps when another default credential is specified', async () => {
+      const provider = buildProvider([
+        {
+          host: 'dev.azure.com',
+          credentials: [
+            {
+              clientId: 'client-id',
+              tenantId: 'tenant-id',
+              clientSecret: 'client-secret',
+            },
+          ],
+        },
+      ]);
+
+      expect(provider).toBeDefined();
+      expect(
+        CachedAzureDevOpsCredentialsProvider.fromTokenCredential,
+      ).toHaveBeenCalledTimes(1);
+
+      expect(
+        CachedAzureDevOpsCredentialsProvider.fromTokenCredential,
+      ).toHaveBeenCalledWith(expect.any(ClientSecretCredential));
+    });
+
+    it('Should not create a default credential provider for on-premise Azure DevOps server when no credential is specified', async () => {
+      const provider = buildProvider([
+        {
+          host: 'my.devops.server',
+          credentials: [],
+        },
+      ]);
+
+      expect(provider).toBeDefined();
+      expect(
+        CachedAzureDevOpsCredentialsProvider.fromAzureDevOpsCredential,
+      ).toHaveBeenCalledTimes(0);
+
+      // expect 1 call because the Azure integration adds a default integration for dev.azure.com when it is not configured
+      expect(
+        CachedAzureDevOpsCredentialsProvider.fromTokenCredential,
+      ).toHaveBeenCalledTimes(1);
+
+      expect(
+        CachedAzureDevOpsCredentialsProvider.fromPersonalAccessTokenCredential,
+      ).toHaveBeenCalledTimes(0);
+    });
+  });
+
+  describe('getCredentials', () => {
+    describe('Azure DevOps (dev.azure.com)', () => {
+      it('Should return a token when a credential with the same organization is specified', async () => {
+        const provider = buildProvider([
+          {
+            host: 'dev.azure.com',
+            credentials: [
+              {
+                organizations: ['org1'],
+                personalAccessToken: 'pat',
+              },
+            ],
+          },
+        ]);
+
+        const credentials = provider.getCredentials({
+          url: 'https://dev.azure.com/org1/project1',
+        });
+
+        expect(credentials).toBeDefined();
+      });
+
+      it('Should return DefaultAzureCredential when no credential with the same organization is specified and host is dev.azure.com', async () => {
+        const provider = buildProvider([
+          {
+            host: 'dev.azure.com',
+            credentials: [
+              {
+                organizations: ['org1'],
+                personalAccessToken: 'pat',
+              },
+            ],
+          },
+        ]);
+
+        const credentials = await provider.getCredentials({
+          url: 'https://dev.azure.com/org2/project1',
+        });
+
+        expect(credentials).toMatchObject({
+          token: 'fake-default-azure-credential-token',
+        });
+      });
+
+      it('Should return undefined when no credential is specified and host is Azure DevOps server', async () => {
+        const provider = buildProvider([
+          {
+            host: 'my.devops.server',
+            credentials: [],
+          },
+        ]);
+
+        const credentials = await provider.getCredentials({
+          url: 'https://my.devops.server/org2/project1',
+        });
+
+        expect(credentials).toBeUndefined();
+      });
+
+      it('Should prefer organization credential when a credential with the same organization is specified', async () => {
+        const provider = buildProvider([
+          {
+            host: 'dev.azure.com',
+            credentials: [
+              {
+                personalAccessToken: 'fallback-pat',
+              },
+              {
+                organizations: ['org1'],
+                personalAccessToken: 'org1-pat',
+              },
+            ],
+          },
+        ]);
+
+        const credentials = await provider.getCredentials({
+          url: 'https://dev.azure.com/org1/project1',
+        });
+
+        expect(credentials).toMatchObject({
+          token: 'org1-pat',
+        });
+      });
+
+      it('Should fallback to host credential when no credential with the same organization is specified', async () => {
+        const provider = buildProvider([
+          {
+            host: 'dev.azure.com',
+            credentials: [
+              {
+                personalAccessToken: 'fallback-pat',
+              },
+              {
+                organizations: ['org1'],
+                personalAccessToken: 'org1-pat',
+              },
+            ],
+          },
+        ]);
+
+        const credentials = await provider.getCredentials({
+          url: 'https://dev.azure.com/org2/project1',
+        });
+
+        expect(credentials).toMatchObject({
+          token: 'fallback-pat',
+        });
+      });
+    });
+    describe('Azure DevOps Server', () => {
+      [
+        'https://{host}/{organization}/{project}',
+        'https://{host}/tfs/{organization}/{project}',
+      ].map(format => {
+        describe(`With url format ${format}`, () => {
+          const formatUrl = (opts: {
+            host: string;
+            organization: string;
+            project: string;
+          }) =>
+            format
+              .replace('{host}', opts.host)
+              .replace('{organization}', opts.organization)
+              .replace('{project}', opts.project);
+
+          it('Should return a token when a credential with the same host is specified', async () => {
+            const provider = buildProvider([
+              {
+                host: 'my.devops.server',
+                credentials: [
+                  {
+                    personalAccessToken: 'pat',
+                  },
+                ],
+              },
+            ]);
+
+            const credentials = await provider.getCredentials({
+              url: formatUrl({
+                host: 'my.devops.server',
+                organization: 'org1',
+                project: 'project1',
+              }),
+            });
+
+            expect(credentials).toBeDefined();
+          });
+
+          it('Should prefer organization credential when a credential with the same organization is specified', async () => {
+            const provider = buildProvider([
+              {
+                host: 'my.devops.server',
+                credentials: [
+                  {
+                    personalAccessToken: 'fallback-pat',
+                  },
+                  {
+                    organizations: ['org1'],
+                    personalAccessToken: 'org1-pat',
+                  },
+                ],
+              },
+            ]);
+
+            const credentials = await provider.getCredentials({
+              url: formatUrl({
+                host: 'my.devops.server',
+                organization: 'org1',
+                project: 'project1',
+              }),
+            });
+
+            expect(credentials).toMatchObject({
+              token: 'org1-pat',
+            });
+          });
+
+          it('Should fallback to host credential when no credential with the same organization is specified', async () => {
+            const provider = buildProvider([
+              {
+                host: 'my.devops.server',
+                credentials: [
+                  {
+                    personalAccessToken: 'fallback-pat',
+                  },
+                  {
+                    organizations: ['org1'],
+                    personalAccessToken: 'org1-pat',
+                  },
+                ],
+              },
+            ]);
+
+            const credentials = await provider.getCredentials({
+              url: formatUrl({
+                host: 'my.devops.server',
+                organization: 'org2',
+                project: 'project1',
+              }),
+            });
+
+            expect(credentials).toMatchObject({
+              token: 'fallback-pat',
+            });
+          });
+
+          it('Should return a undefined when no credential with the same host is specified', async () => {
+            const provider = buildProvider([
+              {
+                host: 'my.devops.server',
+                credentials: [
+                  {
+                    personalAccessToken: 'pat',
+                  },
+                ],
+              },
+            ]);
+
+            const credentials = await provider.getCredentials({
+              url: formatUrl({
+                host: 'my.other.devops.server',
+                organization: 'org1',
+                project: 'project1',
+              }),
+            });
+
+            expect(credentials).toBeUndefined();
+          });
+        });
+      });
+    });
+  });
+});
diff --git a/packages/integration/src/azure/DefaultAzureDevOpsCredentialsProvider.ts b/packages/integration/src/azure/DefaultAzureDevOpsCredentialsProvider.ts
new file mode 100644
index 0000000000..1ff35b0612
--- /dev/null
+++ b/packages/integration/src/azure/DefaultAzureDevOpsCredentialsProvider.ts
@@ -0,0 +1,132 @@
+/*
+ * 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 {
+  AzureDevOpsCredentials,
+  AzureDevOpsCredentialsProvider,
+} from './types';
+import { CachedAzureDevOpsCredentialsProvider } from './CachedAzureDevOpsCredentialsProvider';
+import { ScmIntegrationRegistry } from '../registry';
+import { DefaultAzureCredential } from '@azure/identity';
+
+/**
+ * Default implementation of AzureDevOpsCredentialsProvider.
+ * @public
+ */
+export class DefaultAzureDevOpsCredentialsProvider
+  implements AzureDevOpsCredentialsProvider
+{
+  static fromIntegrations(
+    integrations: ScmIntegrationRegistry,
+  ): DefaultAzureDevOpsCredentialsProvider {
+    const providers = integrations.azure.list().reduce((acc, integration) => {
+      integration.config.credentials?.forEach(credential => {
+        if (
+          credential.organizations === undefined ||
+          credential.organizations.length === 0
+        ) {
+          if (acc.get(integration.config.host) === undefined) {
+            acc.set(
+              integration.config.host,
+              CachedAzureDevOpsCredentialsProvider.fromAzureDevOpsCredential(
+                credential,
+              ),
+            );
+          }
+        } else {
+          const provider =
+            CachedAzureDevOpsCredentialsProvider.fromAzureDevOpsCredential(
+              credential,
+            );
+          credential.organizations?.forEach(organization => {
+            acc.set(`${integration.config.host}/${organization}`, provider);
+          });
+        }
+      });
+
+      if (
+        integration.config.host === 'dev.azure.com' &&
+        acc.get(integration.config.host) === undefined
+      ) {
+        acc.set(
+          integration.config.host,
+          CachedAzureDevOpsCredentialsProvider.fromTokenCredential(
+            new DefaultAzureCredential(),
+          ),
+        );
+      }
+
+      return acc;
+    }, new Map<string, CachedAzureDevOpsCredentialsProvider>());
+
+    return new DefaultAzureDevOpsCredentialsProvider(providers);
+  }
+
+  private constructor(
+    private readonly providers: Map<
+      string,
+      CachedAzureDevOpsCredentialsProvider
+    >,
+  ) {}
+
+  private forAzureDevOpsServerOrganization(
+    url: URL,
+  ): AzureDevOpsCredentialsProvider | undefined {
+    const parts = url.pathname.split('/').filter(part => part !== '');
+    if (url.host !== 'dev.azure.com' && parts.length > 0) {
+      if (parts[0] !== 'tfs') {
+        // url format: https://{host}/{organization}
+        return this.providers.get(`${url.host}/${parts[0]}`);
+      } else if (parts[0] === 'tfs' && parts.length > 1) {
+        // url format: https://{host}/tfs/{organization}
+        return this.providers.get(`${url.host}/${parts[1]}`);
+      }
+    }
+
+    return undefined;
+  }
+
+  private forAzureDevOpsOrganization(
+    url: URL,
+  ): AzureDevOpsCredentialsProvider | undefined {
+    const parts = url.pathname.split('/').filter(part => part !== '');
+    if (url.host === 'dev.azure.com' && parts.length > 0) {
+      // url format: https://{host}/{organization}
+      return this.providers.get(`${url.host}/${parts[0]}`);
+    }
+
+    return undefined;
+  }
+
+  private forHost(url: URL): AzureDevOpsCredentialsProvider | undefined {
+    return this.providers.get(url.host);
+  }
+
+  async getCredentials(opts: {
+    url: string;
+  }): Promise<AzureDevOpsCredentials | undefined> {
+    const url = new URL(opts.url);
+    const provider =
+      this.forAzureDevOpsOrganization(url) ??
+      this.forAzureDevOpsServerOrganization(url) ??
+      this.forHost(url);
+
+    if (provider === undefined) {
+      return undefined;
+    }
+
+    return provider.getCredentials(opts);
+  }
+}
diff --git a/packages/integration/src/azure/config.test.ts b/packages/integration/src/azure/config.test.ts
index 54711e4ddb..eb36120c32 100644
--- a/packages/integration/src/azure/config.test.ts
+++ b/packages/integration/src/azure/config.test.ts
@@ -17,18 +17,30 @@
 import { Config, ConfigReader } from '@backstage/config';
 import { loadConfigSchema } from '@backstage/config-loader';
 import {
+  AzureDevOpsCredentialLike,
   AzureIntegrationConfig,
   readAzureIntegrationConfig,
   readAzureIntegrationConfigs,
 } from './config';
 
+type AzureIntegrationConfigLike = Partial<
+  Omit<AzureIntegrationConfig, 'credential' | 'credentials'>
+> & {
+  credential?: Partial<AzureDevOpsCredentialLike>;
+  credentials?: Partial<AzureDevOpsCredentialLike>[];
+};
+
 describe('readAzureIntegrationConfig', () => {
-  function buildConfig(data: Partial<AzureIntegrationConfig>): Config {
+  const valid: any = {
+    host: 'dev.azure.com',
+  };
+
+  function buildConfig(data: AzureIntegrationConfigLike): Config {
     return new ConfigReader(data);
   }
 
   async function buildFrontendConfig(
-    data: Partial<AzureIntegrationConfig>,
+    data: AzureIntegrationConfigLike,
   ): Promise<Config> {
     const fullSchema = await loadConfigSchema({
       dependencies: ['@backstage/integration'],
@@ -51,39 +63,155 @@ describe('readAzureIntegrationConfig', () => {
     return new ConfigReader((processed[0].data as any).integrations.azure[0]);
   }
 
-  it('reads all values when using a token', () => {
-    const output = readAzureIntegrationConfig(
-      buildConfig({
-        host: 'a.com',
-        token: 't',
-      }),
-    );
-
-    expect(output).toEqual({
-      host: 'a.com',
-      token: 't',
-    });
-  });
-
-  it('reads all values when using a credential', () => {
+  it('reads all values when using a personal access token credential', () => {
     const output = readAzureIntegrationConfig(
       buildConfig({
         host: 'dev.azure.com',
-        credential: {
-          clientId: 'id',
-          clientSecret: 'secret',
-          tenantId: 'tenant',
-        },
+        credentials: [
+          {
+            organizations: ['org1'],
+            personalAccessToken: 't',
+          },
+        ],
       }),
     );
 
     expect(output).toEqual({
       host: 'dev.azure.com',
-      credential: {
-        clientId: 'id',
-        clientSecret: 'secret',
-        tenantId: 'tenant',
-      },
+      credentials: [
+        {
+          kind: 'PersonalAccessToken',
+          organizations: ['org1'],
+          personalAccessToken: 't',
+        },
+      ],
+    });
+  });
+
+  it('reads all values when using a personal access token credential (without organizations)', () => {
+    const output = readAzureIntegrationConfig(
+      buildConfig({
+        host: 'a.com',
+        credentials: [
+          {
+            personalAccessToken: 't',
+          },
+        ],
+      }),
+    );
+
+    expect(output).toEqual({
+      host: 'a.com',
+      credentials: [
+        {
+          kind: 'PersonalAccessToken',
+          personalAccessToken: 't',
+        },
+      ],
+    });
+  });
+
+  it('reads all values when using a client secret credential', () => {
+    const output = readAzureIntegrationConfig(
+      buildConfig({
+        host: 'dev.azure.com',
+        credentials: [
+          {
+            organizations: ['org1', 'org2'],
+            clientId: 'id',
+            clientSecret: 'secret',
+            tenantId: 'tenant',
+          },
+        ],
+      }),
+    );
+
+    expect(output).toEqual({
+      host: 'dev.azure.com',
+      credentials: [
+        {
+          kind: 'ClientSecret',
+          organizations: ['org1', 'org2'],
+          clientId: 'id',
+          clientSecret: 'secret',
+          tenantId: 'tenant',
+        },
+      ],
+    });
+  });
+
+  it('reads all values when using a client secret credential (without organizations)', () => {
+    const output = readAzureIntegrationConfig(
+      buildConfig({
+        host: 'dev.azure.com',
+        credentials: [
+          {
+            clientId: 'id',
+            clientSecret: 'secret',
+            tenantId: 'tenant',
+          },
+        ],
+      }),
+    );
+
+    expect(output).toEqual({
+      host: 'dev.azure.com',
+      credentials: [
+        {
+          kind: 'ClientSecret',
+          clientId: 'id',
+          clientSecret: 'secret',
+          tenantId: 'tenant',
+        },
+      ],
+    });
+  });
+
+  it('reads all values when using a managed identity credential', () => {
+    const output = readAzureIntegrationConfig(
+      buildConfig({
+        host: 'dev.azure.com',
+        credentials: [
+          {
+            organizations: ['org1', 'org2'],
+            clientId: 'id',
+          },
+        ],
+      }),
+    );
+
+    expect(output).toEqual({
+      host: 'dev.azure.com',
+      credentials: [
+        {
+          kind: 'ManagedIdentity',
+          organizations: ['org1', 'org2'],
+          clientId: 'id',
+        },
+      ],
+    });
+  });
+
+  it('reads all values when using a managed identity credential (without organizations)', () => {
+    const output = readAzureIntegrationConfig(
+      buildConfig({
+        host: 'dev.azure.com',
+        credentials: [
+          {
+            clientId: 'id',
+          },
+        ],
+      }),
+    );
+
+    expect(output).toEqual({
+      host: 'dev.azure.com',
+      credentials: [
+        {
+          kind: 'ManagedIdentity',
+          clientId: 'id',
+        },
+      ],
     });
   });
 
@@ -92,96 +220,296 @@ describe('readAzureIntegrationConfig', () => {
     expect(output).toEqual({ host: 'dev.azure.com' });
   });
 
-  it('rejects funky configs', () => {
-    const valid: any = {
-      host: 'dev.azure.com',
-    };
+  it('maps deprecated token to credentials', () => {
+    const output = readAzureIntegrationConfig(
+      buildConfig({
+        host: 'dev.azure.com',
+        token: 't',
+      }),
+    );
 
+    expect(output).toEqual({
+      host: 'dev.azure.com',
+      credentials: [
+        {
+          kind: 'PersonalAccessToken',
+          personalAccessToken: 't',
+        },
+      ],
+    });
+  });
+
+  it('maps deprecated credential to credentials', () => {
+    const output = readAzureIntegrationConfig(
+      buildConfig({
+        host: 'dev.azure.com',
+        credential: {
+          clientId: 'id',
+          clientSecret: 'secret',
+          tenantId: 'tenantId',
+        },
+      }),
+    );
+
+    expect(output).toEqual({
+      host: 'dev.azure.com',
+      credentials: [
+        {
+          kind: 'ClientSecret',
+          clientId: 'id',
+          clientSecret: 'secret',
+          tenantId: 'tenantId',
+        },
+      ],
+    });
+  });
+
+  it('rejects config when host is not valid', () => {
     expect(() =>
       readAzureIntegrationConfig(buildConfig({ ...valid, host: 7 })),
     ).toThrow(/host/);
+  });
 
-    expect(() =>
-      readAzureIntegrationConfig(buildConfig({ ...valid, token: 7 })),
-    ).toThrow(/token/);
-
-    expect(() =>
-      readAzureIntegrationConfig(buildConfig({ ...valid, credential: 7 })),
-    ).toThrow(/credential/);
-
-    expect(() =>
-      readAzureIntegrationConfig(
-        buildConfig({ ...valid, credential: { clientId: 7 } }),
-      ),
-    ).toThrow(/credential/);
-
-    expect(() =>
-      readAzureIntegrationConfig(
-        buildConfig({ ...valid, credential: { clientSecret: 7 } }),
-      ),
-    ).toThrow(/credential/);
-
-    expect(() =>
-      readAzureIntegrationConfig(
-        buildConfig({ ...valid, credential: { tenantId: 7 } }),
-      ),
-    ).toThrow(/credential/);
-
-    expect(() =>
-      readAzureIntegrationConfig(buildConfig({ ...valid, credential: {} })),
-    ).toThrow(/credential/);
-
-    expect(() =>
-      readAzureIntegrationConfig(
-        buildConfig({ ...valid, credential: { clientSecret: 'secret' } }),
-      ),
-    ).toThrow(/credential/);
-
-    expect(() =>
-      readAzureIntegrationConfig(
-        buildConfig({ ...valid, credential: { tenantId: 'tenant' } }),
-      ),
-    ).toThrow(/credential/);
-
+  it('rejects config when organizations is not valid', () => {
     expect(() =>
       readAzureIntegrationConfig(
         buildConfig({
           ...valid,
-          credential: { clientId: 'id', clientSecret: 'secret' },
+          credentials: [
+            {
+              organizations: [1, 2, 'org'],
+            },
+          ],
         }),
       ),
-    ).toThrow(/credential/);
+    ).toThrow(/credentials/);
+  });
 
+  it('rejects config when token is not valid', () => {
     expect(() =>
       readAzureIntegrationConfig(
         buildConfig({
           ...valid,
-          credential: { clientId: 'id', tenantId: 'tenant' },
+          credentials: [
+            {
+              personalAccessToken: 7,
+            },
+          ],
         }),
       ),
-    ).toThrow(/credential/);
+    ).toThrow(/credentials/);
+  });
 
+  it('rejects config when clientId is not valid', () => {
+    expect(() =>
+      readAzureIntegrationConfig(
+        buildConfig({
+          ...valid,
+          credentials: [
+            {
+              clientId: 7,
+            },
+          ],
+        }),
+      ),
+    ).toThrow(/credentials/);
+  });
+
+  it('rejects config when clientSecret is not valid', () => {
+    expect(() =>
+      readAzureIntegrationConfig(
+        buildConfig({
+          ...valid,
+          credentials: [
+            {
+              clientId: 'id',
+              clientSecret: 7,
+              tenantId: 'tenant',
+            },
+          ],
+        }),
+      ),
+    ).toThrow(/credentials/);
+  });
+
+  it('rejects config when tenantId is not valid', () => {
+    expect(() =>
+      readAzureIntegrationConfig(
+        buildConfig({
+          ...valid,
+          credentials: [
+            {
+              clientId: 'id',
+              clientSecret: 'secret',
+              tenantId: 7,
+            },
+          ],
+        }),
+      ),
+    ).toThrow(/credentials/);
+  });
+
+  it('rejects config when at least one credential not valid', () => {
+    expect(() =>
+      readAzureIntegrationConfig(
+        buildConfig({
+          ...valid,
+          credentials: [
+            {
+              personalAccessToken: 'token',
+            },
+            {
+              clientId: 'id',
+            },
+            {
+              clientId: 'id',
+              clientSecret: 'secret',
+              tenantId: 'tenant',
+            },
+            {
+              clientId: 'id',
+              personalAccessToken: 'token',
+            },
+          ],
+        }),
+      ),
+    ).toThrow(/not a valid credential/);
+  });
+
+  it('rejects config when using a client secret credential for Azure DevOps server', () => {
     expect(() =>
       readAzureIntegrationConfig(
         buildConfig({
           ...valid,
           host: 'a.com',
+          credentials: [
+            {
+              clientId: 'id',
+              clientSecret: 'secret',
+              tenantId: 'tenant',
+            },
+          ],
+        }),
+      ),
+    ).toThrow(/hosts/);
+  });
+
+  it('rejects config when using a managed identity for Azure DevOps server', () => {
+    expect(() =>
+      readAzureIntegrationConfig(
+        buildConfig({
+          ...valid,
+          host: 'a.com',
+          credentials: [
+            {
+              organizations: ['org1', 'org2'],
+              clientId: 'id',
+            },
+          ],
+        }),
+      ),
+    ).toThrow(/personal access tokens/);
+  });
+
+  it('rejects config when using organizations for Azure DevOps server', () => {
+    expect(() =>
+      readAzureIntegrationConfig(
+        buildConfig({
+          ...valid,
+          host: 'a.com',
+          credentials: [
+            {
+              clientId: 'id',
+            },
+          ],
+        }),
+      ),
+    ).toThrow(/hosts/);
+  });
+
+  it('rejects config when both the credential and credentials field are specified', () => {
+    expect(() =>
+      readAzureIntegrationConfig(
+        buildConfig({
+          ...valid,
           credential: {
             clientId: 'id',
-            tenantId: 'tenant',
-            clientSecret: 'secret',
           },
+          credentials: [
+            {
+              clientId: 'id',
+            },
+          ],
         }),
       ),
     ).toThrow(/credential/);
   });
 
+  it('rejects config when both the token and credentials field are specified', () => {
+    expect(() =>
+      readAzureIntegrationConfig(
+        buildConfig({
+          ...valid,
+          token: 'token',
+          credentials: [
+            {
+              clientId: 'id',
+            },
+          ],
+        }),
+      ),
+    ).toThrow(/token/);
+  });
+
+  it('rejects config when more than one credential does not specify an organization', () => {
+    expect(() =>
+      readAzureIntegrationConfig(
+        buildConfig({
+          ...valid,
+          credentials: [
+            {
+              clientId: 'id',
+            },
+            {
+              organizations: [],
+              personalAccessToken: 'pat',
+            },
+          ],
+        }),
+      ),
+    ).toThrow(/organizations/);
+  });
+
+  it('rejects config when multiple credentials specify the same organization', () => {
+    expect(() =>
+      readAzureIntegrationConfig(
+        buildConfig({
+          ...valid,
+          credentials: [
+            {
+              organizations: ['org1', 'org2'],
+              clientId: 'id',
+            },
+            {
+              organizations: ['org2', 'org3'],
+              personalAccessToken: 'pat',
+            },
+          ],
+        }),
+      ),
+    ).toThrow(/organization org2/);
+  });
+
   it('works on the frontend', async () => {
     expect(
       readAzureIntegrationConfig(
         await buildFrontendConfig({
           host: 'a.com',
-          token: 't',
+          credentials: [
+            {
+              personalAccessToken: 't',
+            },
+          ],
         }),
       ),
     ).toEqual({
@@ -191,46 +519,184 @@ describe('readAzureIntegrationConfig', () => {
 });
 
 describe('readAzureIntegrationConfigs', () => {
-  function buildConfig(data: Partial<AzureIntegrationConfig>[]): Config[] {
+  function buildConfig(data: AzureIntegrationConfigLike[]): Config[] {
     return data.map(item => new ConfigReader(item));
   }
 
-  it('reads all values when using a token', () => {
-    const output = readAzureIntegrationConfigs(
-      buildConfig([
-        {
-          host: 'a.com',
-          token: 't',
-        },
-      ]),
-    );
-    expect(output).toContainEqual({
-      host: 'a.com',
-      token: 't',
-    });
-  });
-
-  it('reads all values when using a credential', () => {
+  it('reads all values when using a personal access token credential', () => {
     const output = readAzureIntegrationConfigs(
       buildConfig([
         {
           host: 'dev.azure.com',
-          credential: {
+          credentials: [
+            {
+              organizations: ['org1'],
+              personalAccessToken: 't',
+            },
+          ],
+        },
+      ]),
+    );
+
+    expect(output).toEqual([
+      {
+        host: 'dev.azure.com',
+        credentials: [
+          {
+            kind: 'PersonalAccessToken',
+            organizations: ['org1'],
+            personalAccessToken: 't',
+          },
+        ],
+      },
+    ]);
+  });
+
+  it('reads all values when using a personal access token credential (without organizations)', () => {
+    const output = readAzureIntegrationConfigs(
+      buildConfig([
+        {
+          host: 'dev.azure.com',
+          credentials: [
+            {
+              personalAccessToken: 't',
+            },
+          ],
+        },
+      ]),
+    );
+
+    expect(output).toEqual([
+      {
+        host: 'dev.azure.com',
+        credentials: [
+          {
+            kind: 'PersonalAccessToken',
+            personalAccessToken: 't',
+          },
+        ],
+      },
+    ]);
+  });
+
+  it('reads all values when using a client secret credential', () => {
+    const output = readAzureIntegrationConfigs(
+      buildConfig([
+        {
+          host: 'dev.azure.com',
+          credentials: [
+            {
+              organizations: ['org1', 'org2'],
+              clientId: 'id',
+              clientSecret: 'secret',
+              tenantId: 'tenant',
+            },
+          ],
+        },
+      ]),
+    );
+
+    expect(output).toEqual([
+      {
+        host: 'dev.azure.com',
+        credentials: [
+          {
+            kind: 'ClientSecret',
+            organizations: ['org1', 'org2'],
             clientId: 'id',
             clientSecret: 'secret',
             tenantId: 'tenant',
           },
+        ],
+      },
+    ]);
+  });
+
+  it('reads all values when using a client secret credential (without organizations)', () => {
+    const output = readAzureIntegrationConfigs(
+      buildConfig([
+        {
+          host: 'dev.azure.com',
+          credentials: [
+            {
+              clientId: 'id',
+              clientSecret: 'secret',
+              tenantId: 'tenant',
+            },
+          ],
         },
       ]),
     );
-    expect(output).toContainEqual({
-      host: 'dev.azure.com',
-      credential: {
-        clientId: 'id',
-        clientSecret: 'secret',
-        tenantId: 'tenant',
+
+    expect(output).toEqual([
+      {
+        host: 'dev.azure.com',
+        credentials: [
+          {
+            kind: 'ClientSecret',
+            clientId: 'id',
+            clientSecret: 'secret',
+            tenantId: 'tenant',
+          },
+        ],
       },
-    });
+    ]);
+  });
+
+  it('reads all values when using a managed identity credential', () => {
+    const output = readAzureIntegrationConfigs(
+      buildConfig([
+        {
+          host: 'dev.azure.com',
+          credentials: [
+            {
+              organizations: ['org1', 'org2'],
+              clientId: 'id',
+            },
+          ],
+        },
+      ]),
+    );
+
+    expect(output).toEqual([
+      {
+        host: 'dev.azure.com',
+        credentials: [
+          {
+            kind: 'ManagedIdentity',
+            organizations: ['org1', 'org2'],
+            clientId: 'id',
+          },
+        ],
+      },
+    ]);
+  });
+
+  it('reads all values when using a managed identity credential (without organizations)', () => {
+    const output = readAzureIntegrationConfigs(
+      buildConfig([
+        {
+          host: 'dev.azure.com',
+          credentials: [
+            {
+              clientId: 'id',
+            },
+          ],
+        },
+      ]),
+    );
+
+    expect(output).toEqual([
+      {
+        host: 'dev.azure.com',
+        credentials: [
+          {
+            kind: 'ManagedIdentity',
+            clientId: 'id',
+          },
+        ],
+      },
+    ]);
   });
 
   it('adds a default entry when missing', () => {
diff --git a/packages/integration/src/azure/config.ts b/packages/integration/src/azure/config.ts
index 3f12f3ef13..98704ba570 100644
--- a/packages/integration/src/azure/config.ts
+++ b/packages/integration/src/azure/config.ts
@@ -36,6 +36,8 @@ export type AzureIntegrationConfig = {
    * The authorization token to use for requests.
    *
    * If no token is specified, anonymous access is used.
+   *
+   * @deprecated Use `credentials` instead.
    */
   token?: string;
 
@@ -43,15 +45,50 @@ export type AzureIntegrationConfig = {
    * The credential to use for requests.
    *
    * If no credential is specified anonymous access is used.
+   *
+   * @deprecated Use `credentials` instead.
    */
-  credential?: AzureCredential;
+  credential?: AzureDevOpsCredential;
+
+  /**
+   * The credentials to use for requests. If multiple credentials are specified the first one that matches the organization is used.
+   * If not organization matches the first credential without an organization is used.
+   *
+   * If no credentials are specified at all, either a default credential (for Azure DevOps) or anonymous access (for Azure DevOps Server) is used.
+   */
+  credentials?: AzureDevOpsCredential[];
 };
 
 /**
- * Authenticate using a client secret that was generated for an App Registration.
+ * The kind of Azure DevOps credential.
  * @public
  */
-export type AzureClientSecretCredential = {
+export type AzureDevOpsCredentialKind =
+  | 'PersonalAccessToken'
+  | 'ClientSecret'
+  | 'ManagedIdentity';
+
+/**
+ * Common fields for the Azure DevOps credentials.
+ * @public
+ */
+export type AzureCredentialBase = {
+  /**
+   * The kind of credential.
+   */
+  kind: AzureDevOpsCredentialKind;
+  /**
+   * The Azure DevOps organizations for which to use this credential.
+   */
+  organizations?: string[];
+};
+
+/**
+ * A client secret credential that was generated for an App Registration.
+ * @public
+ */
+export type AzureClientSecretCredential = AzureCredentialBase & {
+  kind: 'ClientSecret';
   /**
    * The Azure Active Directory tenant
    */
@@ -68,10 +105,11 @@ export type AzureClientSecretCredential = {
 };
 
 /**
- * Authenticate using a managed identity available at the deployment environment.
+ * A managed identity credential.
  * @public
  */
-export type AzureManagedIdentityCredential = {
+export type AzureManagedIdentityCredential = AzureCredentialBase & {
+  kind: 'ManagedIdentity';
   /**
    * The clientId
    */
@@ -79,33 +117,77 @@ export type AzureManagedIdentityCredential = {
 };
 
 /**
- * Credential used to authenticate to Azure Active Directory.
+ * A personal access token credential.
  * @public
  */
-export type AzureCredential =
+export type PersonalAccessTokenCredential = AzureCredentialBase & {
+  kind: 'PersonalAccessToken';
+  personalAccessToken: string;
+};
+
+/**
+ * The general shape of a credential that can be used to authenticate to Azure DevOps.
+ * @public
+ */
+export type AzureDevOpsCredentialLike = Omit<
+  Partial<AzureClientSecretCredential> &
+    Partial<AzureManagedIdentityCredential> &
+    Partial<PersonalAccessTokenCredential>,
+  'kind'
+>;
+
+/**
+ * Credential used to authenticate to Azure DevOps.
+ * @public
+ */
+export type AzureDevOpsCredential =
   | AzureClientSecretCredential
-  | AzureManagedIdentityCredential;
-export const isAzureClientSecretCredential = (
-  credential: Partial<AzureCredential>,
-): credential is AzureClientSecretCredential => {
-  const clientSecretCredential = credential as AzureClientSecretCredential;
+  | AzureManagedIdentityCredential
+  | PersonalAccessTokenCredential;
 
-  return (
-    Object.keys(credential).length === 3 &&
-    clientSecretCredential.clientId !== undefined &&
-    clientSecretCredential.clientSecret !== undefined &&
-    clientSecretCredential.tenantId !== undefined
-  );
-};
+const AzureDevOpsCredentialFields = [
+  'clientId',
+  'clientSecret',
+  'tenantId',
+  'personalAccessToken',
+] as const;
+type AzureDevOpsCredentialField = (typeof AzureDevOpsCredentialFields)[number];
 
-export const isAzureManagedIdentityCredential = (
-  credential: Partial<AzureCredential>,
-): credential is AzureManagedIdentityCredential => {
-  return (
-    Object.keys(credential).length === 1 &&
-    (credential as AzureManagedIdentityCredential).clientId !== undefined
-  );
-};
+const AzureDevopsCredentialFieldMap = new Map<
+  AzureDevOpsCredentialKind,
+  AzureDevOpsCredentialField[]
+>([
+  ['ClientSecret', ['clientId', 'clientSecret', 'tenantId']],
+  ['ManagedIdentity', ['clientId']],
+  ['PersonalAccessToken', ['personalAccessToken']],
+]);
+
+function asAzureDevOpsCredential(
+  credential: AzureDevOpsCredentialLike,
+): AzureDevOpsCredential {
+  for (const entry of AzureDevopsCredentialFieldMap.entries()) {
+    const [kind, requiredFields] = entry;
+
+    const forbiddenFields = AzureDevOpsCredentialFields.filter(
+      field => !requiredFields.includes(field as AzureDevOpsCredentialField),
+    );
+
+    if (
+      requiredFields.every(field => credential[field] !== undefined) &&
+      forbiddenFields.every(field => credential[field] === undefined)
+    ) {
+      return {
+        kind,
+        organizations: credential.organizations,
+        ...requiredFields.reduce((acc, field) => {
+          acc[field] = credential[field];
+          return acc;
+        }, {} as Record<string, any>),
+      } as AzureDevOpsCredential;
+    }
+  }
+  throw new Error('is not a valid credential');
+}
 
 /**
  * Reads a single Azure integration config.
@@ -117,15 +199,62 @@ export function readAzureIntegrationConfig(
   config: Config,
 ): AzureIntegrationConfig {
   const host = config.getOptionalString('host') ?? AZURE_HOST;
+
+  let credentialConfigs = config
+    .getOptionalConfigArray('credentials')
+    ?.map(credential => {
+      const result: Partial<AzureDevOpsCredentialLike> = {
+        organizations: credential.getOptionalStringArray('organizations'),
+        personalAccessToken: credential.getOptionalString(
+          'personalAccessToken',
+        ),
+        tenantId: credential.getOptionalString('tenantId'),
+        clientId: credential.getOptionalString('clientId'),
+        clientSecret: credential.getOptionalString('clientSecret'),
+      };
+
+      return result;
+    });
+
   const token = config.getOptionalString('token');
 
-  const credential = config.getOptional<AzureCredential>('credential')
-    ? {
+  if (
+    config.getOptional('credential') !== undefined &&
+    config.getOptional('credentials') !== undefined
+  ) {
+    throw new Error(
+      `Invalid Azure integration config, 'credential' and 'credentials' cannot be used together. Use 'credentials' instead.`,
+    );
+  }
+
+  if (
+    config.getOptional('token') !== undefined &&
+    config.getOptional('credentials') !== undefined
+  ) {
+    throw new Error(
+      `Invalid Azure integration config, 'token' and 'credentials' cannot be used together. Use 'credentials' instead.`,
+    );
+  }
+
+  if (token !== undefined) {
+    const mapped = [{ personalAccessToken: token }];
+    credentialConfigs = credentialConfigs?.concat(mapped) ?? mapped;
+  }
+
+  if (config.getOptional('credential') !== undefined) {
+    const mapped = [
+      {
+        organizations: config.getOptionalStringArray(
+          'credential.organizations',
+        ),
+        token: config.getOptionalString('credential.token'),
         tenantId: config.getOptionalString('credential.tenantId'),
         clientId: config.getOptionalString('credential.clientId'),
         clientSecret: config.getOptionalString('credential.clientSecret'),
-      }
-    : undefined;
+      },
+    ];
+    credentialConfigs = credentialConfigs?.concat(mapped) ?? mapped;
+  }
 
   if (!isValidHost(host)) {
     throw new Error(
@@ -133,29 +262,92 @@ export function readAzureIntegrationConfig(
     );
   }
 
-  if (
-    credential &&
-    !isAzureClientSecretCredential(credential) &&
-    !isAzureManagedIdentityCredential(credential)
-  ) {
-    throw new Error(
-      `Invalid Azure integration config, credential is not valid`,
+  let credentials: AzureDevOpsCredential[] | undefined = undefined;
+  if (credentialConfigs !== undefined) {
+    const errors = credentialConfigs
+      ?.reduce((acc, credentialConfig, index) => {
+        let error: string | undefined = undefined;
+        try {
+          asAzureDevOpsCredential(credentialConfig);
+        } catch (e) {
+          error = e.message;
+        }
+
+        if (error !== undefined) {
+          acc.push(`credential at position ${index + 1} ${error}`);
+        }
+
+        return acc;
+      }, Array.of<string>())
+      .concat(
+        Object.entries(
+          credentialConfigs
+            .filter(
+              credential =>
+                credential.organizations !== undefined &&
+                credential.organizations.length > 0,
+            )
+            .reduce((acc, credential, index) => {
+              credential.organizations?.forEach(organization => {
+                if (!acc[organization]) {
+                  acc[organization] = [];
+                }
+
+                acc[organization].push(index + 1);
+              });
+
+              return acc;
+            }, {} as Record<string, number[]>),
+        )
+          .filter(([_, indexes]) => indexes.length > 1)
+          .reduce((acc, [org, indexes]) => {
+            acc.push(
+              `organization ${org} is specified multiple times in credentials at positions ${indexes
+                .slice(0, indexes.length - 1)
+                .join(', ')} and ${indexes[indexes.length - 1]}`,
+            );
+            return acc;
+          }, Array.of<string>()),
+      );
+
+    if (errors?.length > 0) {
+      throw new Error(
+        `Invalid Azure integration config for ${host}: ${errors.join('; ')}`,
+      );
+    }
+
+    credentials = credentialConfigs.map(credentialConfig =>
+      asAzureDevOpsCredential(credentialConfig),
     );
+
+    if (
+      credentials.some(
+        credential => credential.kind !== 'PersonalAccessToken',
+      ) &&
+      host !== AZURE_HOST
+    ) {
+      throw new Error(
+        `Invalid Azure integration config for ${host}, only personal access tokens can be used with hosts other than ${AZURE_HOST}`,
+      );
+    }
+
+    if (
+      credentials.filter(
+        credential =>
+          credential.organizations === undefined ||
+          credential.organizations.length === 0,
+      ).length > 1
+    ) {
+      throw new Error(
+        `Invalid Azure integration config for ${host}, you cannot specify multiple credentials without organizations`,
+      );
+    }
   }
 
-  if (credential && host !== AZURE_HOST) {
-    throw new Error(
-      `Invalid Azure integration config, credential can only be used with ${AZURE_HOST}`,
-    );
-  }
-
-  if (credential && token) {
-    throw new Error(
-      `Invalid Azure integration config, specify either a token or a credential but not both`,
-    );
-  }
-
-  return { host, token, credential };
+  return {
+    host,
+    credentials,
+  };
 }
 
 /**
diff --git a/packages/integration/src/azure/core.test.ts b/packages/integration/src/azure/core.test.ts
index e6ef5401ac..601057e499 100644
--- a/packages/integration/src/azure/core.test.ts
+++ b/packages/integration/src/azure/core.test.ts
@@ -14,11 +14,7 @@
  * limitations under the License.
  */
 
-import {
-  getAzureFileFetchUrl,
-  getAzureDownloadUrl,
-  getAzureRequestOptions,
-} from './core';
+import { getAzureFileFetchUrl, getAzureDownloadUrl } from './core';
 import {
   AccessToken,
   ClientSecretCredential,
@@ -44,66 +40,6 @@ MockedManagedIdentityCredential.prototype.getToken.mockImplementation(() =>
 );
 
 describe('azure core', () => {
-  describe('getAzureRequestOptions', () => {
-    it('should not add authorization header when not using token or credential', async () => {
-      expect(await getAzureRequestOptions({ host: '' })).toEqual(
-        expect.objectContaining({
-          headers: expect.not.objectContaining({
-            Authorization: expect.anything(),
-          }),
-        }),
-      );
-    });
-
-    it('should add authorization header when using a personal access token', async () => {
-      expect(
-        await getAzureRequestOptions({ host: '', token: '0123456789' }),
-      ).toEqual(
-        expect.objectContaining({
-          headers: expect.objectContaining({
-            Authorization: 'Basic OjAxMjM0NTY3ODk=',
-          }),
-        }),
-      );
-    });
-
-    it('should add authorization header when using a client secret', async () => {
-      expect(
-        await getAzureRequestOptions({
-          host: '',
-          credential: {
-            clientId: 'fake-id',
-            clientSecret: 'fake-secret',
-            tenantId: 'fake-tenant',
-          },
-        }),
-      ).toEqual(
-        expect.objectContaining({
-          headers: expect.objectContaining({
-            Authorization: 'Bearer fake-client-secret-token',
-          }),
-        }),
-      );
-    });
-
-    it('should add authorization header when using a managed identity', async () => {
-      expect(
-        await getAzureRequestOptions({
-          host: '',
-          credential: {
-            clientId: 'fake-id',
-          },
-        }),
-      ).toEqual(
-        expect.objectContaining({
-          headers: expect.objectContaining({
-            Authorization: 'Bearer fake-managed-identity-token',
-          }),
-        }),
-      );
-    });
-  });
-
   describe('getAzureFileFetchUrl', () => {
     it.each([
       {
diff --git a/packages/integration/src/azure/core.ts b/packages/integration/src/azure/core.ts
index 31aa13d91f..1c25373962 100644
--- a/packages/integration/src/azure/core.ts
+++ b/packages/integration/src/azure/core.ts
@@ -15,15 +15,6 @@
  */
 
 import { AzureUrl } from './AzureUrl';
-import {
-  AzureIntegrationConfig,
-  isAzureManagedIdentityCredential,
-  isAzureClientSecretCredential,
-} from './config';
-import {
-  ClientSecretCredential,
-  ManagedIdentityCredential,
-} from '@azure/identity';
 
 /**
  * Given a URL pointing to a file on a provider, returns a URL that is suitable
@@ -62,45 +53,3 @@ export function getAzureDownloadUrl(url: string): string {
 export function getAzureCommitsUrl(url: string): string {
   return AzureUrl.fromRepoUrl(url).toCommitsUrl();
 }
-
-/**
- * Gets the request options necessary to make requests to a given provider.
- *
- * @param config - The relevant provider config
- * @param additionalHeaders - Additional headers for the request
- * @public
- */
-export async function getAzureRequestOptions(
-  config: AzureIntegrationConfig,
-  additionalHeaders?: Record<string, string>,
-): Promise<{ headers: Record<string, string> }> {
-  const azureDevOpsScope = '499b84ac-1321-427f-aa17-267ca6975798/.default';
-  const headers: Record<string, string> = additionalHeaders
-    ? { ...additionalHeaders }
-    : {};
-
-  const { token, credential } = config;
-  if (credential) {
-    if (isAzureClientSecretCredential(credential)) {
-      const servicePrincipal = new ClientSecretCredential(
-        credential.tenantId,
-        credential.clientId,
-        credential.clientSecret,
-      );
-
-      const accessToken = await servicePrincipal.getToken(azureDevOpsScope);
-      headers.Authorization = `Bearer ${accessToken.token}`;
-    } else if (isAzureManagedIdentityCredential(credential)) {
-      const managedIdentity = new ManagedIdentityCredential(
-        credential.clientId,
-      );
-      const accessToken = await managedIdentity.getToken(azureDevOpsScope);
-      headers.Authorization = `Bearer ${accessToken.token}`;
-    }
-  } else if (token) {
-    const buffer = Buffer.from(`:${config.token}`, 'utf8');
-    headers.Authorization = `Basic ${buffer.toString('base64')}`;
-  }
-
-  return { headers };
-}
diff --git a/packages/integration/src/azure/deprecated.test.ts b/packages/integration/src/azure/deprecated.test.ts
new file mode 100644
index 0000000000..4411ef5f2f
--- /dev/null
+++ b/packages/integration/src/azure/deprecated.test.ts
@@ -0,0 +1,128 @@
+/*
+ * 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 { getAzureRequestOptions } from './deprecated';
+import { DateTime } from 'luxon';
+import {
+  AccessToken,
+  ClientSecretCredential,
+  ManagedIdentityCredential,
+} from '@azure/identity';
+
+jest.mock('@azure/identity');
+
+const MockedClientSecretCredential = ClientSecretCredential as jest.MockedClass<
+  typeof ClientSecretCredential
+>;
+
+const MockedManagedIdentityCredential =
+  ManagedIdentityCredential as jest.MockedClass<
+    typeof ManagedIdentityCredential
+  >;
+
+describe('azure core', () => {
+  beforeEach(() => {
+    jest.resetAllMocks();
+
+    MockedClientSecretCredential.prototype.getToken.mockImplementation(() =>
+      Promise.resolve({
+        expiresOnTimestamp: DateTime.local().plus({ days: 1 }).toSeconds(),
+        token: 'fake-client-secret-token',
+      } as AccessToken),
+    );
+    MockedManagedIdentityCredential.prototype.getToken.mockImplementation(() =>
+      Promise.resolve({
+        expiresOnTimestamp: DateTime.local().plus({ days: 1 }).toSeconds(),
+        token: 'fake-managed-identity-token',
+      } as AccessToken),
+    );
+  });
+
+  describe('getAzureRequestOptions', () => {
+    it('should not add authorization header when not using token or credential', async () => {
+      expect(await getAzureRequestOptions({ host: '' })).toEqual(
+        expect.objectContaining({
+          headers: expect.not.objectContaining({
+            Authorization: expect.anything(),
+          }),
+        }),
+      );
+    });
+
+    it('should add authorization header when using a personal access token', async () => {
+      const pat = '0123456789';
+      const encoded = Buffer.from(`:${pat}`).toString('base64');
+      expect(
+        await getAzureRequestOptions({
+          host: '',
+          credentials: [
+            {
+              kind: 'PersonalAccessToken',
+              personalAccessToken: pat,
+            },
+          ],
+        }),
+      ).toEqual(
+        expect.objectContaining({
+          headers: expect.objectContaining({
+            Authorization: `Basic ${encoded}`,
+          }),
+        }),
+      );
+    });
+
+    it('should add authorization header when using a client secret', async () => {
+      expect(
+        await getAzureRequestOptions({
+          host: '',
+          credentials: [
+            {
+              kind: 'ClientSecret',
+              clientId: 'fake-id',
+              clientSecret: 'fake-secret',
+              tenantId: 'fake-tenant',
+            },
+          ],
+        }),
+      ).toEqual(
+        expect.objectContaining({
+          headers: expect.objectContaining({
+            Authorization: 'Bearer fake-client-secret-token',
+          }),
+        }),
+      );
+    });
+
+    it('should add authorization header when using a managed identity', async () => {
+      expect(
+        await getAzureRequestOptions({
+          host: '',
+          credentials: [
+            {
+              kind: 'ManagedIdentity',
+              clientId: 'fake-id',
+            },
+          ],
+        }),
+      ).toEqual(
+        expect.objectContaining({
+          headers: expect.objectContaining({
+            Authorization: 'Bearer fake-managed-identity-token',
+          }),
+        }),
+      );
+    });
+  });
+});
diff --git a/packages/integration/src/azure/deprecated.ts b/packages/integration/src/azure/deprecated.ts
new file mode 100644
index 0000000000..fd19f3dc14
--- /dev/null
+++ b/packages/integration/src/azure/deprecated.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 { AzureIntegrationConfig } from './config';
+import { CachedAzureDevOpsCredentialsProvider } from './CachedAzureDevOpsCredentialsProvider';
+
+/**
+ * Gets the request options necessary to make requests to a given provider.
+ *
+ * @param config - The relevant provider config
+ * @param additionalHeaders - Additional headers for the request
+ * @public
+ * @deprecated Use {@link AzureDevOpsCredentialsProvider} instead.
+ */
+export async function getAzureRequestOptions(
+  config: AzureIntegrationConfig,
+  additionalHeaders?: Record<string, string>,
+): Promise<{ headers: Record<string, string> }> {
+  const headers: Record<string, string> = additionalHeaders
+    ? { ...additionalHeaders }
+    : {};
+
+  /*
+   * Since we do not have a way to determine which organization the request is for,
+   * we will use the first credential that does not have an organization specified.
+   */
+  const credentialConfig = config.credentials?.filter(
+    credential =>
+      credential.organizations === undefined ||
+      credential.organizations.length === 0,
+  )[0];
+
+  if (credentialConfig) {
+    const credentialsProvider =
+      CachedAzureDevOpsCredentialsProvider.fromAzureDevOpsCredential(
+        credentialConfig,
+      );
+    const credentials = await credentialsProvider.getCredentials();
+
+    return {
+      headers: {
+        ...credentials?.headers,
+        ...headers,
+      },
+    };
+  }
+
+  return { headers };
+}
diff --git a/packages/integration/src/azure/index.ts b/packages/integration/src/azure/index.ts
index 21cf069807..b5f5c0a316 100644
--- a/packages/integration/src/azure/index.ts
+++ b/packages/integration/src/azure/index.ts
@@ -21,13 +21,21 @@ export {
 } from './config';
 export type {
   AzureIntegrationConfig,
-  AzureCredential,
-  AzureManagedIdentityCredential,
+  AzureDevOpsCredentialKind,
+  AzureCredentialBase,
   AzureClientSecretCredential,
+  AzureManagedIdentityCredential,
+  PersonalAccessTokenCredential,
+  AzureDevOpsCredentialLike,
+  AzureDevOpsCredential,
 } from './config';
 export {
   getAzureCommitsUrl,
   getAzureDownloadUrl,
   getAzureFileFetchUrl,
-  getAzureRequestOptions,
 } from './core';
+
+export * from './types';
+export { DefaultAzureDevOpsCredentialsProvider } from './DefaultAzureDevOpsCredentialsProvider';
+
+export * from './deprecated';
diff --git a/packages/integration/src/azure/types.ts b/packages/integration/src/azure/types.ts
new file mode 100644
index 0000000000..72b341432c
--- /dev/null
+++ b/packages/integration/src/azure/types.ts
@@ -0,0 +1,44 @@
+/*
+ * 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.
+ */
+
+/**
+ * The type of Azure DevOps credential, either bearer or pat.
+ * @public
+ */
+export type AzureDevOpsCredentialType = 'bearer' | 'pat';
+
+/**
+ * A set of credentials for Azure DevOps.
+ *
+ * @public
+ */
+export type AzureDevOpsCredentials = {
+  headers: { [name: string]: string };
+  token: string;
+  type: AzureDevOpsCredentialType;
+};
+
+/**
+ * This allows implementations to be provided to retrieve Azure DevOps credentials.
+ *
+ * @public
+ *
+ */
+export interface AzureDevOpsCredentialsProvider {
+  getCredentials(opts: {
+    url: string;
+  }): Promise<AzureDevOpsCredentials | undefined>;
+}
diff --git a/packages/integration/src/gerrit/core.test.ts b/packages/integration/src/gerrit/core.test.ts
index 5a829e88f9..5fbb41763a 100644
--- a/packages/integration/src/gerrit/core.test.ts
+++ b/packages/integration/src/gerrit/core.test.ts
@@ -20,6 +20,7 @@ import fetch from 'cross-fetch';
 import { setupRequestMockHandlers } from '../helpers';
 import { GerritIntegrationConfig } from './config';
 import {
+  buildGerritGitilesArchiveUrl,
   buildGerritGitilesUrl,
   getGerritBranchApiUrl,
   getGerritCloneRepoUrl,
@@ -33,6 +34,86 @@ describe('gerrit core', () => {
   const worker = setupServer();
   setupRequestMockHandlers(worker);
 
+  describe('buildGerritGitilesArchiveUrl', () => {
+    const config: GerritIntegrationConfig = {
+      host: 'gerrit.com',
+      baseUrl: 'https://gerrit.com',
+      gitilesBaseUrl: 'https://gerrit.com/gitiles',
+    };
+    const configWithPath: GerritIntegrationConfig = {
+      host: 'gerrit.com',
+      baseUrl: 'https://gerrit.com/gerrit',
+      gitilesBaseUrl: 'https://gerrit.com/gerrit/plugins/gitiles',
+    };
+    const configWithDedicatedGitiles: GerritIntegrationConfig = {
+      host: 'gerrit.com',
+      baseUrl: 'https://gerrit.com/gerrit',
+      gitilesBaseUrl: 'https://dedicated-gitiles-server.com/gerrit/gitiles',
+    };
+    it('can create an archive url for a branch', () => {
+      expect(buildGerritGitilesArchiveUrl(config, 'repo', 'dev', '')).toEqual(
+        'https://gerrit.com/gitiles/repo/+archive/refs/heads/dev.tar.gz',
+      );
+
+      expect(buildGerritGitilesArchiveUrl(config, 'repo', 'dev', '/')).toEqual(
+        'https://gerrit.com/gitiles/repo/+archive/refs/heads/dev.tar.gz',
+      );
+    });
+    it('can create an archive url for a specific directory', () => {
+      expect(
+        buildGerritGitilesArchiveUrl(config, 'repo', 'dev', 'docs'),
+      ).toEqual(
+        'https://gerrit.com/gitiles/repo/+archive/refs/heads/dev/docs.tar.gz',
+      );
+    });
+    it('can create an authenticated url when auth is enabled', () => {
+      const authConfig = {
+        ...config,
+        username: 'username',
+        password: 'password',
+      };
+      expect(
+        buildGerritGitilesArchiveUrl(authConfig, 'repo', 'dev', 'docs'),
+      ).toEqual(
+        'https://gerrit.com/a/gitiles/repo/+archive/refs/heads/dev/docs.tar.gz',
+      );
+    });
+    it('can create an authenticated url when auth is enabled and an url-path is used', () => {
+      const authConfig = {
+        ...configWithPath,
+        username: 'username',
+        password: 'password',
+      };
+      expect(
+        buildGerritGitilesArchiveUrl(authConfig, 'repo', 'dev', 'docs'),
+      ).toEqual(
+        'https://gerrit.com/gerrit/a/plugins/gitiles/repo/+archive/refs/heads/dev/docs.tar.gz',
+      );
+    });
+    it('Cannot build an authenticated url when a dedicated Gitiles server is used', () => {
+      const authConfig = {
+        ...configWithDedicatedGitiles,
+        username: 'username',
+        password: 'password',
+      };
+      expect(() =>
+        buildGerritGitilesArchiveUrl(authConfig, 'repo', 'dev', 'docs'),
+      ).toThrow(
+        'Since the baseUrl (Gerrit) is not part of the gitilesBaseUrl, an authentication URL could not be constructed.',
+      );
+    });
+    it('Build a non-authenticated url when a dedicated Gitiles server is used', () => {
+      const authConfig = {
+        ...configWithDedicatedGitiles,
+      };
+      expect(
+        buildGerritGitilesArchiveUrl(authConfig, 'repo', 'dev', 'docs'),
+      ).toEqual(
+        'https://dedicated-gitiles-server.com/gerrit/gitiles/repo/+archive/refs/heads/dev/docs.tar.gz',
+      );
+    });
+  });
+
   describe('buildGerritGitilesUrl', () => {
     it('can create an url from arguments', () => {
       const config: GerritIntegrationConfig = {
@@ -86,6 +167,25 @@ describe('gerrit core', () => {
       );
       expect(rootPath).toEqual('/');
     });
+    it('can parse a valid authenticated gitiles url.', () => {
+      const config: GerritIntegrationConfig = {
+        host: 'gerrit.com',
+        gitilesBaseUrl: 'https://gerrit.com/gitiles',
+      };
+      const { branch, filePath, project } = parseGerritGitilesUrl(
+        config,
+        'https://gerrit.com/a/gitiles/web/project/+/refs/heads/master/README.md',
+      );
+      expect(project).toEqual('web/project');
+      expect(branch).toEqual('master');
+      expect(filePath).toEqual('README.md');
+
+      const { filePath: rootPath } = parseGerritGitilesUrl(
+        config,
+        'https://gerrit.com/gitiles/web/project/+/refs/heads/master',
+      );
+      expect(rootPath).toEqual('/');
+    });
     it('throws on incorrect gitiles urls.', () => {
       const config: GerritIntegrationConfig = {
         host: 'gerrit.com',
diff --git a/packages/integration/src/gerrit/core.ts b/packages/integration/src/gerrit/core.ts
index 0403d8fc75..b3bdbc30e4 100644
--- a/packages/integration/src/gerrit/core.ts
+++ b/packages/integration/src/gerrit/core.ts
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 import { trimStart } from 'lodash';
 import { GerritIntegrationConfig } from './config';
 
@@ -37,6 +36,7 @@ const GERRIT_BODY_PREFIX = ")]}'";
  *
  * Gitiles url:
  * https://g.com/optional_path/\{project\}/+/refs/heads/\{branch\}/\{filePath\}
+ * https://g.com/a/optional_path/\{project\}/+/refs/heads/\{branch\}/\{filePath\}
  *
  *
  * @param url - An URL pointing to a file stored in git.
@@ -47,7 +47,17 @@ export function parseGerritGitilesUrl(
   config: GerritIntegrationConfig,
   url: string,
 ): { branch: string; filePath: string; project: string } {
-  const urlPath = url.replace(config.gitilesBaseUrl!, '');
+  const baseUrlParse = new URL(config.gitilesBaseUrl!);
+  const urlParse = new URL(url);
+
+  // Remove the gerrit authentication prefix '/a/' from the url
+  // In case of the gitilesBaseUrl is https://review.gerrit.com/plugins/gitiles
+  // and the url provided is https://review.gerrit.com/a/plugins/gitiles/...
+  // remove the prefix only if the pathname start with '/a/'
+  const urlPath = urlParse.pathname
+    .substring(urlParse.pathname.startsWith('/a/') ? 2 : 0)
+    .replace(baseUrlParse.pathname, '');
+
   const parts = urlPath.split('/').filter(p => !!p);
 
   const projectEndIndex = parts.indexOf('+');
@@ -91,6 +101,28 @@ export function buildGerritGitilesUrl(
   }/${project}/+/refs/heads/${branch}/${trimStart(filePath, '/')}`;
 }
 
+/**
+ * Build a Gerrit Gitiles archive url that targets a specific branch and path
+ *
+ * @param config - A Gerrit provider config.
+ * @param project - The name of the git project
+ * @param branch - The branch we will target.
+ * @param filePath - The absolute file path.
+ * @public
+ */
+export function buildGerritGitilesArchiveUrl(
+  config: GerritIntegrationConfig,
+  project: string,
+  branch: string,
+  filePath: string,
+): string {
+  const archiveName =
+    filePath === '/' || filePath === '' ? '.tar.gz' : `/${filePath}.tar.gz`;
+  return `${getGitilesAuthenticationUrl(
+    config,
+  )}/${project}/+archive/refs/heads/${branch}${archiveName}`;
+}
+
 /**
  * Return the authentication prefix.
  *
@@ -109,6 +141,39 @@ export function getAuthenticationPrefix(
   return config.password ? '/a/' : '/';
 }
 
+/**
+ * Return the authentication gitiles url.
+ *
+ * @remarks
+ *
+ * To authenticate with a password the API url must be prefixed with "/a/".
+ * If no password is set anonymous access (without the prefix) will
+ * be used.
+ *
+ * @param config - A Gerrit provider config.
+ */
+export function getGitilesAuthenticationUrl(
+  config: GerritIntegrationConfig,
+): string {
+  if (!config.baseUrl || !config.gitilesBaseUrl) {
+    throw new Error(
+      'Unexpected Gerrit config values. baseUrl or gitilesBaseUrl not set.',
+    );
+  }
+  if (config.gitilesBaseUrl.startsWith(config.baseUrl)) {
+    return config.gitilesBaseUrl.replace(
+      config.baseUrl.concat('/'),
+      config.baseUrl.concat(getAuthenticationPrefix(config)),
+    );
+  }
+  if (config.password) {
+    throw new Error(
+      'Since the baseUrl (Gerrit) is not part of the gitilesBaseUrl, an authentication URL could not be constructed.',
+    );
+  }
+  return config.gitilesBaseUrl!;
+}
+
 /**
  * Return the url to get branch info from the Gerrit API.
  *
diff --git a/packages/integration/src/gerrit/index.ts b/packages/integration/src/gerrit/index.ts
index 127c949c4e..6c6295f7a3 100644
--- a/packages/integration/src/gerrit/index.ts
+++ b/packages/integration/src/gerrit/index.ts
@@ -19,6 +19,7 @@ export {
   readGerritIntegrationConfigs,
 } from './config';
 export {
+  buildGerritGitilesArchiveUrl,
   getGerritBranchApiUrl,
   getGerritCloneRepoUrl,
   getGerritFileContentsApiUrl,
diff --git a/packages/release-manifests/CHANGELOG.md b/packages/release-manifests/CHANGELOG.md
index f59447666f..024aa18386 100644
--- a/packages/release-manifests/CHANGELOG.md
+++ b/packages/release-manifests/CHANGELOG.md
@@ -1,5 +1,11 @@
 # @backstage/release-manifests
 
+## 0.0.10-next.0
+
+### Patch Changes
+
+- 8cec7664e146: Removed `@types/node` dependency
+
 ## 0.0.9
 
 ### Patch Changes
diff --git a/packages/release-manifests/catalog-info.yaml b/packages/release-manifests/catalog-info.yaml
new file mode 100644
index 0000000000..4564145a3d
--- /dev/null
+++ b/packages/release-manifests/catalog-info.yaml
@@ -0,0 +1,10 @@
+apiVersion: backstage.io/v1alpha1
+kind: Component
+metadata:
+  name: backstage-release-manifests
+  title: '@backstage/release-manifests'
+  description: Helper library for receiving release manifests
+spec:
+  lifecycle: experimental
+  type: backstage-common-library
+  owner: maintainers
diff --git a/packages/release-manifests/package.json b/packages/release-manifests/package.json
index 0c6ad64446..e5169bc681 100644
--- a/packages/release-manifests/package.json
+++ b/packages/release-manifests/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@backstage/release-manifests",
   "description": "Helper library for receiving release manifests",
-  "version": "0.0.9",
+  "version": "0.0.10-next.0",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "publishConfig": {
@@ -23,6 +23,7 @@
     "backstage"
   ],
   "license": "Apache-2.0",
+  "sideEffects": false,
   "scripts": {
     "build": "backstage-cli package build",
     "lint": "backstage-cli package lint",
@@ -37,7 +38,6 @@
   "devDependencies": {
     "@backstage/cli": "workspace:^",
     "@backstage/test-utils": "workspace:^",
-    "@types/node": "^16.0.0",
     "msw": "^1.0.0"
   },
   "files": [
diff --git a/packages/repo-tools/CHANGELOG.md b/packages/repo-tools/CHANGELOG.md
index 763c9f1cc1..5fff69f612 100644
--- a/packages/repo-tools/CHANGELOG.md
+++ b/packages/repo-tools/CHANGELOG.md
@@ -1,5 +1,54 @@
 # @backstage/repo-tools
 
+## 0.3.4-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/catalog-model@1.4.2-next.1
+  - @backstage/cli-common@0.1.12
+  - @backstage/cli-node@0.1.3
+  - @backstage/errors@1.2.1
+
+## 0.3.4-next.1
+
+### Patch Changes
+
+- 6f874cdb04eb: Fixed a bug with the `generate-catalog-info` command that could cause `metadata.description` values to be overwritten by `package.json` description values only because unrelated attributes were being changed.
+- Updated dependencies
+  - @backstage/catalog-model@1.4.2-next.0
+  - @backstage/cli-common@0.1.12
+  - @backstage/cli-node@0.1.3
+  - @backstage/errors@1.2.1
+
+## 0.3.4-next.0
+
+### Patch Changes
+
+- 0109d3f11159: The `generate-catalog-info` command now uses the first listed `CODEOWNER` as Component owner when initially
+  creating the `catalog-info.yaml` file. It continues to allow any one listed `CODEOWNER` when updating
+  entity metadata.
+- ec13d3e86028: Fixed a bug with the `generate-catalog-info` command that could cause the `--dry-run` flag to indicate changes to files when no changes would actually be made if the command were run without the flag.
+- db60a16e0a54: Added a `--ci` flag to the `generate-catalog-info` command. This flag behaves similarly to the same flag on `api-reports`: if `catalog-info.yaml` files would have been added or modified, then the process exits with status code `1`, and instructions are printed.
+- Updated dependencies
+  - @backstage/catalog-model@1.4.1
+  - @backstage/cli-common@0.1.12
+  - @backstage/cli-node@0.1.3
+  - @backstage/errors@1.2.1
+
+## 0.3.3
+
+### Patch Changes
+
+- 75702e85862a: Bumped `@microsoft/api-extractor` dependency to `^7.36.4`, and `@microsoft/api-documenter` to `^7.22.33`.
+- 1f3337ebc707: Introducing a new, experimental command `backstage-repo-tools generate-catalog-info`, which can be used to create standardized `catalog-info.yaml` files for each Backstage package in a Backstage monorepo. It can also be used to automatically fix existing `catalog-info.yaml` files with the correct metadata (including `metadata.name`, `metadata.title`, and `metadata.description` introspected from the package's `package.json`, as well as `spec.owner` introspected from `CODEOWNERS`), e.g. in a post-commit hook.
+- ebeb77586975: Update `schema openapi generate` command to now create a default router that can be imported and used directly.
+- Updated dependencies
+  - @backstage/cli-node@0.1.3
+  - @backstage/catalog-model@1.4.1
+  - @backstage/cli-common@0.1.12
+  - @backstage/errors@1.2.1
+
 ## 0.3.3-next.1
 
 ### Patch Changes
diff --git a/packages/repo-tools/catalog-info.yaml b/packages/repo-tools/catalog-info.yaml
new file mode 100644
index 0000000000..66b5ecc64b
--- /dev/null
+++ b/packages/repo-tools/catalog-info.yaml
@@ -0,0 +1,10 @@
+apiVersion: backstage.io/v1alpha1
+kind: Component
+metadata:
+  name: backstage-repo-tools
+  title: '@backstage/repo-tools'
+  description: 'CLI for Backstage repo tooling '
+spec:
+  lifecycle: experimental
+  type: backstage-cli
+  owner: maintainers
diff --git a/packages/repo-tools/cli-report.md b/packages/repo-tools/cli-report.md
index a0df5e721c..12d71f3be4 100644
--- a/packages/repo-tools/cli-report.md
+++ b/packages/repo-tools/cli-report.md
@@ -14,6 +14,7 @@ Options:
 Commands:
   api-reports [options] [paths...]
   type-deps
+  generate-catalog-info [options]
   schema [command]
   help [command]
 ```
@@ -36,6 +37,17 @@ Options:
   -h, --help
 ```
 
+### `backstage-repo-tools generate-catalog-info`
+
+```
+Usage: backstage-repo-tools generate-catalog-info [options]
+
+Options:
+  --dry-run
+  --ci
+  -h, --help
+```
+
 ### `backstage-repo-tools schema`
 
 ```
diff --git a/packages/repo-tools/package.json b/packages/repo-tools/package.json
index c5d9e266c9..49cb6578f3 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.3.3-next.1",
+  "version": "0.3.4-next.2",
   "publishConfig": {
     "access": "public"
   },
@@ -32,12 +32,13 @@
   "dependencies": {
     "@apidevtools/swagger-parser": "^10.1.0",
     "@apisyouwonthate/style-guide": "^1.4.0",
+    "@backstage/catalog-model": "workspace:^",
     "@backstage/cli-common": "workspace:^",
     "@backstage/cli-node": "workspace:^",
     "@backstage/errors": "workspace:^",
     "@manypkg/get-packages": "^1.1.3",
-    "@microsoft/api-documenter": "^7.19.27",
-    "@microsoft/api-extractor": "^7.33.7",
+    "@microsoft/api-documenter": "^7.22.33",
+    "@microsoft/api-extractor": "^7.36.4",
     "@stoplight/spectral-core": "^1.18.0",
     "@stoplight/spectral-formatters": "^1.1.0",
     "@stoplight/spectral-functions": "^1.7.2",
@@ -46,6 +47,7 @@
     "@stoplight/spectral-runtime": "^1.1.2",
     "@stoplight/types": "^13.14.0",
     "chalk": "^4.0.0",
+    "codeowners-utils": "^1.0.2",
     "commander": "^9.1.0",
     "fs-extra": "10.1.0",
     "glob": "^8.0.3",
@@ -54,7 +56,8 @@
     "lodash": "^4.17.21",
     "minimatch": "^5.1.1",
     "p-limit": "^3.0.2",
-    "ts-node": "^10.0.0"
+    "ts-node": "^10.0.0",
+    "yaml-diff-patch": "^2.0.0"
   },
   "devDependencies": {
     "@backstage/cli": "workspace:^",
diff --git a/packages/repo-tools/src/commands/generate-catalog-info/codeowners.ts b/packages/repo-tools/src/commands/generate-catalog-info/codeowners.ts
new file mode 100644
index 0000000000..25703e4fc2
--- /dev/null
+++ b/packages/repo-tools/src/commands/generate-catalog-info/codeowners.ts
@@ -0,0 +1,69 @@
+/*
+ * 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 {
+  CodeOwnersEntry,
+  CODEOWNERS_PATHS,
+  matchFile as matchCodeowner,
+  parse as parseCodeowners,
+} from 'codeowners-utils';
+import { relative as relativePath, resolve as resolvePath } from 'path';
+import { readFile } from './utils';
+
+export async function loadCodeowners(): Promise<CodeOwnersEntry[]> {
+  const maybeFiles = await Promise.allSettled(
+    CODEOWNERS_PATHS.map(async path =>
+      readFile(resolvePath('.', path), { encoding: 'utf-8' }),
+    ),
+  );
+  const file = maybeFiles.find(
+    maybeFile => maybeFile.status === 'fulfilled',
+  ) as PromiseFulfilledResult<string> | undefined;
+
+  if (!file) {
+    throw new Error(
+      'This utility expects a CODEOWNERS file, but no such file was found.',
+    );
+  }
+
+  return parseCodeowners(file.value);
+}
+
+export function getPossibleCodeowners(
+  codeowners: CodeOwnersEntry[],
+  relPath: string,
+): string[] {
+  const codeownerMaybe = matchCodeowner(relPath, codeowners);
+  return codeownerMaybe
+    ? codeownerMaybe.owners.map(
+        owner => (owner.match(/(?:\@[^\/]+\/)?([^\@\/]*)$/) || [])[1],
+      )
+    : [];
+}
+
+export function getOwnerFromCodeowners(
+  codeowners: CodeOwnersEntry[],
+  absPath: string,
+): string {
+  const relPath = relativePath('.', absPath);
+  const possibleOwners = getPossibleCodeowners(codeowners, relPath);
+  const owner = possibleOwners[0];
+
+  if (!owner) {
+    throw new Error(`${relPath} isn't owned by anyone in CODEOWNERS`);
+  }
+
+  return owner;
+}
diff --git a/packages/repo-tools/src/commands/generate-catalog-info/generate-catalog-info.ts b/packages/repo-tools/src/commands/generate-catalog-info/generate-catalog-info.ts
new file mode 100644
index 0000000000..b8a473c67b
--- /dev/null
+++ b/packages/repo-tools/src/commands/generate-catalog-info/generate-catalog-info.ts
@@ -0,0 +1,267 @@
+/*
+ * 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 YAML from 'js-yaml';
+import pLimit from 'p-limit';
+import { relative as relativePath, resolve as resolvePath } from 'path';
+import { yamlOverwrite } from 'yaml-diff-patch';
+import chalk from 'chalk';
+import { PackageGraph, PackageRole } from '@backstage/cli-node';
+import { Entity } from '@backstage/catalog-model';
+import {
+  getOwnerFromCodeowners,
+  getPossibleCodeowners,
+  loadCodeowners,
+} from './codeowners';
+import {
+  BackstagePackageJson,
+  isBackstagePackage,
+  isRejected,
+  isFulfilled,
+  readFile,
+  writeFile,
+} from './utils';
+import { CodeOwnersEntry } from 'codeowners-utils';
+
+type CreateFixPackageInfoYamlsOptions = {
+  ci?: boolean;
+  dryRun?: boolean;
+};
+
+export default async (opts: CreateFixPackageInfoYamlsOptions) => {
+  const { dryRun = false, ci = false } = opts;
+  const packages = await PackageGraph.listTargetPackages();
+  const codeowners = await loadCodeowners();
+  const limit = pLimit(10);
+
+  // If --ci is passed, don't make any changes to the file system; we're only
+  // interested in knowing if changes would have been made.
+  const isDryRun = ci ? true : dryRun;
+  const checkForChanges = ci;
+
+  const results = await Promise.allSettled<string>(
+    packages.map(({ packageJson, dir }) =>
+      limit(async () => {
+        if (!isBackstagePackage(packageJson)) {
+          return '';
+        }
+
+        // Check if there is already a corresponding catalog-info.yaml
+        const infoYamlPath = resolvePath(dir, 'catalog-info.yaml');
+        let yamlString = '';
+
+        try {
+          yamlString = await readFile(infoYamlPath, { encoding: 'utf-8' });
+        } catch (e) {
+          if (e.code === 'ENOENT') {
+            return await createCatalogInfoYaml({
+              yamlPath: infoYamlPath,
+              packageJson,
+              codeowners,
+              dryRun: isDryRun,
+            });
+          }
+
+          throw e;
+        }
+
+        return await fixCatalogInfoYaml({
+          yamlPath: infoYamlPath,
+          packageJson,
+          codeowners,
+          yamlString,
+          dryRun: isDryRun,
+          ci,
+        });
+      }),
+    ),
+  );
+
+  const rejects = results.filter(isRejected);
+  if (rejects.length > 0) {
+    // Problems encountered. Print details here.
+    console.error(
+      chalk.red('Unable to create or fix catalog-info.yaml files\n'),
+    );
+    rejects.forEach(reject => console.error(`  ${reject.reason}`));
+    console.error();
+    process.exit(1);
+  }
+
+  if (checkForChanges) {
+    const instructions = results
+      .filter(isFulfilled)
+      .map(r => r.value)
+      .filter(r => r !== '');
+
+    // Non-empty instructions indicate changes would have been made.
+    if (instructions.length > 0) {
+      console.error(
+        '\ncatalog-info.yaml file(s) out of sync with CODEOWNERS and/or package.json (see instructions above)\n',
+      );
+      process.exit(1);
+    } else {
+      console.error(
+        'catalog-info.yaml file(s) in sync with CODEOWNERS and package.json',
+      );
+    }
+  }
+};
+
+type CreateOptions = {
+  yamlPath: string;
+  packageJson: BackstagePackageJson;
+  codeowners: CodeOwnersEntry[];
+  dryRun: boolean;
+};
+
+type FixOptions = CreateOptions & {
+  yamlString: string;
+  ci: boolean;
+};
+
+type BackstagePackageEntity = Entity & {
+  spec: {
+    type: 'backstage-package';
+    backstageRole: PackageRole;
+    lifecycle: string;
+    owner: string;
+    [key: string]: any;
+  };
+};
+
+async function createCatalogInfoYaml(options: CreateOptions) {
+  const { codeowners, dryRun, packageJson, yamlPath } = options;
+  const instruction = `Create ${relativePath('.', yamlPath)}`;
+  const owner = getOwnerFromCodeowners(codeowners, yamlPath);
+  const entity = createOrMergeEntity(packageJson, owner);
+
+  if (dryRun) {
+    console.error(instruction);
+  } else {
+    await writeFile(yamlPath, YAML.dump(entity));
+  }
+
+  return instruction;
+}
+
+async function fixCatalogInfoYaml(options: FixOptions) {
+  const { ci, codeowners, dryRun, packageJson, yamlPath, yamlString } = options;
+  const possibleOwners = getPossibleCodeowners(
+    codeowners,
+    relativePath('.', yamlPath),
+  );
+  const safeName = packageJson.name
+    .replace(/[^a-z0-9_\-\.]+/g, '-')
+    .replace(/^[^a-z0-9]|[^a-z0-9]$/g, '');
+  let yamlJson: BackstagePackageEntity;
+
+  try {
+    yamlJson = YAML.load(yamlString) as BackstagePackageEntity;
+  } catch (e) {
+    throw new Error(`Unable to parse ${relativePath('.', yamlPath)}: ${e}`);
+  }
+
+  const badOwner = !possibleOwners.includes(yamlJson.spec?.owner);
+  const badTitle = yamlJson.metadata.title !== packageJson.name;
+  const badName = yamlJson.metadata.name !== safeName;
+  const badType =
+    yamlJson.spec?.type !== `backstage-${packageJson.backstage.role}`;
+
+  if (badOwner || badTitle || badName || badType) {
+    const owner = badOwner
+      ? getOwnerFromCodeowners(codeowners, yamlPath)
+      : yamlJson.spec?.owner;
+    const newJson = createOrMergeEntity(packageJson, owner, yamlJson);
+    const instructions = [`Update ${relativePath('.', yamlPath)}`];
+
+    // Show more detailed instructions when --ci flag is set.
+    if (ci) {
+      if (badOwner) {
+        instructions.push(
+          `  spec.owner cannot be "${
+            yamlJson.spec.owner
+          }" because it must be one of (${possibleOwners.join(
+            ', ',
+          )}) as listed in CODEOWNERS`,
+        );
+      }
+
+      if (badTitle) {
+        instructions.push(
+          `  metadata.title cannot be "${yamlJson.metadata.title}" because it must be exactly "${packageJson.name}", the package.json name`,
+        );
+      }
+
+      if (badName) {
+        instructions.push(
+          `  metadata.name cannot be "${yamlJson.metadata.name}" because it must be exactly "${safeName}", as derived from package.json name`,
+        );
+      }
+
+      if (badType) {
+        instructions.push(
+          `  spec.type cannot be "${yamlJson.spec.type}" because it must be exactly "backstage-${packageJson.backstage.role}", as derived from package.json backstage.role`,
+        );
+      }
+    }
+
+    if (dryRun) {
+      console.error(instructions.join('\n'));
+    } else {
+      await writeFile(yamlPath, yamlOverwrite(yamlString, newJson));
+    }
+
+    return instructions.join('\n');
+  }
+
+  return '';
+}
+
+/**
+ * Canonical representation on how to create (or update) a backstage-package
+ * component.
+ */
+function createOrMergeEntity(
+  packageJson: BackstagePackageJson,
+  owner: string,
+  existingEntity: BackstagePackageEntity | Record<string, any> = {},
+): BackstagePackageEntity {
+  const safeEntityName = packageJson.name
+    .replace(/[^a-z0-9_\-\.]+/g, '-')
+    .replace(/^[^a-z0-9]|[^a-z0-9]$/g, '');
+
+  return {
+    ...existingEntity,
+    apiVersion: 'backstage.io/v1alpha1',
+    kind: 'Component',
+    metadata: {
+      ...existingEntity.metadata,
+      // Provide default name/title/description values.
+      name: safeEntityName,
+      title: packageJson.name,
+      ...(packageJson.description && !existingEntity.metadata?.description
+        ? { description: packageJson.description }
+        : undefined),
+    },
+    spec: {
+      lifecycle: 'experimental',
+      ...existingEntity.spec,
+      type: `backstage-${packageJson.backstage.role}`,
+      owner,
+    },
+  };
+}
diff --git a/packages/repo-tools/src/commands/generate-catalog-info/utils.ts b/packages/repo-tools/src/commands/generate-catalog-info/utils.ts
new file mode 100644
index 0000000000..b00fbd57a8
--- /dev/null
+++ b/packages/repo-tools/src/commands/generate-catalog-info/utils.ts
@@ -0,0 +1,50 @@
+/*
+ * Copyright 2023 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+import fs from 'fs';
+import { Package } from '@manypkg/get-packages';
+import {
+  BackstagePackageJson as BackstagePackageJsonActual,
+  PackageRole,
+} from '@backstage/cli-node';
+import { promisify } from 'util';
+
+export const readFile = promisify(fs.readFile);
+export const writeFile = promisify(fs.writeFile);
+
+export type BackstagePackageJson = BackstagePackageJsonActual & {
+  description?: string;
+  backstage: {
+    role: PackageRole;
+  };
+};
+
+export function isBackstagePackage(
+  packageJson: Package['packageJson'],
+): packageJson is BackstagePackageJson {
+  return (
+    packageJson &&
+    packageJson.hasOwnProperty('backstage') &&
+    (packageJson as any)?.backstage?.role !== 'undefined'
+  );
+}
+
+export const isRejected = (
+  input: PromiseSettledResult<unknown>,
+): input is PromiseRejectedResult => input.status === 'rejected';
+
+export const isFulfilled = <T>(
+  input: PromiseSettledResult<T>,
+): input is PromiseFulfilledResult<T> => input.status === 'fulfilled';
diff --git a/packages/repo-tools/src/commands/index.ts b/packages/repo-tools/src/commands/index.ts
index e19ffde4b8..c429a253f8 100644
--- a/packages/repo-tools/src/commands/index.ts
+++ b/packages/repo-tools/src/commands/index.ts
@@ -96,6 +96,25 @@ export function registerCommands(program: Command) {
     .description('Find inconsistencies in types of all packages and plugins')
     .action(lazy(() => import('./type-deps/type-deps').then(m => m.default)));
 
+  program
+    .command('generate-catalog-info')
+    .option(
+      '--dry-run',
+      'Shows what would happen without actually writing any yaml.',
+    )
+    .option(
+      '--ci',
+      'CI run checks that there are no changes to catalog-info.yaml files',
+    )
+    .description('Create or fix info yaml files for all backstage packages')
+    .action(
+      lazy(() =>
+        import('./generate-catalog-info/generate-catalog-info').then(
+          m => m.default,
+        ),
+      ),
+    );
+
   registerSchemaCommand(program);
 }
 
diff --git a/packages/techdocs-cli-embedded-app/CHANGELOG.md b/packages/techdocs-cli-embedded-app/CHANGELOG.md
index 915d54fec3..96af70f375 100644
--- a/packages/techdocs-cli-embedded-app/CHANGELOG.md
+++ b/packages/techdocs-cli-embedded-app/CHANGELOG.md
@@ -1,5 +1,91 @@
 # techdocs-cli-embedded-app
 
+## 0.2.86-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-techdocs@1.7.0-next.2
+  - @backstage/plugin-catalog@1.13.0-next.2
+  - @backstage/integration-react@1.1.19-next.2
+  - @backstage/core-components@0.13.5-next.2
+  - @backstage/core-plugin-api@1.6.0-next.2
+  - @backstage/app-defaults@1.4.3-next.2
+  - @backstage/core-app-api@1.10.0-next.2
+  - @backstage/test-utils@1.4.3-next.2
+  - @backstage/config@1.1.0-next.1
+  - @backstage/cli@0.22.13-next.2
+  - @backstage/plugin-techdocs-react@1.1.10-next.2
+  - @backstage/catalog-model@1.4.2-next.1
+  - @backstage/theme@0.4.1
+
+## 0.2.86-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.13.5-next.1
+  - @backstage/config@1.1.0-next.0
+  - @backstage/plugin-catalog@1.12.5-next.1
+  - @backstage/plugin-techdocs@1.6.9-next.1
+  - @backstage/app-defaults@1.4.3-next.1
+  - @backstage/cli@0.22.13-next.1
+  - @backstage/integration-react@1.1.19-next.1
+  - @backstage/plugin-techdocs-react@1.1.10-next.1
+  - @backstage/catalog-model@1.4.2-next.0
+  - @backstage/core-app-api@1.10.0-next.1
+  - @backstage/core-plugin-api@1.6.0-next.1
+  - @backstage/test-utils@1.4.3-next.1
+  - @backstage/theme@0.4.1
+
+## 0.2.86-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/integration-react@1.1.18-next.0
+  - @backstage/plugin-catalog@1.12.4-next.0
+  - @backstage/cli@0.22.12-next.0
+  - @backstage/plugin-techdocs@1.6.8-next.0
+  - @backstage/core-app-api@1.10.0-next.0
+  - @backstage/core-plugin-api@1.6.0-next.0
+  - @backstage/core-components@0.13.5-next.0
+  - @backstage/app-defaults@1.4.3-next.0
+  - @backstage/catalog-model@1.4.1
+  - @backstage/config@1.0.8
+  - @backstage/test-utils@1.4.3-next.0
+  - @backstage/theme@0.4.1
+  - @backstage/plugin-techdocs-react@1.1.10-next.0
+
+## 0.2.85
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-app-api@1.9.1
+  - @backstage/integration-react@1.1.16
+  - @backstage/cli@0.22.10
+  - @backstage/core-components@0.13.4
+  - @backstage/plugin-catalog@1.12.1
+  - @backstage/app-defaults@1.4.2
+  - @backstage/core-plugin-api@1.5.3
+  - @backstage/test-utils@1.4.2
+  - @backstage/plugin-techdocs@1.6.6
+  - @backstage/catalog-model@1.4.1
+  - @backstage/config@1.0.8
+  - @backstage/theme@0.4.1
+  - @backstage/plugin-techdocs-react@1.1.9
+
+## 0.2.85-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog@1.12.1-next.2
+  - @backstage/plugin-techdocs@1.6.6-next.2
+  - @backstage/cli@0.22.10-next.1
+  - @backstage/integration-react@1.1.16-next.1
+
 ## 0.2.85-next.1
 
 ### Patch Changes
diff --git a/packages/techdocs-cli-embedded-app/catalog-info.yaml b/packages/techdocs-cli-embedded-app/catalog-info.yaml
new file mode 100644
index 0000000000..27c9325210
--- /dev/null
+++ b/packages/techdocs-cli-embedded-app/catalog-info.yaml
@@ -0,0 +1,9 @@
+apiVersion: backstage.io/v1alpha1
+kind: Component
+metadata:
+  name: techdocs-cli-embedded-app
+  title: techdocs-cli-embedded-app
+spec:
+  lifecycle: production
+  type: backstage-frontend
+  owner: techdocs-maintainers
diff --git a/packages/techdocs-cli-embedded-app/package.json b/packages/techdocs-cli-embedded-app/package.json
index d980d2ab6c..8847b535a9 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.85-next.1",
+  "version": "0.2.86-next.2",
   "private": true,
   "backstage": {
     "role": "frontend"
@@ -40,7 +40,6 @@
     "@testing-library/jest-dom": "^5.10.1",
     "@testing-library/react": "^12.1.3",
     "@testing-library/user-event": "^14.0.0",
-    "@types/node": "^16.11.26",
     "@types/react": "*",
     "@types/react-dom": "*",
     "cross-env": "^7.0.0",
diff --git a/packages/techdocs-cli/CHANGELOG.md b/packages/techdocs-cli/CHANGELOG.md
index ec0678b2d6..cbaa7ac27c 100644
--- a/packages/techdocs-cli/CHANGELOG.md
+++ b/packages/techdocs-cli/CHANGELOG.md
@@ -1,5 +1,62 @@
 # @techdocs/cli
 
+## 1.5.0-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config@1.1.0-next.1
+  - @backstage/backend-common@0.19.5-next.2
+  - @backstage/catalog-model@1.4.2-next.1
+  - @backstage/plugin-techdocs-node@1.8.0-next.2
+  - @backstage/cli-common@0.1.12
+
+## 1.5.0-next.1
+
+### Minor Changes
+
+- 10a86bd4ae12: Add optional config and cli option for techdocs to specify default mkdocs plugins.
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config@1.1.0-next.0
+  - @backstage/plugin-techdocs-node@1.8.0-next.1
+  - @backstage/backend-common@0.19.5-next.1
+  - @backstage/catalog-model@1.4.2-next.0
+  - @backstage/cli-common@0.1.12
+
+## 1.4.7-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.19.4-next.0
+  - @backstage/catalog-model@1.4.1
+  - @backstage/cli-common@0.1.12
+  - @backstage/config@1.0.8
+  - @backstage/plugin-techdocs-node@1.7.6-next.0
+
+## 1.4.5
+
+### Patch Changes
+
+- 971bdd6a4732: Bumped internal `nodemon` dependency.
+- Updated dependencies
+  - @backstage/backend-common@0.19.2
+  - @backstage/plugin-techdocs-node@1.7.4
+  - @backstage/catalog-model@1.4.1
+  - @backstage/cli-common@0.1.12
+  - @backstage/config@1.0.8
+
+## 1.4.5-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.19.2-next.2
+  - @backstage/plugin-techdocs-node@1.7.4-next.2
+
 ## 1.4.5-next.1
 
 ### Patch Changes
diff --git a/packages/techdocs-cli/catalog-info.yaml b/packages/techdocs-cli/catalog-info.yaml
new file mode 100644
index 0000000000..da80a9be3d
--- /dev/null
+++ b/packages/techdocs-cli/catalog-info.yaml
@@ -0,0 +1,10 @@
+apiVersion: backstage.io/v1alpha1
+kind: Component
+metadata:
+  name: techdocs-cli
+  title: '@techdocs/cli'
+  description: Utility CLI for managing TechDocs sites in Backstage.
+spec:
+  lifecycle: production
+  type: backstage-cli
+  owner: techdocs-maintainers
diff --git a/packages/techdocs-cli/cli-report.md b/packages/techdocs-cli/cli-report.md
index 556068de85..5f148daf24 100644
--- a/packages/techdocs-cli/cli-report.md
+++ b/packages/techdocs-cli/cli-report.md
@@ -37,6 +37,7 @@ Options:
   -v --verbose
   --omitTechdocsCoreMkdocsPlugin
   --legacyCopyReadmeMdToIndexMd
+  --defaultPlugin [defaultPlugins...]
   -h, --help
 ```
 
diff --git a/packages/techdocs-cli/package.json b/packages/techdocs-cli/package.json
index 82ba61e0f6..7adf7561bc 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.4.5-next.1",
+  "version": "1.5.0-next.2",
   "publishConfig": {
     "access": "public"
   },
@@ -46,7 +46,7 @@
     "@types/webpack-env": "^1.15.3",
     "cypress": "^10.0.0",
     "find-process": "^1.4.5",
-    "nodemon": "^2.0.2",
+    "nodemon": "^3.0.1",
     "techdocs-cli-embedded-app": "link:../techdocs-cli-embedded-app",
     "ts-node": "^10.0.0"
   },
diff --git a/packages/techdocs-cli/src/commands/generate/generate.ts b/packages/techdocs-cli/src/commands/generate/generate.ts
index 5d80beb38a..934eaf1efd 100644
--- a/packages/techdocs-cli/src/commands/generate/generate.ts
+++ b/packages/techdocs-cli/src/commands/generate/generate.ts
@@ -47,6 +47,7 @@ export default async function generate(opts: OptionValues) {
   const dockerImage = opts.dockerImage;
   const pullImage = opts.pull;
   const legacyCopyReadmeMdToIndexMd = opts.legacyCopyReadmeMdToIndexMd;
+  const defaultPlugins = opts.defaultPlugin;
 
   logger.info(`Using source dir ${sourceDir}`);
   logger.info(`Will output generated files in ${outputDir}`);
@@ -68,6 +69,7 @@ export default async function generate(opts: OptionValues) {
         mkdocs: {
           legacyCopyReadmeMdToIndexMd,
           omitTechdocsCorePlugin,
+          defaultPlugins,
         },
       },
     },
diff --git a/packages/techdocs-cli/src/commands/index.ts b/packages/techdocs-cli/src/commands/index.ts
index 98816a6b32..3321bb7f43 100644
--- a/packages/techdocs-cli/src/commands/index.ts
+++ b/packages/techdocs-cli/src/commands/index.ts
@@ -70,6 +70,11 @@ export function registerCommands(program: Command) {
       'Attempt to ensure an index.md exists falling back to using <docs-dir>/README.md or README.md in case a default <docs-dir>/index.md is not provided.',
       false,
     )
+    .option(
+      '--defaultPlugin [defaultPlugins...]',
+      'Plugins which should be added automatically to the mkdocs.yaml file',
+      [],
+    )
     .alias('build')
     .action(lazy(() => import('./generate/generate').then(m => m.default)));
 
diff --git a/packages/test-utils/CHANGELOG.md b/packages/test-utils/CHANGELOG.md
index a3fb8ba382..e2170a7169 100644
--- a/packages/test-utils/CHANGELOG.md
+++ b/packages/test-utils/CHANGELOG.md
@@ -1,5 +1,58 @@
 # @backstage/test-utils
 
+## 1.4.3-next.2
+
+### Patch Changes
+
+- 8cec7664e146: Removed `@types/node` dependency
+- Updated dependencies
+  - @backstage/core-plugin-api@1.6.0-next.2
+  - @backstage/core-app-api@1.10.0-next.2
+  - @backstage/config@1.1.0-next.1
+  - @backstage/plugin-permission-react@0.4.15-next.2
+  - @backstage/plugin-permission-common@0.7.8-next.1
+  - @backstage/theme@0.4.1
+  - @backstage/types@1.1.0
+
+## 1.4.3-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config@1.1.0-next.0
+  - @backstage/core-app-api@1.10.0-next.1
+  - @backstage/core-plugin-api@1.6.0-next.1
+  - @backstage/plugin-permission-common@0.7.8-next.0
+  - @backstage/plugin-permission-react@0.4.15-next.1
+  - @backstage/theme@0.4.1
+  - @backstage/types@1.1.0
+
+## 1.4.3-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-app-api@1.10.0-next.0
+  - @backstage/core-plugin-api@1.6.0-next.0
+  - @backstage/config@1.0.8
+  - @backstage/theme@0.4.1
+  - @backstage/types@1.1.0
+  - @backstage/plugin-permission-common@0.7.7
+  - @backstage/plugin-permission-react@0.4.15-next.0
+
+## 1.4.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-app-api@1.9.1
+  - @backstage/core-plugin-api@1.5.3
+  - @backstage/config@1.0.8
+  - @backstage/theme@0.4.1
+  - @backstage/types@1.1.0
+  - @backstage/plugin-permission-common@0.7.7
+  - @backstage/plugin-permission-react@0.4.14
+
 ## 1.4.2-next.0
 
 ### Patch Changes
diff --git a/packages/test-utils/alpha-api-report.md b/packages/test-utils/alpha-api-report.md
index 3e0c4aa6c2..c37d79279c 100644
--- a/packages/test-utils/alpha-api-report.md
+++ b/packages/test-utils/alpha-api-report.md
@@ -4,11 +4,12 @@
 
 ```ts
 import { PropsWithChildren } from 'react';
+import { default as React_2 } from 'react';
 
 // @alpha
 export const MockPluginProvider: ({
   children,
-}: PropsWithChildren<{}>) => JSX.Element;
+}: PropsWithChildren<{}>) => React_2.JSX.Element;
 
 // (No @packageDocumentation comment for this package)
 ```
diff --git a/packages/test-utils/api-report.md b/packages/test-utils/api-report.md
index 01fc31c28f..d4b38a243e 100644
--- a/packages/test-utils/api-report.md
+++ b/packages/test-utils/api-report.md
@@ -26,6 +26,7 @@ import { JsonValue } from '@backstage/types';
 import { MatcherFunction } from '@testing-library/react';
 import { Observable } from '@backstage/types';
 import { PermissionApi } from '@backstage/plugin-permission-react';
+import { default as React_2 } from 'react';
 import { ReactElement } from 'react';
 import { ReactNode } from 'react';
 import { RenderOptions } from '@testing-library/react';
@@ -214,7 +215,7 @@ export type SyncLogCollector = () => void;
 // @public
 export const TestApiProvider: <T extends any[]>(
   props: TestApiProviderProps<T>,
-) => JSX.Element;
+) => React_2.JSX.Element;
 
 // @public
 export type TestApiProviderProps<TApiPairs extends any[]> = {
diff --git a/packages/test-utils/catalog-info.yaml b/packages/test-utils/catalog-info.yaml
new file mode 100644
index 0000000000..4b894f08b5
--- /dev/null
+++ b/packages/test-utils/catalog-info.yaml
@@ -0,0 +1,10 @@
+apiVersion: backstage.io/v1alpha1
+kind: Component
+metadata:
+  name: backstage-test-utils
+  title: '@backstage/test-utils'
+  description: Utilities to test Backstage plugins and apps.
+spec:
+  lifecycle: production
+  type: backstage-web-library
+  owner: maintainers
diff --git a/packages/test-utils/package.json b/packages/test-utils/package.json
index ef074d13b2..1ba9c0229e 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.4.2-next.0",
+  "version": "1.4.3-next.2",
   "publishConfig": {
     "access": "public"
   },
@@ -35,6 +35,7 @@
   "license": "Apache-2.0",
   "main": "src/index.ts",
   "types": "src/index.ts",
+  "sideEffects": false,
   "scripts": {
     "build": "backstage-cli package build",
     "lint": "backstage-cli package lint",
@@ -69,7 +70,6 @@
   },
   "devDependencies": {
     "@backstage/cli": "workspace:^",
-    "@types/node": "^16.11.26",
     "msw": "^1.0.0"
   },
   "files": [
diff --git a/packages/test-utils/src/testUtils/appWrappers.tsx b/packages/test-utils/src/testUtils/appWrappers.tsx
index 6545cc312a..0aec9ff4f8 100644
--- a/packages/test-utils/src/testUtils/appWrappers.tsx
+++ b/packages/test-utils/src/testUtils/appWrappers.tsx
@@ -255,7 +255,8 @@ export const textContentMatcher =
       return false;
     }
 
-    const hasText = (textNode: Element) => textNode?.textContent === text;
+    const hasText = (textNode: Element) =>
+      textNode?.textContent?.includes(text) ?? false;
     const childrenDontHaveText = (containerNode: Element) =>
       Array.from(containerNode?.children).every(child => !hasText(child));
 
diff --git a/packages/theme/catalog-info.yaml b/packages/theme/catalog-info.yaml
new file mode 100644
index 0000000000..1fee85f58d
--- /dev/null
+++ b/packages/theme/catalog-info.yaml
@@ -0,0 +1,10 @@
+apiVersion: backstage.io/v1alpha1
+kind: Component
+metadata:
+  name: backstage-theme
+  title: '@backstage/theme'
+  description: material-ui theme for use with Backstage.
+spec:
+  lifecycle: experimental
+  type: backstage-web-library
+  owner: maintainers
diff --git a/packages/theme/package.json b/packages/theme/package.json
index f5d1f090cf..1e035770e7 100644
--- a/packages/theme/package.json
+++ b/packages/theme/package.json
@@ -22,6 +22,7 @@
   "license": "Apache-2.0",
   "main": "src/index.ts",
   "types": "src/index.ts",
+  "sideEffects": false,
   "scripts": {
     "build": "backstage-cli package build",
     "lint": "backstage-cli package lint",
diff --git a/packages/types/catalog-info.yaml b/packages/types/catalog-info.yaml
new file mode 100644
index 0000000000..1bd30379cc
--- /dev/null
+++ b/packages/types/catalog-info.yaml
@@ -0,0 +1,10 @@
+apiVersion: backstage.io/v1alpha1
+kind: Component
+metadata:
+  name: backstage-types
+  title: '@backstage/types'
+  description: Common TypeScript types used within Backstage
+spec:
+  lifecycle: production
+  type: backstage-common-library
+  owner: maintainers
diff --git a/packages/types/package.json b/packages/types/package.json
index 76dbcd3606..29092dfdff 100644
--- a/packages/types/package.json
+++ b/packages/types/package.json
@@ -23,6 +23,7 @@
   "keywords": [
     "backstage"
   ],
+  "sideEffects": false,
   "scripts": {
     "build": "backstage-cli package build",
     "lint": "backstage-cli package lint",
diff --git a/packages/version-bridge/catalog-info.yaml b/packages/version-bridge/catalog-info.yaml
new file mode 100644
index 0000000000..6f37a4b276
--- /dev/null
+++ b/packages/version-bridge/catalog-info.yaml
@@ -0,0 +1,12 @@
+apiVersion: backstage.io/v1alpha1
+kind: Component
+metadata:
+  name: backstage-version-bridge
+  title: '@backstage/version-bridge'
+  description: >-
+    Utilities used by @backstage packages to support multiple concurrent
+    versions
+spec:
+  lifecycle: production
+  type: backstage-web-library
+  owner: maintainers
diff --git a/packages/version-bridge/package.json b/packages/version-bridge/package.json
index 7e42bcb4cb..eb08531674 100644
--- a/packages/version-bridge/package.json
+++ b/packages/version-bridge/package.json
@@ -22,6 +22,7 @@
   "license": "Apache-2.0",
   "main": "src/index.ts",
   "types": "src/index.ts",
+  "sideEffects": false,
   "scripts": {
     "build": "backstage-cli package build",
     "lint": "backstage-cli package lint",
diff --git a/plugins/adr-backend/CHANGELOG.md b/plugins/adr-backend/CHANGELOG.md
index 07b40ac349..cc78d9d886 100644
--- a/plugins/adr-backend/CHANGELOG.md
+++ b/plugins/adr-backend/CHANGELOG.md
@@ -1,5 +1,73 @@
 # @backstage/plugin-adr-backend
 
+## 0.3.9-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config@1.1.0-next.1
+  - @backstage/backend-common@0.19.5-next.2
+  - @backstage/integration@1.7.0-next.2
+  - @backstage/backend-plugin-api@0.6.3-next.2
+  - @backstage/catalog-model@1.4.2-next.1
+  - @backstage/catalog-client@1.4.4-next.1
+  - @backstage/errors@1.2.1
+  - @backstage/plugin-adr-common@0.2.15-next.2
+  - @backstage/plugin-search-common@1.2.6-next.1
+
+## 0.3.9-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config@1.1.0-next.0
+  - @backstage/integration@1.7.0-next.1
+  - @backstage/backend-common@0.19.5-next.1
+  - @backstage/backend-plugin-api@0.6.3-next.1
+  - @backstage/catalog-model@1.4.2-next.0
+  - @backstage/plugin-adr-common@0.2.15-next.1
+  - @backstage/catalog-client@1.4.4-next.0
+  - @backstage/errors@1.2.1
+  - @backstage/plugin-search-common@1.2.6-next.0
+
+## 0.3.8-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.19.4-next.0
+  - @backstage/integration@1.7.0-next.0
+  - @backstage/backend-plugin-api@0.6.2-next.0
+  - @backstage/catalog-client@1.4.3
+  - @backstage/catalog-model@1.4.1
+  - @backstage/config@1.0.8
+  - @backstage/errors@1.2.1
+  - @backstage/plugin-adr-common@0.2.14-next.0
+  - @backstage/plugin-search-common@1.2.5
+
+## 0.3.6
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.19.2
+  - @backstage/backend-plugin-api@0.6.0
+  - @backstage/integration@1.6.0
+  - @backstage/catalog-client@1.4.3
+  - @backstage/catalog-model@1.4.1
+  - @backstage/config@1.0.8
+  - @backstage/errors@1.2.1
+  - @backstage/plugin-adr-common@0.2.12
+  - @backstage/plugin-search-common@1.2.5
+
+## 0.3.6-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@0.6.0-next.2
+  - @backstage/backend-common@0.19.2-next.2
+
 ## 0.3.6-next.1
 
 ### Patch Changes
diff --git a/plugins/adr-backend/api-report.md b/plugins/adr-backend/api-report.md
index 2fd22ef9cd..1247a7aa8f 100644
--- a/plugins/adr-backend/api-report.md
+++ b/plugins/adr-backend/api-report.md
@@ -45,7 +45,8 @@ export type AdrParserContext = {
 };
 
 // @public
-export const adrPlugin: () => BackendFeature;
+const adrPlugin: () => BackendFeature;
+export default adrPlugin;
 
 // @public (undocumented)
 export type AdrRouterOptions = {
diff --git a/plugins/adr-backend/catalog-info.yaml b/plugins/adr-backend/catalog-info.yaml
new file mode 100644
index 0000000000..9bd35f2722
--- /dev/null
+++ b/plugins/adr-backend/catalog-info.yaml
@@ -0,0 +1,9 @@
+apiVersion: backstage.io/v1alpha1
+kind: Component
+metadata:
+  name: backstage-plugin-adr-backend
+  title: '@backstage/plugin-adr-backend'
+spec:
+  lifecycle: experimental
+  type: backstage-backend-plugin
+  owner: kuangp
diff --git a/plugins/adr-backend/package.json b/plugins/adr-backend/package.json
index 0caa9563d8..80d0e65f5b 100644
--- a/plugins/adr-backend/package.json
+++ b/plugins/adr-backend/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-adr-backend",
-  "version": "0.3.6-next.1",
+  "version": "0.3.9-next.2",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
diff --git a/plugins/adr-backend/src/index.ts b/plugins/adr-backend/src/index.ts
index eeaf6b4cd0..a2a9788dcb 100644
--- a/plugins/adr-backend/src/index.ts
+++ b/plugins/adr-backend/src/index.ts
@@ -22,4 +22,4 @@
 
 export * from './search';
 export * from './service';
-export { adrPlugin } from './plugin';
+export { adrPlugin as default } from './plugin';
diff --git a/plugins/adr-common/CHANGELOG.md b/plugins/adr-common/CHANGELOG.md
index 9b8d5dbf74..13cc0dfa53 100644
--- a/plugins/adr-common/CHANGELOG.md
+++ b/plugins/adr-common/CHANGELOG.md
@@ -1,5 +1,41 @@
 # @backstage/plugin-adr-common
 
+## 0.2.15-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/integration@1.7.0-next.2
+  - @backstage/catalog-model@1.4.2-next.1
+  - @backstage/plugin-search-common@1.2.6-next.1
+
+## 0.2.15-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/integration@1.7.0-next.1
+  - @backstage/catalog-model@1.4.2-next.0
+  - @backstage/plugin-search-common@1.2.6-next.0
+
+## 0.2.14-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/integration@1.7.0-next.0
+  - @backstage/catalog-model@1.4.1
+  - @backstage/plugin-search-common@1.2.5
+
+## 0.2.12
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/integration@1.6.0
+  - @backstage/catalog-model@1.4.1
+  - @backstage/plugin-search-common@1.2.5
+
 ## 0.2.11
 
 ### Patch Changes
diff --git a/plugins/adr-common/catalog-info.yaml b/plugins/adr-common/catalog-info.yaml
new file mode 100644
index 0000000000..defcbe9fdb
--- /dev/null
+++ b/plugins/adr-common/catalog-info.yaml
@@ -0,0 +1,10 @@
+apiVersion: backstage.io/v1alpha1
+kind: Component
+metadata:
+  name: backstage-plugin-adr-common
+  title: '@backstage/plugin-adr-common'
+  description: Common functionalities for the adr plugin
+spec:
+  lifecycle: experimental
+  type: backstage-common-library
+  owner: kuangp
diff --git a/plugins/adr-common/package.json b/plugins/adr-common/package.json
index 2def65cf55..e9315cab0d 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.11",
+  "version": "0.2.15-next.2",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
@@ -20,6 +20,7 @@
     "url": "https://github.com/backstage/backstage",
     "directory": "plugins/adr-common"
   },
+  "sideEffects": false,
   "scripts": {
     "build": "backstage-cli package build",
     "lint": "backstage-cli package lint",
diff --git a/plugins/adr/CHANGELOG.md b/plugins/adr/CHANGELOG.md
index 57f888eaa7..17009339d9 100644
--- a/plugins/adr/CHANGELOG.md
+++ b/plugins/adr/CHANGELOG.md
@@ -1,5 +1,75 @@
 # @backstage/plugin-adr
 
+## 0.6.7-next.2
+
+### Patch Changes
+
+- 8cec7664e146: Removed `@types/node` dependency
+- Updated dependencies
+  - @backstage/integration-react@1.1.19-next.2
+  - @backstage/core-components@0.13.5-next.2
+  - @backstage/core-plugin-api@1.6.0-next.2
+  - @backstage/plugin-catalog-react@1.8.4-next.2
+  - @backstage/plugin-search-react@1.7.0-next.2
+  - @backstage/catalog-model@1.4.2-next.1
+  - @backstage/theme@0.4.1
+  - @backstage/plugin-adr-common@0.2.15-next.2
+  - @backstage/plugin-search-common@1.2.6-next.1
+
+## 0.6.7-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.8.4-next.1
+  - @backstage/core-components@0.13.5-next.1
+  - @backstage/plugin-search-react@1.7.0-next.1
+  - @backstage/integration-react@1.1.19-next.1
+  - @backstage/catalog-model@1.4.2-next.0
+  - @backstage/core-plugin-api@1.6.0-next.1
+  - @backstage/plugin-adr-common@0.2.15-next.1
+  - @backstage/theme@0.4.1
+  - @backstage/plugin-search-common@1.2.6-next.0
+
+## 0.6.6-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/integration-react@1.1.18-next.0
+  - @backstage/core-plugin-api@1.6.0-next.0
+  - @backstage/core-components@0.13.5-next.0
+  - @backstage/catalog-model@1.4.1
+  - @backstage/theme@0.4.1
+  - @backstage/plugin-adr-common@0.2.14-next.0
+  - @backstage/plugin-catalog-react@1.8.3-next.0
+  - @backstage/plugin-search-common@1.2.5
+  - @backstage/plugin-search-react@1.6.5-next.0
+
+## 0.6.4
+
+### Patch Changes
+
+- 12a8c94eda8d: Add package repository and homepage metadata
+- Updated dependencies
+  - @backstage/integration-react@1.1.16
+  - @backstage/core-components@0.13.4
+  - @backstage/plugin-catalog-react@1.8.1
+  - @backstage/core-plugin-api@1.5.3
+  - @backstage/plugin-search-react@1.6.4
+  - @backstage/catalog-model@1.4.1
+  - @backstage/theme@0.4.1
+  - @backstage/plugin-adr-common@0.2.12
+  - @backstage/plugin-search-common@1.2.5
+
+## 0.6.4-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.8.1-next.1
+  - @backstage/integration-react@1.1.16-next.1
+
 ## 0.6.4-next.1
 
 ### Patch Changes
diff --git a/plugins/adr/api-report.md b/plugins/adr/api-report.md
index 4cec5047fc..6ed7b68196 100644
--- a/plugins/adr/api-report.md
+++ b/plugins/adr/api-report.md
@@ -12,6 +12,8 @@ import { BackstagePlugin } from '@backstage/core-plugin-api';
 import { DiscoveryApi } from '@backstage/core-plugin-api';
 import { FetchApi } from '@backstage/core-plugin-api';
 import { isAdrAvailable } from '@backstage/plugin-adr-common';
+import { JSX as JSX_2 } from 'react';
+import { default as React_2 } from 'react';
 import { ReactNode } from 'react';
 import { ResultHighlight } from '@backstage/plugin-search-common';
 import { RouteRef } from '@backstage/core-plugin-api';
@@ -76,7 +78,10 @@ export const adrPlugin: BackstagePlugin<
 
 // @public
 export const AdrReader: {
-  (props: { adr: string; decorators?: AdrContentDecorator[] }): JSX.Element;
+  (props: {
+    adr: string;
+    decorators?: AdrContentDecorator[];
+  }): React_2.JSX.Element;
   decorators: Readonly<{
     createRewriteRelativeLinksDecorator(): AdrContentDecorator;
     createRewriteRelativeEmbedsDecorator(): AdrContentDecorator;
@@ -107,7 +112,7 @@ export type AdrSearchResultListItemProps = {
 export const EntityAdrContent: (props: {
   contentDecorators?: AdrContentDecorator[] | undefined;
   filePathFilterFn?: AdrFilePathFilterFn | undefined;
-}) => JSX.Element;
+}) => JSX_2.Element;
 
 export { isAdrAvailable };
 ```
diff --git a/plugins/adr/catalog-info.yaml b/plugins/adr/catalog-info.yaml
new file mode 100644
index 0000000000..61fb6116d6
--- /dev/null
+++ b/plugins/adr/catalog-info.yaml
@@ -0,0 +1,9 @@
+apiVersion: backstage.io/v1alpha1
+kind: Component
+metadata:
+  name: backstage-plugin-adr
+  title: '@backstage/plugin-adr'
+spec:
+  lifecycle: experimental
+  type: backstage-frontend-plugin
+  owner: kuangp
diff --git a/plugins/adr/package.json b/plugins/adr/package.json
index 84d5080a4a..d288f92d9c 100644
--- a/plugins/adr/package.json
+++ b/plugins/adr/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-adr",
-  "version": "0.6.4-next.1",
+  "version": "0.6.7-next.2",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
@@ -18,6 +18,7 @@
     "url": "https://github.com/backstage/backstage",
     "directory": "plugins/adr"
   },
+  "sideEffects": false,
   "scripts": {
     "start": "backstage-cli package start",
     "build": "backstage-cli package build",
@@ -61,7 +62,6 @@
     "@testing-library/react": "^12.1.3",
     "@testing-library/user-event": "^14.0.0",
     "@types/git-url-parse": "^9.0.0",
-    "@types/node": "*",
     "cross-fetch": "^3.1.5",
     "msw": "^1.0.0"
   },
diff --git a/plugins/airbrake-backend/CHANGELOG.md b/plugins/airbrake-backend/CHANGELOG.md
index 3892e5563b..d750762517 100644
--- a/plugins/airbrake-backend/CHANGELOG.md
+++ b/plugins/airbrake-backend/CHANGELOG.md
@@ -1,5 +1,51 @@
 # @backstage/plugin-airbrake-backend
 
+## 0.2.24-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config@1.1.0-next.1
+  - @backstage/backend-common@0.19.5-next.2
+  - @backstage/backend-plugin-api@0.6.3-next.2
+
+## 0.2.24-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config@1.1.0-next.0
+  - @backstage/backend-common@0.19.5-next.1
+  - @backstage/backend-plugin-api@0.6.3-next.1
+
+## 0.2.23-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.19.4-next.0
+  - @backstage/backend-plugin-api@0.6.2-next.0
+  - @backstage/config@1.0.8
+
+## 0.2.21
+
+### Patch Changes
+
+- 629cbd194a87: Use `coreServices.rootConfig` instead of `coreService.config`
+- 12a8c94eda8d: Add package repository and homepage metadata
+- Updated dependencies
+  - @backstage/backend-common@0.19.2
+  - @backstage/backend-plugin-api@0.6.0
+  - @backstage/config@1.0.8
+
+## 0.2.21-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@0.6.0-next.2
+  - @backstage/backend-common@0.19.2-next.2
+
 ## 0.2.21-next.1
 
 ### Patch Changes
diff --git a/plugins/airbrake-backend/api-report.md b/plugins/airbrake-backend/api-report.md
index c410245e31..4658767b4a 100644
--- a/plugins/airbrake-backend/api-report.md
+++ b/plugins/airbrake-backend/api-report.md
@@ -14,7 +14,8 @@ export interface AirbrakeConfig {
 }
 
 // @public
-export const airbrakePlugin: () => BackendFeature;
+const airbrakePlugin: () => BackendFeature;
+export default airbrakePlugin;
 
 // @public
 export function createRouter(options: RouterOptions): Promise<express.Router>;
diff --git a/plugins/airbrake-backend/catalog-info.yaml b/plugins/airbrake-backend/catalog-info.yaml
new file mode 100644
index 0000000000..90884f5d34
--- /dev/null
+++ b/plugins/airbrake-backend/catalog-info.yaml
@@ -0,0 +1,9 @@
+apiVersion: backstage.io/v1alpha1
+kind: Component
+metadata:
+  name: backstage-plugin-airbrake-backend
+  title: '@backstage/plugin-airbrake-backend'
+spec:
+  lifecycle: experimental
+  type: backstage-backend-plugin
+  owner: maintainers
diff --git a/plugins/airbrake-backend/package.json b/plugins/airbrake-backend/package.json
index f3ff319d65..141551c20b 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.21-next.1",
+  "version": "0.2.24-next.2",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
diff --git a/plugins/airbrake-backend/src/index.ts b/plugins/airbrake-backend/src/index.ts
index 5905a7e0e5..3f660dad62 100644
--- a/plugins/airbrake-backend/src/index.ts
+++ b/plugins/airbrake-backend/src/index.ts
@@ -22,4 +22,4 @@
 
 export * from './service/router';
 export * from './config';
-export { airbrakePlugin } from './plugin';
+export { airbrakePlugin as default } from './plugin';
diff --git a/plugins/airbrake/CHANGELOG.md b/plugins/airbrake/CHANGELOG.md
index 5ef51bc443..fe22cddd46 100644
--- a/plugins/airbrake/CHANGELOG.md
+++ b/plugins/airbrake/CHANGELOG.md
@@ -1,5 +1,68 @@
 # @backstage/plugin-airbrake
 
+## 0.3.24-next.2
+
+### Patch Changes
+
+- 8cec7664e146: Removed `@types/node` dependency
+- Updated dependencies
+  - @backstage/core-components@0.13.5-next.2
+  - @backstage/core-plugin-api@1.6.0-next.2
+  - @backstage/test-utils@1.4.3-next.2
+  - @backstage/dev-utils@1.0.21-next.2
+  - @backstage/plugin-catalog-react@1.8.4-next.2
+  - @backstage/catalog-model@1.4.2-next.1
+  - @backstage/theme@0.4.1
+
+## 0.3.24-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.8.4-next.1
+  - @backstage/core-components@0.13.5-next.1
+  - @backstage/dev-utils@1.0.21-next.1
+  - @backstage/catalog-model@1.4.2-next.0
+  - @backstage/core-plugin-api@1.6.0-next.1
+  - @backstage/test-utils@1.4.3-next.1
+  - @backstage/theme@0.4.1
+
+## 0.3.23-next.0
+
+### Patch Changes
+
+- 482bb5c0bbf8: Moved `@types/react` to be a regular dependency
+- Updated dependencies
+  - @backstage/core-plugin-api@1.6.0-next.0
+  - @backstage/core-components@0.13.5-next.0
+  - @backstage/dev-utils@1.0.20-next.0
+  - @backstage/catalog-model@1.4.1
+  - @backstage/test-utils@1.4.3-next.0
+  - @backstage/theme@0.4.1
+  - @backstage/plugin-catalog-react@1.8.3-next.0
+
+## 0.3.21
+
+### Patch Changes
+
+- 12a8c94eda8d: Add package repository and homepage metadata
+- Updated dependencies
+  - @backstage/dev-utils@1.0.18
+  - @backstage/core-components@0.13.4
+  - @backstage/plugin-catalog-react@1.8.1
+  - @backstage/core-plugin-api@1.5.3
+  - @backstage/test-utils@1.4.2
+  - @backstage/catalog-model@1.4.1
+  - @backstage/theme@0.4.1
+
+## 0.3.21-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.8.1-next.1
+  - @backstage/dev-utils@1.0.18-next.2
+
 ## 0.3.21-next.1
 
 ### Patch Changes
diff --git a/plugins/airbrake/api-report.md b/plugins/airbrake/api-report.md
index 773e2a029a..a04d57d7e9 100644
--- a/plugins/airbrake/api-report.md
+++ b/plugins/airbrake/api-report.md
@@ -3,10 +3,9 @@
 > Do not edit this file. It is a report generated by [API Extractor](https://api-extractor.com/).
 
 ```ts
-/// <reference types="react" />
-
 import { BackstagePlugin } from '@backstage/core-plugin-api';
 import { Entity } from '@backstage/catalog-model';
+import { default as React_2 } from 'react';
 import { RouteRef } from '@backstage/core-plugin-api';
 
 // @public
@@ -19,7 +18,7 @@ export const airbrakePlugin: BackstagePlugin<
 >;
 
 // @public
-export const EntityAirbrakeContent: () => JSX.Element;
+export const EntityAirbrakeContent: () => React_2.JSX.Element;
 
 // @public
 export const isAirbrakeAvailable: (entity: Entity) => boolean;
diff --git a/plugins/airbrake/catalog-info.yaml b/plugins/airbrake/catalog-info.yaml
new file mode 100644
index 0000000000..d1eac0d04e
--- /dev/null
+++ b/plugins/airbrake/catalog-info.yaml
@@ -0,0 +1,9 @@
+apiVersion: backstage.io/v1alpha1
+kind: Component
+metadata:
+  name: backstage-plugin-airbrake
+  title: '@backstage/plugin-airbrake'
+spec:
+  lifecycle: experimental
+  type: backstage-frontend-plugin
+  owner: maintainers
diff --git a/plugins/airbrake/package.json b/plugins/airbrake/package.json
index 72f3bc6094..2ed15d168b 100644
--- a/plugins/airbrake/package.json
+++ b/plugins/airbrake/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-airbrake",
-  "version": "0.3.21-next.1",
+  "version": "0.3.24-next.2",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
@@ -18,6 +18,7 @@
     "url": "https://github.com/backstage/backstage",
     "directory": "plugins/airbrake"
   },
+  "sideEffects": false,
   "scripts": {
     "build": "backstage-cli package build",
     "start": "backstage-cli package start",
@@ -38,6 +39,7 @@
     "@material-ui/core": "^4.12.2",
     "@material-ui/icons": "^4.9.1",
     "@material-ui/lab": "4.0.0-alpha.61",
+    "@types/react": "^16.13.1 || ^17.0.0",
     "react-use": "^17.2.4"
   },
   "peerDependencies": {
@@ -54,8 +56,6 @@
     "@testing-library/jest-dom": "^5.10.1",
     "@testing-library/react": "^12.1.3",
     "@testing-library/user-event": "^14.0.0",
-    "@types/node": "^16.11.26",
-    "@types/react": "^16.13.1 || ^17.0.0",
     "msw": "^1.0.0"
   },
   "files": [
diff --git a/plugins/allure/CHANGELOG.md b/plugins/allure/CHANGELOG.md
index 8bbf800b78..f61140dd91 100644
--- a/plugins/allure/CHANGELOG.md
+++ b/plugins/allure/CHANGELOG.md
@@ -1,5 +1,59 @@
 # @backstage/plugin-allure
 
+## 0.1.40-next.2
+
+### Patch Changes
+
+- 8cec7664e146: Removed `@types/node` dependency
+- Updated dependencies
+  - @backstage/core-components@0.13.5-next.2
+  - @backstage/core-plugin-api@1.6.0-next.2
+  - @backstage/plugin-catalog-react@1.8.4-next.2
+  - @backstage/catalog-model@1.4.2-next.1
+  - @backstage/theme@0.4.1
+
+## 0.1.40-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.8.4-next.1
+  - @backstage/core-components@0.13.5-next.1
+  - @backstage/catalog-model@1.4.2-next.0
+  - @backstage/core-plugin-api@1.6.0-next.1
+  - @backstage/theme@0.4.1
+
+## 0.1.39-next.0
+
+### Patch Changes
+
+- 482bb5c0bbf8: Moved `@types/react` to be a regular dependency
+- Updated dependencies
+  - @backstage/core-plugin-api@1.6.0-next.0
+  - @backstage/core-components@0.13.5-next.0
+  - @backstage/catalog-model@1.4.1
+  - @backstage/theme@0.4.1
+  - @backstage/plugin-catalog-react@1.8.3-next.0
+
+## 0.1.37
+
+### Patch Changes
+
+- 12a8c94eda8d: Add package repository and homepage metadata
+- Updated dependencies
+  - @backstage/core-components@0.13.4
+  - @backstage/plugin-catalog-react@1.8.1
+  - @backstage/core-plugin-api@1.5.3
+  - @backstage/catalog-model@1.4.1
+  - @backstage/theme@0.4.1
+
+## 0.1.37-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.8.1-next.1
+
 ## 0.1.37-next.1
 
 ### Patch Changes
diff --git a/plugins/allure/api-report.md b/plugins/allure/api-report.md
index c1ce499ab2..a192851f26 100644
--- a/plugins/allure/api-report.md
+++ b/plugins/allure/api-report.md
@@ -7,6 +7,7 @@
 
 import { BackstagePlugin } from '@backstage/core-plugin-api';
 import { Entity } from '@backstage/catalog-model';
+import { JSX as JSX_2 } from 'react';
 import { RouteRef } from '@backstage/core-plugin-api';
 
 // @public (undocumented)
@@ -22,7 +23,7 @@ export const allurePlugin: BackstagePlugin<
 >;
 
 // @public (undocumented)
-export const EntityAllureReportContent: () => JSX.Element;
+export const EntityAllureReportContent: () => JSX_2.Element;
 
 // @public (undocumented)
 export const isAllureReportAvailable: (entity: Entity) => boolean;
diff --git a/plugins/allure/catalog-info.yaml b/plugins/allure/catalog-info.yaml
new file mode 100644
index 0000000000..4ea1238b30
--- /dev/null
+++ b/plugins/allure/catalog-info.yaml
@@ -0,0 +1,10 @@
+apiVersion: backstage.io/v1alpha1
+kind: Component
+metadata:
+  name: backstage-plugin-allure
+  title: '@backstage/plugin-allure'
+  description: A Backstage plugin that integrates with Allure
+spec:
+  lifecycle: experimental
+  type: backstage-frontend-plugin
+  owner: maintainers
diff --git a/plugins/allure/package.json b/plugins/allure/package.json
index 730347cf8c..90055b48d2 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.37-next.1",
+  "version": "0.1.40-next.2",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
@@ -19,6 +19,7 @@
     "url": "https://github.com/backstage/backstage",
     "directory": "plugins/allure"
   },
+  "sideEffects": false,
   "scripts": {
     "build": "backstage-cli package build",
     "start": "backstage-cli package start",
@@ -37,6 +38,7 @@
     "@material-ui/core": "^4.12.2",
     "@material-ui/icons": "^4.9.1",
     "@material-ui/lab": "4.0.0-alpha.61",
+    "@types/react": "^16.13.1 || ^17.0.0",
     "react-use": "^17.2.4"
   },
   "peerDependencies": {
@@ -53,8 +55,6 @@
     "@testing-library/jest-dom": "^5.10.1",
     "@testing-library/react": "^12.1.3",
     "@testing-library/user-event": "^14.0.0",
-    "@types/node": "^16.11.26",
-    "@types/react": "^16.13.1 || ^17.0.0",
     "msw": "^1.0.0"
   },
   "files": [
diff --git a/plugins/analytics-module-ga/CHANGELOG.md b/plugins/analytics-module-ga/CHANGELOG.md
index d40cb001e2..7236fd68d5 100644
--- a/plugins/analytics-module-ga/CHANGELOG.md
+++ b/plugins/analytics-module-ga/CHANGELOG.md
@@ -1,5 +1,47 @@
 # @backstage/plugin-analytics-module-ga
 
+## 0.1.33-next.2
+
+### Patch Changes
+
+- 8cec7664e146: Removed `@types/node` dependency
+- Updated dependencies
+  - @backstage/core-components@0.13.5-next.2
+  - @backstage/core-plugin-api@1.6.0-next.2
+  - @backstage/config@1.1.0-next.1
+  - @backstage/theme@0.4.1
+
+## 0.1.33-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.13.5-next.1
+  - @backstage/config@1.1.0-next.0
+  - @backstage/core-plugin-api@1.6.0-next.1
+  - @backstage/theme@0.4.1
+
+## 0.1.33-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-plugin-api@1.6.0-next.0
+  - @backstage/core-components@0.13.5-next.0
+  - @backstage/config@1.0.8
+  - @backstage/theme@0.4.1
+
+## 0.1.32
+
+### Patch Changes
+
+- 12a8c94eda8d: Add package repository and homepage metadata
+- Updated dependencies
+  - @backstage/core-components@0.13.4
+  - @backstage/core-plugin-api@1.5.3
+  - @backstage/config@1.0.8
+  - @backstage/theme@0.4.1
+
 ## 0.1.32-next.1
 
 ### Patch Changes
diff --git a/plugins/analytics-module-ga/catalog-info.yaml b/plugins/analytics-module-ga/catalog-info.yaml
new file mode 100644
index 0000000000..24dddf1aa5
--- /dev/null
+++ b/plugins/analytics-module-ga/catalog-info.yaml
@@ -0,0 +1,9 @@
+apiVersion: backstage.io/v1alpha1
+kind: Component
+metadata:
+  name: backstage-plugin-analytics-module-ga
+  title: '@backstage/plugin-analytics-module-ga'
+spec:
+  lifecycle: experimental
+  type: backstage-frontend-plugin-module
+  owner: maintainers
diff --git a/plugins/analytics-module-ga/package.json b/plugins/analytics-module-ga/package.json
index ef77925719..91bc1029b2 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.32-next.1",
+  "version": "0.1.33-next.2",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
@@ -18,6 +18,7 @@
     "url": "https://github.com/backstage/backstage",
     "directory": "plugins/analytics-module-ga"
   },
+  "sideEffects": false,
   "scripts": {
     "build": "backstage-cli package build",
     "start": "backstage-cli package start",
@@ -53,7 +54,6 @@
     "@testing-library/jest-dom": "^5.10.1",
     "@testing-library/react": "^12.1.3",
     "@testing-library/user-event": "^14.0.0",
-    "@types/node": "^16.11.26",
     "@types/react": "^16.13.1 || ^17.0.0",
     "msw": "^1.0.0"
   },
diff --git a/plugins/analytics-module-ga4/CHANGELOG.md b/plugins/analytics-module-ga4/CHANGELOG.md
index fd589fec4b..ba52a27703 100644
--- a/plugins/analytics-module-ga4/CHANGELOG.md
+++ b/plugins/analytics-module-ga4/CHANGELOG.md
@@ -1,5 +1,47 @@
 # @backstage/plugin-analytics-module-ga4
 
+## 0.1.4-next.2
+
+### Patch Changes
+
+- 8cec7664e146: Removed `@types/node` dependency
+- Updated dependencies
+  - @backstage/core-components@0.13.5-next.2
+  - @backstage/core-plugin-api@1.6.0-next.2
+  - @backstage/config@1.1.0-next.1
+  - @backstage/theme@0.4.1
+
+## 0.1.4-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.13.5-next.1
+  - @backstage/config@1.1.0-next.0
+  - @backstage/core-plugin-api@1.6.0-next.1
+  - @backstage/theme@0.4.1
+
+## 0.1.4-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-plugin-api@1.6.0-next.0
+  - @backstage/core-components@0.13.5-next.0
+  - @backstage/config@1.0.8
+  - @backstage/theme@0.4.1
+
+## 0.1.3
+
+### Patch Changes
+
+- 12a8c94eda8d: Add package repository and homepage metadata
+- Updated dependencies
+  - @backstage/core-components@0.13.4
+  - @backstage/core-plugin-api@1.5.3
+  - @backstage/config@1.0.8
+  - @backstage/theme@0.4.1
+
 ## 0.1.3-next.1
 
 ### Patch Changes
diff --git a/plugins/analytics-module-ga4/catalog-info.yaml b/plugins/analytics-module-ga4/catalog-info.yaml
new file mode 100644
index 0000000000..8d98ebe82c
--- /dev/null
+++ b/plugins/analytics-module-ga4/catalog-info.yaml
@@ -0,0 +1,9 @@
+apiVersion: backstage.io/v1alpha1
+kind: Component
+metadata:
+  name: backstage-plugin-analytics-module-ga4
+  title: '@backstage/plugin-analytics-module-ga4'
+spec:
+  lifecycle: experimental
+  type: backstage-frontend-plugin-module
+  owner: maintainers
diff --git a/plugins/analytics-module-ga4/package.json b/plugins/analytics-module-ga4/package.json
index ef55377f0c..2ec3e28c93 100644
--- a/plugins/analytics-module-ga4/package.json
+++ b/plugins/analytics-module-ga4/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-analytics-module-ga4",
-  "version": "0.1.3-next.1",
+  "version": "0.1.4-next.2",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
@@ -18,6 +18,7 @@
     "url": "https://github.com/backstage/backstage",
     "directory": "plugins/plugins/analytics-module-ga4"
   },
+  "sideEffects": false,
   "scripts": {
     "build": "backstage-cli package build",
     "start": "backstage-cli package start",
@@ -50,7 +51,6 @@
     "@testing-library/react": "^12.1.3",
     "@testing-library/user-event": "^14.0.0",
     "@types/jest": "^28.1.3",
-    "@types/node": "^16.11.26",
     "@types/react": "^16.13.1 || ^17.0.0",
     "msw": "^1.0.0"
   },
diff --git a/plugins/analytics-module-newrelic-browser/CHANGELOG.md b/plugins/analytics-module-newrelic-browser/CHANGELOG.md
index beea288700..59b4b9dfc8 100644
--- a/plugins/analytics-module-newrelic-browser/CHANGELOG.md
+++ b/plugins/analytics-module-newrelic-browser/CHANGELOG.md
@@ -1,5 +1,43 @@
 # @backstage/plugin-analytics-module-newrelic-browser
 
+## 0.0.2-next.2
+
+### Patch Changes
+
+- 8cec7664e146: Removed `@types/node` dependency
+- Updated dependencies
+  - @backstage/core-components@0.13.5-next.2
+  - @backstage/core-plugin-api@1.6.0-next.2
+  - @backstage/config@1.1.0-next.1
+
+## 0.0.2-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.13.5-next.1
+  - @backstage/config@1.1.0-next.0
+  - @backstage/core-plugin-api@1.6.0-next.1
+
+## 0.0.2-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-plugin-api@1.6.0-next.0
+  - @backstage/core-components@0.13.5-next.0
+  - @backstage/config@1.0.8
+
+## 0.0.1
+
+### Patch Changes
+
+- ec7357258853: Introduced the New Relic Browser analytics module. Check out the plugins [README.md](https://github.com/backstage/backstage/tree/master/plugins/analytics-module-newrelic-browser) for more details!
+- Updated dependencies
+  - @backstage/core-components@0.13.4
+  - @backstage/core-plugin-api@1.5.3
+  - @backstage/config@1.0.8
+
 ## 0.0.1-next.0
 
 ### Patch Changes
diff --git a/plugins/analytics-module-newrelic-browser/catalog-info.yaml b/plugins/analytics-module-newrelic-browser/catalog-info.yaml
new file mode 100644
index 0000000000..68f38c4848
--- /dev/null
+++ b/plugins/analytics-module-newrelic-browser/catalog-info.yaml
@@ -0,0 +1,9 @@
+apiVersion: backstage.io/v1alpha1
+kind: Component
+metadata:
+  name: backstage-plugin-analytics-module-newrelic-browser
+  title: '@backstage/plugin-analytics-module-newrelic-browser'
+spec:
+  lifecycle: experimental
+  type: backstage-frontend-plugin-module
+  owner: maintainers
diff --git a/plugins/analytics-module-newrelic-browser/package.json b/plugins/analytics-module-newrelic-browser/package.json
index 677d3b8e16..860d33e809 100644
--- a/plugins/analytics-module-newrelic-browser/package.json
+++ b/plugins/analytics-module-newrelic-browser/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-analytics-module-newrelic-browser",
-  "version": "0.0.1-next.0",
+  "version": "0.0.2-next.2",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
@@ -12,6 +12,7 @@
   "backstage": {
     "role": "frontend-plugin-module"
   },
+  "sideEffects": false,
   "scripts": {
     "start": "backstage-cli package start",
     "build": "backstage-cli package build",
@@ -39,7 +40,6 @@
     "@testing-library/jest-dom": "^5.10.1",
     "@testing-library/react": "^12.1.3",
     "@testing-library/user-event": "^14.0.0",
-    "@types/node": "*",
     "msw": "^1.0.0"
   },
   "files": [
diff --git a/plugins/apache-airflow/CHANGELOG.md b/plugins/apache-airflow/CHANGELOG.md
index 42756b19df..a73eb1a44a 100644
--- a/plugins/apache-airflow/CHANGELOG.md
+++ b/plugins/apache-airflow/CHANGELOG.md
@@ -1,5 +1,40 @@
 # @backstage/plugin-apache-airflow
 
+## 0.2.15-next.2
+
+### Patch Changes
+
+- 8cec7664e146: Removed `@types/node` dependency
+- Updated dependencies
+  - @backstage/core-components@0.13.5-next.2
+  - @backstage/core-plugin-api@1.6.0-next.2
+
+## 0.2.15-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.13.5-next.1
+  - @backstage/core-plugin-api@1.6.0-next.1
+
+## 0.2.15-next.0
+
+### Patch Changes
+
+- 482bb5c0bbf8: Moved `@types/react` to be a regular dependency
+- Updated dependencies
+  - @backstage/core-plugin-api@1.6.0-next.0
+  - @backstage/core-components@0.13.5-next.0
+
+## 0.2.14
+
+### Patch Changes
+
+- 12a8c94eda8d: Add package repository and homepage metadata
+- Updated dependencies
+  - @backstage/core-components@0.13.4
+  - @backstage/core-plugin-api@1.5.3
+
 ## 0.2.14-next.1
 
 ### Patch Changes
diff --git a/plugins/apache-airflow/api-report.md b/plugins/apache-airflow/api-report.md
index b427a0148e..be2a208bd4 100644
--- a/plugins/apache-airflow/api-report.md
+++ b/plugins/apache-airflow/api-report.md
@@ -6,15 +6,16 @@
 /// <reference types="react" />
 
 import { BackstagePlugin } from '@backstage/core-plugin-api';
+import { JSX as JSX_2 } from 'react';
 import { RouteRef } from '@backstage/core-plugin-api';
 
 // @public
 export const ApacheAirflowDagTable: (props: {
   dagIds?: string[] | undefined;
-}) => JSX.Element;
+}) => JSX_2.Element;
 
 // @public (undocumented)
-export const ApacheAirflowPage: () => JSX.Element;
+export const ApacheAirflowPage: () => JSX_2.Element;
 
 // @public (undocumented)
 export const apacheAirflowPlugin: BackstagePlugin<
diff --git a/plugins/apache-airflow/catalog-info.yaml b/plugins/apache-airflow/catalog-info.yaml
new file mode 100644
index 0000000000..d564af4912
--- /dev/null
+++ b/plugins/apache-airflow/catalog-info.yaml
@@ -0,0 +1,9 @@
+apiVersion: backstage.io/v1alpha1
+kind: Component
+metadata:
+  name: backstage-plugin-apache-airflow
+  title: '@backstage/plugin-apache-airflow'
+spec:
+  lifecycle: experimental
+  type: backstage-frontend-plugin
+  owner: maintainers
diff --git a/plugins/apache-airflow/package.json b/plugins/apache-airflow/package.json
index a1e84dc6fb..61e4f349c7 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.14-next.1",
+  "version": "0.2.15-next.2",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
@@ -18,6 +18,7 @@
     "url": "https://github.com/backstage/backstage",
     "directory": "plugins/apache-airflow"
   },
+  "sideEffects": false,
   "scripts": {
     "build": "backstage-cli package build",
     "start": "backstage-cli package start",
@@ -33,6 +34,7 @@
     "@material-ui/core": "^4.12.2",
     "@material-ui/icons": "^4.9.1",
     "@material-ui/lab": "4.0.0-alpha.61",
+    "@types/react": "^16.13.1 || ^17.0.0",
     "cross-fetch": "^3.1.5",
     "qs": "^6.10.1",
     "react-use": "^17.2.4"
@@ -51,8 +53,6 @@
     "@testing-library/jest-dom": "^5.10.1",
     "@testing-library/react": "^12.1.3",
     "@testing-library/user-event": "^14.0.0",
-    "@types/node": "^16.11.26",
-    "@types/react": "^16.13.1 || ^17.0.0",
     "msw": "^1.0.0"
   },
   "files": [
diff --git a/plugins/api-docs-module-protoc-gen-doc/CHANGELOG.md b/plugins/api-docs-module-protoc-gen-doc/CHANGELOG.md
index 87ee39981f..4c35a4eab9 100644
--- a/plugins/api-docs-module-protoc-gen-doc/CHANGELOG.md
+++ b/plugins/api-docs-module-protoc-gen-doc/CHANGELOG.md
@@ -1,5 +1,11 @@
 # @backstage/plugin-api-docs-module-protoc-gen-doc
 
+## 0.1.3-next.0
+
+### Patch Changes
+
+- 482bb5c0bbf8: Moved `@types/react` to be a regular dependency
+
 ## 0.1.2
 
 ### Patch Changes
diff --git a/plugins/api-docs-module-protoc-gen-doc/api-report.md b/plugins/api-docs-module-protoc-gen-doc/api-report.md
index 696fee2a20..836f8313d8 100644
--- a/plugins/api-docs-module-protoc-gen-doc/api-report.md
+++ b/plugins/api-docs-module-protoc-gen-doc/api-report.md
@@ -3,12 +3,12 @@
 > Do not edit this file. It is a report generated by [API Extractor](https://api-extractor.com/).
 
 ```ts
-/// <reference types="react" />
+import { default as React_2 } from 'react';
 
 // @public (undocumented)
 export const grpcDocsApiWidget: {
   type: string;
   title: string;
-  component: (definition: string) => JSX.Element;
+  component: (definition: string) => React_2.JSX.Element;
 };
 ```
diff --git a/plugins/api-docs-module-protoc-gen-doc/catalog-info.yaml b/plugins/api-docs-module-protoc-gen-doc/catalog-info.yaml
new file mode 100644
index 0000000000..b69366878b
--- /dev/null
+++ b/plugins/api-docs-module-protoc-gen-doc/catalog-info.yaml
@@ -0,0 +1,12 @@
+apiVersion: backstage.io/v1alpha1
+kind: Component
+metadata:
+  name: backstage-plugin-api-docs-module-protoc-gen-doc
+  title: '@backstage/plugin-api-docs-module-protoc-gen-doc'
+  description: >-
+    Additional functionalities for the api-docs plugin that renders the output
+    of the protoc-gen-doc
+spec:
+  lifecycle: experimental
+  type: backstage-frontend-plugin-module
+  owner: maintainers
diff --git a/plugins/api-docs-module-protoc-gen-doc/package.json b/plugins/api-docs-module-protoc-gen-doc/package.json
index 2d79af78a3..64942f3f3b 100644
--- a/plugins/api-docs-module-protoc-gen-doc/package.json
+++ b/plugins/api-docs-module-protoc-gen-doc/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@backstage/plugin-api-docs-module-protoc-gen-doc",
   "description": "Additional functionalities for the api-docs plugin that renders the output of the protoc-gen-doc",
-  "version": "0.1.2",
+  "version": "0.1.3-next.0",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
@@ -22,6 +22,7 @@
   "keywords": [
     "backstage"
   ],
+  "sideEffects": false,
   "scripts": {
     "build": "backstage-cli package build",
     "lint": "backstage-cli package lint",
@@ -31,6 +32,7 @@
     "postpack": "backstage-cli package postpack"
   },
   "dependencies": {
+    "@types/react": "^16.13.1 || ^17.0.0",
     "grpc-docs": "^1.1.2"
   },
   "peerDependencies": {
@@ -40,8 +42,7 @@
   },
   "devDependencies": {
     "@backstage/cli": "workspace:^",
-    "@testing-library/jest-dom": "^5.16.4",
-    "@types/react": "^16.13.1 || ^17.0.0"
+    "@testing-library/jest-dom": "^5.16.4"
   },
   "files": [
     "dist"
diff --git a/plugins/api-docs/CHANGELOG.md b/plugins/api-docs/CHANGELOG.md
index 7ed022f59e..775286fdc4 100644
--- a/plugins/api-docs/CHANGELOG.md
+++ b/plugins/api-docs/CHANGELOG.md
@@ -1,5 +1,62 @@
 # @backstage/plugin-api-docs
 
+## 0.9.11-next.2
+
+### Patch Changes
+
+- 8cec7664e146: Removed `@types/node` dependency
+- Updated dependencies
+  - @backstage/plugin-catalog@1.13.0-next.2
+  - @backstage/core-components@0.13.5-next.2
+  - @backstage/core-plugin-api@1.6.0-next.2
+  - @backstage/plugin-catalog-react@1.8.4-next.2
+  - @backstage/catalog-model@1.4.2-next.1
+  - @backstage/theme@0.4.1
+
+## 0.9.11-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.8.4-next.1
+  - @backstage/core-components@0.13.5-next.1
+  - @backstage/plugin-catalog@1.12.5-next.1
+  - @backstage/catalog-model@1.4.2-next.0
+  - @backstage/core-plugin-api@1.6.0-next.1
+  - @backstage/theme@0.4.1
+
+## 0.9.10-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog@1.12.4-next.0
+  - @backstage/core-plugin-api@1.6.0-next.0
+  - @backstage/core-components@0.13.5-next.0
+  - @backstage/catalog-model@1.4.1
+  - @backstage/theme@0.4.1
+  - @backstage/plugin-catalog-react@1.8.3-next.0
+
+## 0.9.7
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.13.4
+  - @backstage/plugin-catalog@1.12.1
+  - @backstage/plugin-catalog-react@1.8.1
+  - @backstage/core-plugin-api@1.5.3
+  - @backstage/catalog-model@1.4.1
+  - @backstage/theme@0.4.1
+
+## 0.9.7-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.8.1-next.1
+  - @backstage/plugin-catalog@1.12.1-next.2
+
 ## 0.9.7-next.1
 
 ### Patch Changes
diff --git a/plugins/api-docs/api-report.md b/plugins/api-docs/api-report.md
index a9b21664c3..59d490a1fe 100644
--- a/plugins/api-docs/api-report.md
+++ b/plugins/api-docs/api-report.md
@@ -11,6 +11,7 @@ import { BackstagePlugin } from '@backstage/core-plugin-api';
 import { CatalogTableRow } from '@backstage/plugin-catalog';
 import { ExternalRouteRef } from '@backstage/core-plugin-api';
 import { InfoCardVariants } from '@backstage/core-components';
+import { JSX as JSX_2 } from 'react';
 import { default as React_2 } from 'react';
 import { RouteRef } from '@backstage/core-plugin-api';
 import { TableColumn } from '@backstage/core-components';
@@ -18,14 +19,14 @@ import { TableProps } from '@backstage/core-components';
 import { UserListFilterKind } from '@backstage/plugin-catalog-react';
 
 // @public (undocumented)
-export const ApiDefinitionCard: () => JSX.Element;
+export const ApiDefinitionCard: () => React_2.JSX.Element;
 
 // @public
 export function ApiDefinitionDialog(props: {
   open: boolean;
   entity: ApiEntity;
   onClose: () => void;
-}): JSX.Element;
+}): React_2.JSX.Element;
 
 // @public (undocumented)
 export type ApiDefinitionWidget = {
@@ -62,20 +63,22 @@ export { apiDocsPlugin as plugin };
 // @public
 export const ApiExplorerIndexPage: (
   props: DefaultApiExplorerPageProps,
-) => JSX.Element;
+) => React_2.JSX.Element;
 
 // @public (undocumented)
 export const ApiExplorerPage: (
   props: DefaultApiExplorerPageProps,
-) => JSX.Element;
+) => JSX_2.Element;
 
 // @public (undocumented)
-export const ApiTypeTitle: (props: { apiEntity: ApiEntity }) => JSX.Element;
+export const ApiTypeTitle: (props: {
+  apiEntity: ApiEntity;
+}) => React_2.JSX.Element;
 
 // @public (undocumented)
 export const AsyncApiDefinitionWidget: (
   props: AsyncApiDefinitionWidgetProps,
-) => JSX.Element;
+) => React_2.JSX.Element;
 
 // @public (undocumented)
 export type AsyncApiDefinitionWidgetProps = {
@@ -86,17 +89,17 @@ export type AsyncApiDefinitionWidgetProps = {
 export const ConsumedApisCard: (props: {
   variant?: InfoCardVariants;
   columns?: TableColumn<ApiEntity>[];
-}) => JSX.Element;
+}) => React_2.JSX.Element;
 
 // @public (undocumented)
 export const ConsumingComponentsCard: (props: {
   variant?: InfoCardVariants;
-}) => JSX.Element;
+}) => React_2.JSX.Element;
 
 // @public
 export const DefaultApiExplorerPage: (
   props: DefaultApiExplorerPageProps,
-) => JSX.Element;
+) => React_2.JSX.Element;
 
 // @public
 export type DefaultApiExplorerPageProps = {
@@ -109,40 +112,40 @@ export type DefaultApiExplorerPageProps = {
 export function defaultDefinitionWidgets(): ApiDefinitionWidget[];
 
 // @public (undocumented)
-export const EntityApiDefinitionCard: () => JSX.Element;
+export const EntityApiDefinitionCard: () => JSX_2.Element;
 
 // @public (undocumented)
 export const EntityConsumedApisCard: (props: {
   variant?: InfoCardVariants | undefined;
   columns?: TableColumn<ApiEntity>[] | undefined;
-}) => JSX.Element;
+}) => JSX_2.Element;
 
 // @public (undocumented)
 export const EntityConsumingComponentsCard: (props: {
   variant?: InfoCardVariants | undefined;
-}) => JSX.Element;
+}) => JSX_2.Element;
 
 // @public (undocumented)
 export const EntityHasApisCard: (props: {
   variant?: InfoCardVariants | undefined;
   columns?: TableColumn<ApiEntity>[] | undefined;
-}) => JSX.Element;
+}) => JSX_2.Element;
 
 // @public (undocumented)
 export const EntityProvidedApisCard: (props: {
   variant?: InfoCardVariants | undefined;
   columns?: TableColumn<ApiEntity>[] | undefined;
-}) => JSX.Element;
+}) => JSX_2.Element;
 
 // @public (undocumented)
 export const EntityProvidingComponentsCard: (props: {
   variant?: InfoCardVariants | undefined;
-}) => JSX.Element;
+}) => JSX_2.Element;
 
 // @public (undocumented)
 export const GraphQlDefinitionWidget: (
   props: GraphQlDefinitionWidgetProps,
-) => JSX.Element;
+) => React_2.JSX.Element;
 
 // @public (undocumented)
 export type GraphQlDefinitionWidgetProps = {
@@ -153,12 +156,12 @@ export type GraphQlDefinitionWidgetProps = {
 export const HasApisCard: (props: {
   variant?: InfoCardVariants;
   columns?: TableColumn<ApiEntity>[];
-}) => JSX.Element;
+}) => React_2.JSX.Element;
 
 // @public (undocumented)
 export const OpenApiDefinitionWidget: (
   props: OpenApiDefinitionWidgetProps,
-) => JSX.Element;
+) => React_2.JSX.Element;
 
 // @public (undocumented)
 export type OpenApiDefinitionWidgetProps = {
@@ -168,7 +171,7 @@ export type OpenApiDefinitionWidgetProps = {
 // @public (undocumented)
 export const PlainApiDefinitionWidget: (
   props: PlainApiDefinitionWidgetProps,
-) => JSX.Element;
+) => React_2.JSX.Element;
 
 // @public (undocumented)
 export type PlainApiDefinitionWidgetProps = {
@@ -180,17 +183,17 @@ export type PlainApiDefinitionWidgetProps = {
 export const ProvidedApisCard: (props: {
   variant?: InfoCardVariants;
   columns?: TableColumn<ApiEntity>[];
-}) => JSX.Element;
+}) => React_2.JSX.Element;
 
 // @public (undocumented)
 export const ProvidingComponentsCard: (props: {
   variant?: InfoCardVariants;
-}) => JSX.Element;
+}) => React_2.JSX.Element;
 
 // @public (undocumented)
 export const TrpcApiDefinitionWidget: (
   props: TrpcApiDefinitionWidgetProps,
-) => JSX.Element;
+) => React_2.JSX.Element;
 
 // @public (undocumented)
 export type TrpcApiDefinitionWidgetProps = {
diff --git a/plugins/api-docs/catalog-info.yaml b/plugins/api-docs/catalog-info.yaml
new file mode 100644
index 0000000000..3c09133857
--- /dev/null
+++ b/plugins/api-docs/catalog-info.yaml
@@ -0,0 +1,10 @@
+apiVersion: backstage.io/v1alpha1
+kind: Component
+metadata:
+  name: backstage-plugin-api-docs
+  title: '@backstage/plugin-api-docs'
+  description: A Backstage plugin that helps represent API entities in the frontend
+spec:
+  lifecycle: experimental
+  type: backstage-frontend-plugin
+  owner: sda-se-reviewers
diff --git a/plugins/api-docs/package.json b/plugins/api-docs/package.json
index 8d67619aa9..4257d26cf8 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.9.7-next.1",
+  "version": "0.9.11-next.2",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
@@ -22,6 +22,7 @@
   "keywords": [
     "backstage"
   ],
+  "sideEffects": false,
   "scripts": {
     "build": "backstage-cli package build",
     "start": "backstage-cli package start",
@@ -64,7 +65,6 @@
     "@testing-library/jest-dom": "^5.10.1",
     "@testing-library/react": "^12.1.3",
     "@testing-library/user-event": "^14.0.0",
-    "@types/node": "^16.11.26",
     "@types/swagger-ui-react": "^4.18.0",
     "cross-fetch": "^3.1.5",
     "msw": "^1.0.0"
diff --git a/plugins/apollo-explorer/CHANGELOG.md b/plugins/apollo-explorer/CHANGELOG.md
index b733c807ba..1f3c0d445b 100644
--- a/plugins/apollo-explorer/CHANGELOG.md
+++ b/plugins/apollo-explorer/CHANGELOG.md
@@ -1,5 +1,44 @@
 # @backstage/plugin-apollo-explorer
 
+## 0.1.15-next.2
+
+### Patch Changes
+
+- 8cec7664e146: Removed `@types/node` dependency
+- Updated dependencies
+  - @backstage/core-components@0.13.5-next.2
+  - @backstage/core-plugin-api@1.6.0-next.2
+  - @backstage/theme@0.4.1
+
+## 0.1.15-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.13.5-next.1
+  - @backstage/core-plugin-api@1.6.0-next.1
+  - @backstage/theme@0.4.1
+
+## 0.1.15-next.0
+
+### Patch Changes
+
+- 482bb5c0bbf8: Moved `@types/react` to be a regular dependency
+- Updated dependencies
+  - @backstage/core-plugin-api@1.6.0-next.0
+  - @backstage/core-components@0.13.5-next.0
+  - @backstage/theme@0.4.1
+
+## 0.1.14
+
+### Patch Changes
+
+- 12a8c94eda8d: Add package repository and homepage metadata
+- Updated dependencies
+  - @backstage/core-components@0.13.4
+  - @backstage/core-plugin-api@1.5.3
+  - @backstage/theme@0.4.1
+
 ## 0.1.14-next.1
 
 ### Patch Changes
diff --git a/plugins/apollo-explorer/api-report.md b/plugins/apollo-explorer/api-report.md
index 66cc473d0b..2dd6c14a90 100644
--- a/plugins/apollo-explorer/api-report.md
+++ b/plugins/apollo-explorer/api-report.md
@@ -7,6 +7,7 @@
 
 import { BackstagePlugin } from '@backstage/core-plugin-api';
 import { JSONObject } from '@apollo/explorer/src/helpers/types';
+import { JSX as JSX_2 } from 'react';
 import { RouteRef } from '@backstage/core-plugin-api';
 
 // @public
@@ -30,7 +31,7 @@ export const ApolloExplorerPage: (props: {
         }
       | undefined;
   }[];
-}) => JSX.Element;
+}) => JSX_2.Element;
 
 // @public
 export const apolloExplorerPlugin: BackstagePlugin<
diff --git a/plugins/apollo-explorer/catalog-info.yaml b/plugins/apollo-explorer/catalog-info.yaml
new file mode 100644
index 0000000000..7e2380679c
--- /dev/null
+++ b/plugins/apollo-explorer/catalog-info.yaml
@@ -0,0 +1,9 @@
+apiVersion: backstage.io/v1alpha1
+kind: Component
+metadata:
+  name: backstage-plugin-apollo-explorer
+  title: '@backstage/plugin-apollo-explorer'
+spec:
+  lifecycle: experimental
+  type: backstage-frontend-plugin
+  owner: maintainers
diff --git a/plugins/apollo-explorer/package.json b/plugins/apollo-explorer/package.json
index f989ba29ad..e6782fae91 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.14-next.1",
+  "version": "0.1.15-next.2",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
@@ -18,6 +18,7 @@
     "url": "https://github.com/backstage/backstage",
     "directory": "plugins/apollo-explorer"
   },
+  "sideEffects": false,
   "scripts": {
     "start": "backstage-cli package start",
     "build": "backstage-cli package build",
@@ -34,6 +35,7 @@
     "@backstage/theme": "workspace:^",
     "@material-ui/core": "^4.12.2",
     "@material-ui/icons": "^4.9.1",
+    "@types/react": "^16.13.1 || ^17.0.0",
     "react-use": "^17.2.4",
     "use-deep-compare-effect": "^1.8.1"
   },
@@ -51,8 +53,6 @@
     "@testing-library/jest-dom": "^5.10.1",
     "@testing-library/react": "^12.1.3",
     "@testing-library/user-event": "^14.0.0",
-    "@types/node": "*",
-    "@types/react": "^16.13.1 || ^17.0.0",
     "msw": "^1.0.0"
   },
   "files": [
diff --git a/plugins/app-backend/CHANGELOG.md b/plugins/app-backend/CHANGELOG.md
index a92677ab41..3bcbd4a8bb 100644
--- a/plugins/app-backend/CHANGELOG.md
+++ b/plugins/app-backend/CHANGELOG.md
@@ -1,5 +1,67 @@
 # @backstage/plugin-app-backend
 
+## 0.3.51-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config-loader@1.5.0-next.2
+  - @backstage/config@1.1.0-next.1
+  - @backstage/backend-common@0.19.5-next.2
+  - @backstage/backend-plugin-api@0.6.3-next.2
+  - @backstage/types@1.1.0
+  - @backstage/plugin-app-node@0.1.3-next.2
+
+## 0.3.51-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config@1.1.0-next.0
+  - @backstage/backend-common@0.19.5-next.1
+  - @backstage/backend-plugin-api@0.6.3-next.1
+  - @backstage/config-loader@1.5.0-next.1
+  - @backstage/plugin-app-node@0.1.3-next.1
+  - @backstage/types@1.1.0
+
+## 0.3.50-next.0
+
+### Patch Changes
+
+- cfc3ca6ce060: Changes needed to support MySQL
+- Updated dependencies
+  - @backstage/backend-common@0.19.4-next.0
+  - @backstage/config-loader@1.5.0-next.0
+  - @backstage/backend-plugin-api@0.6.2-next.0
+  - @backstage/config@1.0.8
+  - @backstage/types@1.1.0
+  - @backstage/plugin-app-node@0.1.2-next.0
+
+## 0.3.48
+
+### Patch Changes
+
+- 629cbd194a87: Use `coreServices.rootConfig` instead of `coreService.config`
+- d564ad142b17: Migrated the alpha `appBackend` export to use static configuration and extension points rather than accepting options.
+- Updated dependencies
+  - @backstage/backend-common@0.19.2
+  - @backstage/config-loader@1.4.0
+  - @backstage/backend-plugin-api@0.6.0
+  - @backstage/plugin-app-node@0.1.0
+  - @backstage/config@1.0.8
+  - @backstage/types@1.1.0
+
+## 0.3.48-next.2
+
+### Patch Changes
+
+- d564ad142b17: Migrated the alpha `appBackend` export to use static configuration and extension points rather than accepting options.
+- Updated dependencies
+  - @backstage/plugin-app-node@0.1.0-next.0
+  - @backstage/backend-plugin-api@0.6.0-next.2
+  - @backstage/backend-common@0.19.2-next.2
+  - @backstage/config-loader@1.4.0-next.1
+
 ## 0.3.48-next.1
 
 ### Patch Changes
diff --git a/plugins/app-backend/alpha-api-report.md b/plugins/app-backend/alpha-api-report.md
index 5fb0546a79..615065efd7 100644
--- a/plugins/app-backend/alpha-api-report.md
+++ b/plugins/app-backend/alpha-api-report.md
@@ -6,7 +6,8 @@
 import { BackendFeature } from '@backstage/backend-plugin-api';
 
 // @alpha
-export const appPlugin: () => BackendFeature;
+const appPlugin: () => BackendFeature;
+export default appPlugin;
 
 // (No @packageDocumentation comment for this package)
 ```
diff --git a/plugins/app-backend/catalog-info.yaml b/plugins/app-backend/catalog-info.yaml
new file mode 100644
index 0000000000..27135f4f8d
--- /dev/null
+++ b/plugins/app-backend/catalog-info.yaml
@@ -0,0 +1,10 @@
+apiVersion: backstage.io/v1alpha1
+kind: Component
+metadata:
+  name: backstage-plugin-app-backend
+  title: '@backstage/plugin-app-backend'
+  description: A Backstage backend plugin that serves the Backstage frontend app
+spec:
+  lifecycle: experimental
+  type: backstage-backend-plugin
+  owner: maintainers
diff --git a/plugins/app-backend/migrations/20211229105307_init.js b/plugins/app-backend/migrations/20211229105307_init.js
index 29e37b35f7..25ed48c307 100644
--- a/plugins/app-backend/migrations/20211229105307_init.js
+++ b/plugins/app-backend/migrations/20211229105307_init.js
@@ -20,11 +20,20 @@
  * @param {import('knex').Knex} knex
  */
 exports.up = async function up(knex) {
-  return knex.schema.createTable('static_assets_cache', table => {
+  const isMySQL = knex.client.config.client.includes('mysql');
+  await knex.schema.createTable('static_assets_cache', table => {
     table.comment(
       'A cache of static assets that where previously deployed and may still be lazy-loaded by clients',
     );
-    table.text('path').primary().notNullable().comment('The path of the file');
+    if (!isMySQL) {
+      table
+        .text('path')
+        .primary()
+        .notNullable()
+        .comment('The path of the file');
+    } else {
+      table.text('path').notNullable().comment('The path of the file');
+    }
     table
       .dateTime('last_modified_at')
       .defaultTo(knex.fn.now())
@@ -35,6 +44,12 @@ exports.up = async function up(knex) {
     table.binary('content').notNullable().comment('The asset content');
     table.index('last_modified_at', 'static_asset_cache_last_modified_at_idx');
   });
+  // specifically for mysql specify a unique index up to 254 characters(mysql limit)
+  if (isMySQL) {
+    await knex.schema.raw(
+      'create unique index static_assets_cache_path_idx on static_assets_cache(path(254));',
+    );
+  }
 };
 
 /**
diff --git a/plugins/app-backend/package.json b/plugins/app-backend/package.json
index be1b6b3a80..9db3d48bf0 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.48-next.1",
+  "version": "0.3.51-next.2",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
diff --git a/plugins/app-backend/src/alpha.ts b/plugins/app-backend/src/alpha.ts
index edb5c8caf5..830e3587dc 100644
--- a/plugins/app-backend/src/alpha.ts
+++ b/plugins/app-backend/src/alpha.ts
@@ -14,4 +14,4 @@
  * limitations under the License.
  */
 
-export { appPlugin } from './service/appPlugin';
+export { appPlugin as default } from './service/appPlugin';
diff --git a/plugins/app-backend/src/lib/assets/StaticAssetsStore.test.ts b/plugins/app-backend/src/lib/assets/StaticAssetsStore.test.ts
index 8a0935d4e3..68fe4e2287 100644
--- a/plugins/app-backend/src/lib/assets/StaticAssetsStore.test.ts
+++ b/plugins/app-backend/src/lib/assets/StaticAssetsStore.test.ts
@@ -37,7 +37,7 @@ jest.setTimeout(60_000);
 
 describe('StaticAssetsStore', () => {
   const databases = TestDatabases.create({
-    ids: ['POSTGRES_13', 'POSTGRES_9', 'SQLITE_3'],
+    ids: ['MYSQL_8', 'POSTGRES_13', 'POSTGRES_9', 'SQLITE_3'],
   });
 
   it.each(databases.eachSupportedId())(
@@ -153,14 +153,18 @@ describe('StaticAssetsStore', () => {
           content: async () => Buffer.alloc(0),
         },
       ]);
-
+      // interval check for postgresql
+      let hourPast = `now() + interval '-3600 seconds'`;
+      if (knex.client.config.client.includes('mysql')) {
+        hourPast = `date_sub(now(), interval 3600 second)`;
+      } else if (knex.client.config.client.includes('sqlite3')) {
+        hourPast = `datetime('now', '-3600 seconds')`;
+      }
       // Rewrite modified time of "old" to be 1h in the past
       const updated = await knex('static_assets_cache')
         .where({ path: 'old' })
         .update({
-          last_modified_at: knex.client.config.client.includes('sqlite3')
-            ? knex.raw(`datetime('now', '-3600 seconds')`)
-            : knex.raw(`now() + interval '-3600 seconds'`),
+          last_modified_at: knex.raw(hourPast),
         });
       expect(updated).toBe(1);
 
diff --git a/plugins/app-backend/src/lib/assets/StaticAssetsStore.ts b/plugins/app-backend/src/lib/assets/StaticAssetsStore.ts
index 6905d63779..9f6ada717d 100644
--- a/plugins/app-backend/src/lib/assets/StaticAssetsStore.ts
+++ b/plugins/app-backend/src/lib/assets/StaticAssetsStore.ts
@@ -138,14 +138,20 @@ export class StaticAssetsStore implements StaticAssetProvider {
    */
   async trimAssets(options: { maxAgeSeconds: number }) {
     const { maxAgeSeconds } = options;
+    let lastModifiedInterval = this.#db.raw(
+      `now() + interval '${-maxAgeSeconds} seconds'`,
+    );
+    if (this.#db.client.config.client.includes('mysql')) {
+      lastModifiedInterval = this.#db.raw(
+        `date_sub(now(), interval ${maxAgeSeconds} second)`,
+      );
+    } else if (this.#db.client.config.client.includes('sqlite3')) {
+      lastModifiedInterval = this.#db.raw(`datetime('now', ?)`, [
+        `-${maxAgeSeconds} seconds`,
+      ]);
+    }
     await this.#db<StaticAssetRow>('static_assets_cache')
-      .where(
-        'last_modified_at',
-        '<=',
-        this.#db.client.config.client.includes('sqlite3')
-          ? this.#db.raw(`datetime('now', ?)`, [`-${maxAgeSeconds} seconds`])
-          : this.#db.raw(`now() + interval '${-maxAgeSeconds} seconds'`),
-      )
+      .where('last_modified_at', '<=', lastModifiedInterval)
       .delete();
   }
 }
diff --git a/plugins/app-backend/src/service/appPlugin.test.ts b/plugins/app-backend/src/service/appPlugin.test.ts
index 37d38663ef..b6a972b4c7 100644
--- a/plugins/app-backend/src/service/appPlugin.test.ts
+++ b/plugins/app-backend/src/service/appPlugin.test.ts
@@ -39,8 +39,8 @@ describe('appPlugin', () => {
 
   it('boots', async () => {
     const { server } = await startTestBackend({
-      features: [appPlugin()],
-      services: [
+      features: [
+        appPlugin(),
         mockServices.rootConfig.factory({
           data: {
             app: {
diff --git a/plugins/app-node/CHANGELOG.md b/plugins/app-node/CHANGELOG.md
new file mode 100644
index 0000000000..537e4915d9
--- /dev/null
+++ b/plugins/app-node/CHANGELOG.md
@@ -0,0 +1,44 @@
+# @backstage/plugin-app-node
+
+## 0.1.3-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@0.6.3-next.2
+
+## 0.1.3-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@0.6.3-next.1
+
+## 0.1.2-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@0.6.2-next.0
+
+## 0.1.0
+
+### Minor Changes
+
+- 9fbe95ef6503: Added the `app` plugin node library, initially providing an extension point that can be used to configure a static fallback handler.
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@0.6.0
+
+## 0.1.0-next.0
+
+### Minor Changes
+
+- 9fbe95ef6503: Added the `app` plugin node library, initially providing an extension point that can be used to configure a static fallback handler.
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@0.6.0-next.2
diff --git a/plugins/app-node/catalog-info.yaml b/plugins/app-node/catalog-info.yaml
new file mode 100644
index 0000000000..6624153c6c
--- /dev/null
+++ b/plugins/app-node/catalog-info.yaml
@@ -0,0 +1,10 @@
+apiVersion: backstage.io/v1alpha1
+kind: Component
+metadata:
+  name: backstage-plugin-app-node
+  title: '@backstage/plugin-app-node'
+  description: Node.js library for the app plugin
+spec:
+  lifecycle: experimental
+  type: backstage-node-library
+  owner: maintainers
diff --git a/plugins/app-node/package.json b/plugins/app-node/package.json
index c971bdb628..f0f415f901 100644
--- a/plugins/app-node/package.json
+++ b/plugins/app-node/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@backstage/plugin-app-node",
   "description": "Node.js library for the app plugin",
-  "version": "0.0.0",
+  "version": "0.1.3-next.2",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
diff --git a/plugins/auth-backend-module-gcp-iap-provider/.eslintrc.js b/plugins/auth-backend-module-gcp-iap-provider/.eslintrc.js
new file mode 100644
index 0000000000..e2a53a6ad2
--- /dev/null
+++ b/plugins/auth-backend-module-gcp-iap-provider/.eslintrc.js
@@ -0,0 +1 @@
+module.exports = require('@backstage/cli/config/eslint-factory')(__dirname);
diff --git a/plugins/auth-backend-module-gcp-iap-provider/CHANGELOG.md b/plugins/auth-backend-module-gcp-iap-provider/CHANGELOG.md
new file mode 100644
index 0000000000..32fdb2473a
--- /dev/null
+++ b/plugins/auth-backend-module-gcp-iap-provider/CHANGELOG.md
@@ -0,0 +1,35 @@
+# @backstage/plugin-auth-backend-module-gcp-iap-provider
+
+## 0.1.0-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-auth-node@0.3.0-next.2
+  - @backstage/backend-plugin-api@0.6.3-next.2
+  - @backstage/errors@1.2.1
+  - @backstage/types@1.1.0
+
+## 0.1.0-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@0.6.3-next.1
+  - @backstage/plugin-auth-node@0.3.0-next.1
+  - @backstage/errors@1.2.1
+  - @backstage/types@1.1.0
+
+## 0.1.0-next.0
+
+### Minor Changes
+
+- 8513cd7d00e3: New module for `@backstage/plugin-auth-backend` that adds a GCP IAP auth provider.
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-auth-node@0.3.0-next.0
+  - @backstage/backend-plugin-api@0.6.2-next.0
+  - @backstage/errors@1.2.1
+  - @backstage/types@1.1.0
diff --git a/plugins/auth-backend-module-gcp-iap-provider/README.md b/plugins/auth-backend-module-gcp-iap-provider/README.md
new file mode 100644
index 0000000000..a5f3ce1d4c
--- /dev/null
+++ b/plugins/auth-backend-module-gcp-iap-provider/README.md
@@ -0,0 +1,5 @@
+# Auth Backend Module - GCP IAP Provider
+
+## Links
+
+- [The Backstage homepage](https://backstage.io)
diff --git a/plugins/auth-backend-module-gcp-iap-provider/api-report.md b/plugins/auth-backend-module-gcp-iap-provider/api-report.md
new file mode 100644
index 0000000000..821aa8e437
--- /dev/null
+++ b/plugins/auth-backend-module-gcp-iap-provider/api-report.md
@@ -0,0 +1,47 @@
+## API Report File for "@backstage/plugin-auth-backend-module-gcp-iap-provider"
+
+> Do not edit this file. It is a report generated by [API Extractor](https://api-extractor.com/).
+
+```ts
+import { BackendFeature } from '@backstage/backend-plugin-api';
+import { JsonPrimitive } from '@backstage/types';
+import { ProxyAuthenticator } from '@backstage/plugin-auth-node';
+import { SignInResolverFactory } from '@backstage/plugin-auth-node';
+
+// @public (undocumented)
+const authModuleGcpIapProvider: () => BackendFeature;
+export default authModuleGcpIapProvider;
+
+// @public (undocumented)
+export const gcpIapAuthenticator: ProxyAuthenticator<
+  {
+    jwtHeader: string;
+    tokenValidator: (token: string) => Promise<GcpIapTokenInfo>;
+  },
+  {
+    iapToken: GcpIapTokenInfo;
+  }
+>;
+
+// @public
+export type GcpIapResult = {
+  iapToken: GcpIapTokenInfo;
+};
+
+// @public
+export namespace gcpIapSignInResolvers {
+  const emailMatchingUserEntityAnnotation: SignInResolverFactory<
+    GcpIapResult,
+    unknown
+  >;
+}
+
+// @public
+export type GcpIapTokenInfo = {
+  sub: string;
+  email: string;
+  [key: string]: JsonPrimitive;
+};
+
+// (No @packageDocumentation comment for this package)
+```
diff --git a/plugins/auth-backend-module-gcp-iap-provider/catalog-info.yaml b/plugins/auth-backend-module-gcp-iap-provider/catalog-info.yaml
new file mode 100644
index 0000000000..ef604027df
--- /dev/null
+++ b/plugins/auth-backend-module-gcp-iap-provider/catalog-info.yaml
@@ -0,0 +1,10 @@
+apiVersion: backstage.io/v1alpha1
+kind: Component
+metadata:
+  name: backstage-plugin-auth-backend-module-gcp-iap-provider
+  title: '@backstage/plugin-auth-backend-module-gcp-iap-provider'
+  description: A GCP IAP auth provider module for the Backstage auth backend
+spec:
+  lifecycle: experimental
+  type: backstage-backend-plugin-module
+  owner: maintainers
diff --git a/plugins/auth-backend-module-gcp-iap-provider/config.d.ts b/plugins/auth-backend-module-gcp-iap-provider/config.d.ts
new file mode 100644
index 0000000000..945378ada6
--- /dev/null
+++ b/plugins/auth-backend-module-gcp-iap-provider/config.d.ts
@@ -0,0 +1,39 @@
+/*
+ * 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 interface Config {
+  auth?: {
+    providers?: {
+      /**
+       * Configuration for the Google Cloud Platform Identity-Aware Proxy (IAP) auth provider.
+       */
+      gcpIap?: {
+        [authEnv: string]: {
+          /**
+           * The audience to use when validating incoming JWT tokens.
+           * See https://backstage.io/docs/auth/google/gcp-iap-auth
+           */
+          audience: string;
+
+          /**
+           * The name of the header to read the JWT token from, defaults to `'x-goog-iap-jwt-assertion'`.
+           */
+          jwtHeader?: string;
+        };
+      };
+    };
+  };
+}
diff --git a/plugins/auth-backend-module-gcp-iap-provider/package.json b/plugins/auth-backend-module-gcp-iap-provider/package.json
new file mode 100644
index 0000000000..8b2111cfb1
--- /dev/null
+++ b/plugins/auth-backend-module-gcp-iap-provider/package.json
@@ -0,0 +1,53 @@
+{
+  "name": "@backstage/plugin-auth-backend-module-gcp-iap-provider",
+  "description": "A GCP IAP auth provider module for the Backstage auth backend",
+  "version": "0.1.0-next.2",
+  "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"
+  },
+  "homepage": "https://backstage.io",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/backstage/backstage",
+    "directory": "plugins/auth-backend-module-gcp-iap-provider"
+  },
+  "keywords": [
+    "backstage"
+  ],
+  "scripts": {
+    "start": "backstage-cli package start",
+    "build": "backstage-cli package 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"
+  },
+  "dependencies": {
+    "@backstage/backend-plugin-api": "workspace:^",
+    "@backstage/errors": "workspace:^",
+    "@backstage/plugin-auth-node": "workspace:^",
+    "@backstage/types": "workspace:^",
+    "google-auth-library": "^8.0.0"
+  },
+  "devDependencies": {
+    "@backstage/backend-test-utils": "workspace:^",
+    "@backstage/cli": "workspace:^",
+    "express": "^4.18.2",
+    "msw": "^1.0.0",
+    "supertest": "^6.1.3"
+  },
+  "files": [
+    "dist",
+    "config.d.ts"
+  ],
+  "configSchema": "config.d.ts"
+}
diff --git a/plugins/auth-backend-module-gcp-iap-provider/src/authenticator.test.ts b/plugins/auth-backend-module-gcp-iap-provider/src/authenticator.test.ts
new file mode 100644
index 0000000000..51efbe1a04
--- /dev/null
+++ b/plugins/auth-backend-module-gcp-iap-provider/src/authenticator.test.ts
@@ -0,0 +1,91 @@
+/*
+ * 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 { mockServices } from '@backstage/backend-test-utils';
+import { Request } from 'express';
+import { gcpIapAuthenticator } from './authenticator';
+
+beforeEach(() => {
+  jest.clearAllMocks();
+});
+jest.mock('./helpers', () => ({
+  createTokenValidator() {
+    return async () => ({ sub: 's', email: 'e' });
+  },
+}));
+
+describe('GcpIapProvider', () => {
+  it('should find default JWT header', async () => {
+    const ctx = await gcpIapAuthenticator.initialize({
+      config: mockServices.rootConfig({ data: { audience: 'my-audience' } }),
+    });
+    await expect(
+      gcpIapAuthenticator.authenticate(
+        {
+          req: {
+            header(name: string) {
+              return name === 'x-goog-iap-jwt-assertion'
+                ? 'my-token'
+                : undefined;
+            },
+          } as Request,
+        },
+        ctx,
+      ),
+    ).resolves.toEqual({ result: { iapToken: { sub: 's', email: 'e' } } });
+  });
+
+  it('should find custom JWT header', async () => {
+    const jwtHeader = 'x-custom-header';
+    const ctx = await gcpIapAuthenticator.initialize({
+      config: mockServices.rootConfig({
+        data: { audience: 'my-audience', jwtHeader },
+      }),
+    });
+    await expect(
+      gcpIapAuthenticator.authenticate(
+        {
+          req: {
+            header(name: string) {
+              return name === jwtHeader ? 'my-token' : undefined;
+            },
+          } as Request,
+        },
+        ctx,
+      ),
+    ).resolves.toEqual({ result: { iapToken: { sub: 's', email: 'e' } } });
+  });
+
+  it('should throw if header is missing', async () => {
+    const ctx = await gcpIapAuthenticator.initialize({
+      config: mockServices.rootConfig({
+        data: { audience: 'my-audience' },
+      }),
+    });
+    await expect(
+      gcpIapAuthenticator.authenticate(
+        {
+          req: {
+            header(_name: string) {
+              return undefined;
+            },
+          } as Request,
+        },
+        ctx,
+      ),
+    ).rejects.toThrow('Missing Google IAP header');
+  });
+});
diff --git a/plugins/auth-backend-module-gcp-iap-provider/src/authenticator.ts b/plugins/auth-backend-module-gcp-iap-provider/src/authenticator.ts
new file mode 100644
index 0000000000..ca104ded86
--- /dev/null
+++ b/plugins/auth-backend-module-gcp-iap-provider/src/authenticator.ts
@@ -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 { AuthenticationError } from '@backstage/errors';
+import { createProxyAuthenticator } from '@backstage/plugin-auth-node';
+import { createTokenValidator } from './helpers';
+import { GcpIapResult } from './types';
+
+/**
+ * The header name used by the IAP.
+ */
+const DEFAULT_IAP_JWT_HEADER = 'x-goog-iap-jwt-assertion';
+
+/** @public */
+export const gcpIapAuthenticator = createProxyAuthenticator({
+  defaultProfileTransform: async (result: GcpIapResult) => {
+    return { profile: { email: result.iapToken.email } };
+  },
+  async initialize({ config }) {
+    const audience = config.getString('audience');
+    const jwtHeader =
+      config.getOptionalString('jwtHeader') ?? DEFAULT_IAP_JWT_HEADER;
+
+    const tokenValidator = createTokenValidator(audience);
+
+    return { jwtHeader, tokenValidator };
+  },
+  async authenticate({ req }, { jwtHeader, tokenValidator }) {
+    const token = req.header(jwtHeader);
+
+    if (!token || typeof token !== 'string') {
+      throw new AuthenticationError('Missing Google IAP header');
+    }
+
+    const iapToken = await tokenValidator(token);
+
+    return { result: { iapToken } };
+  },
+});
diff --git a/plugins/auth-backend-module-gcp-iap-provider/src/helpers.test.ts b/plugins/auth-backend-module-gcp-iap-provider/src/helpers.test.ts
new file mode 100644
index 0000000000..4079f8f7d3
--- /dev/null
+++ b/plugins/auth-backend-module-gcp-iap-provider/src/helpers.test.ts
@@ -0,0 +1,124 @@
+/*
+ * 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 { OAuth2Client } from 'google-auth-library';
+import { createTokenValidator } from './helpers';
+
+const mockJwt = 'a.b.c';
+
+beforeEach(() => {
+  jest.clearAllMocks();
+});
+
+describe('helpers', () => {
+  describe('createTokenValidator', () => {
+    it('runs the happy path', async () => {
+      const mockClient = {
+        getIapPublicKeys: async () => ({ pubkeys: '' }),
+        verifySignedJwtWithCertsAsync: async () => ({
+          getPayload: () => ({ sub: 's', email: 'e@mail.com' }),
+        }),
+      };
+      const validator = createTokenValidator(
+        'a',
+        mockClient as unknown as OAuth2Client,
+      );
+      await expect(validator(mockJwt)).resolves.toMatchObject({
+        sub: 's',
+        email: 'e@mail.com',
+      });
+    });
+
+    it('throws if listing keys fail', async () => {
+      const mockClient = {
+        getIapPublicKeys: async () => {
+          throw new Error('NOPE');
+        },
+      };
+      const validator = createTokenValidator(
+        'a',
+        mockClient as unknown as OAuth2Client,
+      );
+      await expect(validator(mockJwt)).rejects.toThrow(
+        'Unable to list Google IAP token verification keys, Error: NOPE',
+      );
+    });
+
+    it('throws if the verifying signature fails', async () => {
+      const mockClient = {
+        getIapPublicKeys: async () => ({ pubkeys: '' }),
+        verifySignedJwtWithCertsAsync: async () => {
+          throw new Error('NOPE');
+        },
+      };
+      const validator = createTokenValidator(
+        'a',
+        mockClient as unknown as OAuth2Client,
+      );
+      await expect(validator(mockJwt)).rejects.toThrow(
+        'Google IAP token verification failed, Error: NOPE',
+      );
+    });
+
+    it('rejects empty payload', async () => {
+      const mockClient = {
+        getIapPublicKeys: async () => ({ pubkeys: '' }),
+        verifySignedJwtWithCertsAsync: async () => ({
+          getPayload: () => undefined,
+        }),
+      };
+      const validator = createTokenValidator(
+        'a',
+        mockClient as unknown as OAuth2Client,
+      );
+      await expect(validator(mockJwt)).rejects.toThrow(
+        'Google IAP token verification failed, token had no payload',
+      );
+    });
+
+    it('rejects payload without subject', async () => {
+      const mockClient = {
+        getIapPublicKeys: async () => ({ pubkeys: '' }),
+        verifySignedJwtWithCertsAsync: async () => ({
+          getPayload: () => ({ email: 'e@mail.com' }),
+        }),
+      };
+      const validator = createTokenValidator(
+        'a',
+        mockClient as unknown as OAuth2Client,
+      );
+      await expect(validator(mockJwt)).rejects.toThrow(
+        'Google IAP token payload is missing subject claim',
+      );
+    });
+
+    it('rejects payload without email', async () => {
+      const mockClient = {
+        getIapPublicKeys: async () => ({ pubkeys: '' }),
+        verifySignedJwtWithCertsAsync: async () => ({
+          getPayload: () => ({ sub: 's' }),
+        }),
+      };
+      const validator = createTokenValidator(
+        'a',
+        mockClient as unknown as OAuth2Client,
+      );
+      await expect(validator(mockJwt)).rejects.toThrow(
+        'Google IAP token payload is missing email claim',
+      );
+    });
+  });
+});
diff --git a/plugins/auth-backend-module-gcp-iap-provider/src/helpers.ts b/plugins/auth-backend-module-gcp-iap-provider/src/helpers.ts
new file mode 100644
index 0000000000..54db7117f9
--- /dev/null
+++ b/plugins/auth-backend-module-gcp-iap-provider/src/helpers.ts
@@ -0,0 +1,67 @@
+/*
+ * 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 { AuthenticationError } from '@backstage/errors';
+import { OAuth2Client } from 'google-auth-library';
+import { GcpIapTokenInfo } from './types';
+
+export function createTokenValidator(
+  audience: string,
+  providedClient?: OAuth2Client,
+): (token: string) => Promise<GcpIapTokenInfo> {
+  const client = providedClient ?? new OAuth2Client();
+
+  return async function tokenValidator(token) {
+    // TODO(freben): Rate limit the public key reads. It may be sensible to
+    // cache these for some reasonable time rather than asking for the public
+    // keys on every single sign-in. But since the rate of events here is so
+    // slow, I decided to keep it simple for now.
+    const response = await client.getIapPublicKeys().catch(error => {
+      throw new AuthenticationError(
+        `Unable to list Google IAP token verification keys, ${error}`,
+      );
+    });
+    const ticket = await client
+      .verifySignedJwtWithCertsAsync(token, response.pubkeys, audience, [
+        'https://cloud.google.com/iap',
+      ])
+      .catch(error => {
+        throw new AuthenticationError(
+          `Google IAP token verification failed, ${error}`,
+        );
+      });
+
+    const payload = ticket.getPayload();
+    if (!payload) {
+      throw new AuthenticationError(
+        'Google IAP token verification failed, token had no payload',
+      );
+    }
+
+    if (!payload.sub) {
+      throw new AuthenticationError(
+        'Google IAP token payload is missing subject claim',
+      );
+    }
+    if (!payload.email) {
+      throw new AuthenticationError(
+        'Google IAP token payload is missing email claim',
+      );
+    }
+
+    return payload as unknown as GcpIapTokenInfo;
+  };
+}
diff --git a/plugins/auth-backend-module-gcp-iap-provider/src/index.ts b/plugins/auth-backend-module-gcp-iap-provider/src/index.ts
new file mode 100644
index 0000000000..0cbd54d027
--- /dev/null
+++ b/plugins/auth-backend-module-gcp-iap-provider/src/index.ts
@@ -0,0 +1,20 @@
+/*
+ * 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 { gcpIapAuthenticator } from './authenticator';
+export { authModuleGcpIapProvider as default } from './module';
+export { gcpIapSignInResolvers } from './resolvers';
+export { type GcpIapResult, type GcpIapTokenInfo } from './types';
diff --git a/plugins/auth-backend-module-gcp-iap-provider/src/module.ts b/plugins/auth-backend-module-gcp-iap-provider/src/module.ts
new file mode 100644
index 0000000000..90771eecb9
--- /dev/null
+++ b/plugins/auth-backend-module-gcp-iap-provider/src/module.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 { createBackendModule } from '@backstage/backend-plugin-api';
+import {
+  authProvidersExtensionPoint,
+  commonSignInResolvers,
+  createProxyAuthProviderFactory,
+} from '@backstage/plugin-auth-node';
+import { gcpIapAuthenticator } from './authenticator';
+import { gcpIapSignInResolvers } from './resolvers';
+
+/** @public */
+export const authModuleGcpIapProvider = createBackendModule({
+  pluginId: 'auth',
+  moduleId: 'gcpIapProvider',
+  register(reg) {
+    reg.registerInit({
+      deps: {
+        providers: authProvidersExtensionPoint,
+      },
+      async init({ providers }) {
+        providers.registerProvider({
+          providerId: 'gcpIap',
+          factory: createProxyAuthProviderFactory({
+            authenticator: gcpIapAuthenticator,
+            signInResolverFactories: {
+              ...gcpIapSignInResolvers,
+              ...commonSignInResolvers,
+            },
+          }),
+        });
+      },
+    });
+  },
+});
diff --git a/plugins/auth-backend-module-gcp-iap-provider/src/resolvers.ts b/plugins/auth-backend-module-gcp-iap-provider/src/resolvers.ts
new file mode 100644
index 0000000000..32ab2b6cc7
--- /dev/null
+++ b/plugins/auth-backend-module-gcp-iap-provider/src/resolvers.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 {
+  createSignInResolverFactory,
+  SignInInfo,
+} from '@backstage/plugin-auth-node';
+import { GcpIapResult } from './types';
+
+/**
+ * Available sign-in resolvers for the Google auth provider.
+ *
+ * @public
+ */
+export namespace gcpIapSignInResolvers {
+  /**
+   * Looks up the user by matching their email to the `google.com/email` annotation.
+   */
+  export const emailMatchingUserEntityAnnotation = createSignInResolverFactory({
+    create() {
+      return async (info: SignInInfo<GcpIapResult>, ctx) => {
+        const email = info.result.iapToken.email;
+
+        if (!email) {
+          throw new Error('Google IAP sign-in result is missing email');
+        }
+
+        return ctx.signInWithCatalogUser({
+          annotations: {
+            'google.com/email': email,
+          },
+        });
+      };
+    },
+  });
+}
diff --git a/plugins/auth-backend-module-gcp-iap-provider/src/types.ts b/plugins/auth-backend-module-gcp-iap-provider/src/types.ts
new file mode 100644
index 0000000000..a967a4d579
--- /dev/null
+++ b/plugins/auth-backend-module-gcp-iap-provider/src/types.ts
@@ -0,0 +1,50 @@
+/*
+ * Copyright 2023 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import { JsonPrimitive } from '@backstage/types';
+
+/**
+ * The data extracted from an IAP token.
+ *
+ * @public
+ */
+export type GcpIapTokenInfo = {
+  /**
+   * The unique, stable identifier for the user.
+   */
+  sub: string;
+  /**
+   * User email address.
+   */
+  email: string;
+  /**
+   * Other fields.
+   */
+  [key: string]: JsonPrimitive;
+};
+
+/**
+ * The result of the initial auth challenge. This is the input to the auth
+ * callbacks.
+ *
+ * @public
+ */
+export type GcpIapResult = {
+  /**
+   * The data extracted from the IAP token header.
+   */
+  iapToken: GcpIapTokenInfo;
+};
diff --git a/plugins/auth-backend-module-github-provider/.eslintrc.js b/plugins/auth-backend-module-github-provider/.eslintrc.js
new file mode 100644
index 0000000000..e2a53a6ad2
--- /dev/null
+++ b/plugins/auth-backend-module-github-provider/.eslintrc.js
@@ -0,0 +1 @@
+module.exports = require('@backstage/cli/config/eslint-factory')(__dirname);
diff --git a/plugins/auth-backend-module-github-provider/CHANGELOG.md b/plugins/auth-backend-module-github-provider/CHANGELOG.md
new file mode 100644
index 0000000000..d347796a43
--- /dev/null
+++ b/plugins/auth-backend-module-github-provider/CHANGELOG.md
@@ -0,0 +1,32 @@
+# @backstage/plugin-auth-backend-module-github-provider
+
+## 0.1.0-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.19.5-next.2
+  - @backstage/plugin-auth-node@0.3.0-next.2
+  - @backstage/backend-plugin-api@0.6.3-next.2
+
+## 0.1.0-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.19.5-next.1
+  - @backstage/backend-plugin-api@0.6.3-next.1
+  - @backstage/plugin-auth-node@0.3.0-next.1
+
+## 0.1.0-next.0
+
+### Minor Changes
+
+- 23af27f5ce79: New module for `@backstage/plugin-auth-backend` that adds a GitHub auth provider.
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-auth-node@0.3.0-next.0
+  - @backstage/backend-common@0.19.4-next.0
+  - @backstage/backend-plugin-api@0.6.2-next.0
diff --git a/plugins/auth-backend-module-github-provider/README.md b/plugins/auth-backend-module-github-provider/README.md
new file mode 100644
index 0000000000..7928ce1034
--- /dev/null
+++ b/plugins/auth-backend-module-github-provider/README.md
@@ -0,0 +1,8 @@
+# Auth Module: GitHub Provider
+
+This module provides an GitHub auth provider implementation for `@backstage/plugin-auth-backend`.
+
+## Links
+
+- [Backstage](https://backstage.io)
+- [Repository](https://github.com/backstage/backstage/tree/master/plugins/auth-backend-module-github-provider)
diff --git a/plugins/auth-backend-module-github-provider/api-report.md b/plugins/auth-backend-module-github-provider/api-report.md
new file mode 100644
index 0000000000..3f2c5030d2
--- /dev/null
+++ b/plugins/auth-backend-module-github-provider/api-report.md
@@ -0,0 +1,30 @@
+## API Report File for "@backstage/plugin-auth-backend-module-github-provider"
+
+> Do not edit this file. It is a report generated by [API Extractor](https://api-extractor.com/).
+
+```ts
+import { BackendFeature } from '@backstage/backend-plugin-api';
+import { OAuthAuthenticator } from '@backstage/plugin-auth-node';
+import { OAuthAuthenticatorResult } from '@backstage/plugin-auth-node';
+import { PassportOAuthAuthenticatorHelper } from '@backstage/plugin-auth-node';
+import { PassportProfile } from '@backstage/plugin-auth-node';
+import { SignInResolverFactory } from '@backstage/plugin-auth-node';
+
+// @public (undocumented)
+const authModuleGithubProvider: () => BackendFeature;
+export default authModuleGithubProvider;
+
+// @public (undocumented)
+export const githubAuthenticator: OAuthAuthenticator<
+  PassportOAuthAuthenticatorHelper,
+  PassportProfile
+>;
+
+// @public
+export namespace githubSignInResolvers {
+  const usernameMatchingUserEntityName: SignInResolverFactory<
+    OAuthAuthenticatorResult<PassportProfile>,
+    unknown
+  >;
+}
+```
diff --git a/plugins/auth-backend-module-github-provider/catalog-info.yaml b/plugins/auth-backend-module-github-provider/catalog-info.yaml
new file mode 100644
index 0000000000..8eda78fdaa
--- /dev/null
+++ b/plugins/auth-backend-module-github-provider/catalog-info.yaml
@@ -0,0 +1,10 @@
+apiVersion: backstage.io/v1alpha1
+kind: Component
+metadata:
+  name: backstage-plugin-auth-backend-module-github-provider
+  title: '@backstage/plugin-auth-backend-module-github-provider'
+  description: The github-provider backend module for the auth plugin.
+spec:
+  lifecycle: experimental
+  type: backstage-backend-plugin-module
+  owner: maintainers
diff --git a/plugins/auth-backend-module-github-provider/dev/index.ts b/plugins/auth-backend-module-github-provider/dev/index.ts
new file mode 100644
index 0000000000..d3c18c1d48
--- /dev/null
+++ b/plugins/auth-backend-module-github-provider/dev/index.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.
+ */
+
+import { createBackend } from '@backstage/backend-defaults';
+
+const backend = createBackend();
+
+backend.add(import('@backstage/plugin-auth-backend'));
+backend.add(import('../src'));
+
+backend.start();
diff --git a/plugins/auth-backend-module-github-provider/package.json b/plugins/auth-backend-module-github-provider/package.json
new file mode 100644
index 0000000000..ec57147a4b
--- /dev/null
+++ b/plugins/auth-backend-module-github-provider/package.json
@@ -0,0 +1,41 @@
+{
+  "name": "@backstage/plugin-auth-backend-module-github-provider",
+  "description": "The github-provider backend module for the auth plugin.",
+  "version": "0.1.0-next.2",
+  "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/backend-common": "workspace:^",
+    "@backstage/backend-plugin-api": "workspace:^",
+    "@backstage/plugin-auth-node": "workspace:^",
+    "passport-github2": "^0.1.12"
+  },
+  "devDependencies": {
+    "@backstage/backend-defaults": "workspace:^",
+    "@backstage/backend-test-utils": "workspace:^",
+    "@backstage/cli": "workspace:^",
+    "@backstage/plugin-auth-backend": "workspace:^",
+    "supertest": "^6.3.3"
+  },
+  "files": [
+    "dist"
+  ]
+}
diff --git a/plugins/auth-backend-module-github-provider/src/authenticator.test.ts b/plugins/auth-backend-module-github-provider/src/authenticator.test.ts
new file mode 100644
index 0000000000..dc5c7208ea
--- /dev/null
+++ b/plugins/auth-backend-module-github-provider/src/authenticator.test.ts
@@ -0,0 +1,142 @@
+/*
+ * 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 {
+  PassportOAuthAuthenticatorHelper,
+  PassportProfile,
+} from '@backstage/plugin-auth-node';
+import { githubAuthenticator } from './authenticator';
+
+describe('githubAuthenticator', () => {
+  it('should store access token without expiration as refresh token', async () => {
+    await expect(
+      githubAuthenticator.authenticate(
+        {} as any,
+        {
+          authenticate: async _input => ({
+            fullProfile: { id: 'id' } as PassportProfile,
+            session: {
+              accessToken: 'my-token',
+              scope: 'user:read',
+              tokenType: 'bearer',
+            },
+          }),
+        } as PassportOAuthAuthenticatorHelper,
+      ),
+    ).resolves.toEqual({
+      fullProfile: { id: 'id' },
+      session: {
+        accessToken: 'my-token',
+        scope: 'user:read',
+        tokenType: 'bearer',
+        refreshToken: 'access-token.my-token',
+      },
+    });
+  });
+
+  it('should not use access token as refresh token if it expires', async () => {
+    await expect(
+      githubAuthenticator.authenticate(
+        {} as any,
+        {
+          authenticate: async _input => ({
+            fullProfile: { id: 'id' } as PassportProfile,
+            session: {
+              accessToken: 'my-token',
+              scope: 'user:read',
+              tokenType: 'bearer',
+              expiresInSeconds: 3,
+            },
+          }),
+        } as PassportOAuthAuthenticatorHelper,
+      ),
+    ).resolves.toEqual({
+      fullProfile: { id: 'id' },
+      session: {
+        accessToken: 'my-token',
+        scope: 'user:read',
+        tokenType: 'bearer',
+        expiresInSeconds: 3,
+      },
+    });
+  });
+
+  it('should not store access token without expiration if a refresh token is provided', async () => {
+    await expect(
+      githubAuthenticator.authenticate(
+        {} as any,
+        {
+          authenticate: async _input => ({
+            fullProfile: { id: 'id' } as PassportProfile,
+            session: {
+              accessToken: 'my-token',
+              scope: 'user:read',
+              tokenType: 'bearer',
+              refreshToken: 'my-refresh-token',
+            },
+          }),
+        } as PassportOAuthAuthenticatorHelper,
+      ),
+    ).resolves.toEqual({
+      fullProfile: { id: 'id' },
+      session: {
+        accessToken: 'my-token',
+        scope: 'user:read',
+        tokenType: 'bearer',
+        refreshToken: 'my-refresh-token',
+      },
+    });
+  });
+
+  it('should refresh with access token', async () => {
+    await expect(
+      githubAuthenticator.refresh(
+        {
+          refreshToken: 'access-token.my-token',
+          req: {} as any,
+          scope: 'user:read',
+        },
+        {
+          fetchProfile: async _input => ({ id: 'id' } as PassportProfile),
+        } as PassportOAuthAuthenticatorHelper,
+      ),
+    ).resolves.toEqual({
+      fullProfile: { id: 'id' },
+      session: {
+        accessToken: 'my-token',
+        scope: 'user:read',
+        tokenType: 'bearer',
+        refreshToken: 'access-token.my-token',
+      },
+    });
+  });
+
+  it('should refresh with refresh token', async () => {
+    const res = {};
+    await expect(
+      githubAuthenticator.refresh(
+        {
+          refreshToken: 'my-refresh-token',
+          req: {} as any,
+          scope: 'user:read',
+        },
+        {
+          refresh: async _input => res as any,
+        } as PassportOAuthAuthenticatorHelper,
+      ),
+    ).resolves.toBe(res);
+  });
+});
diff --git a/plugins/auth-backend-module-github-provider/src/authenticator.ts b/plugins/auth-backend-module-github-provider/src/authenticator.ts
new file mode 100644
index 0000000000..f59ac3d727
--- /dev/null
+++ b/plugins/auth-backend-module-github-provider/src/authenticator.ts
@@ -0,0 +1,125 @@
+/*
+ * 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 { Strategy as GithubStrategy } from 'passport-github2';
+import {
+  createOAuthAuthenticator,
+  PassportOAuthAuthenticatorHelper,
+  PassportOAuthDoneCallback,
+  PassportProfile,
+} from '@backstage/plugin-auth-node';
+
+const ACCESS_TOKEN_PREFIX = 'access-token.';
+
+/** @public */
+export const githubAuthenticator = createOAuthAuthenticator({
+  defaultProfileTransform:
+    PassportOAuthAuthenticatorHelper.defaultProfileTransform,
+  initialize({ callbackUrl, config }) {
+    const clientId = config.getString('clientId');
+    const clientSecret = config.getString('clientSecret');
+    const enterpriseInstanceUrl = config
+      .getOptionalString('enterpriseInstanceUrl')
+      ?.replace(/\/$/, '');
+    const authorizationUrl = enterpriseInstanceUrl
+      ? `${enterpriseInstanceUrl}/login/oauth/authorize`
+      : undefined;
+    const tokenUrl = enterpriseInstanceUrl
+      ? `${enterpriseInstanceUrl}/login/oauth/access_token`
+      : undefined;
+    const userProfileUrl = enterpriseInstanceUrl
+      ? `${enterpriseInstanceUrl}/api/v3/user`
+      : undefined;
+
+    return PassportOAuthAuthenticatorHelper.from(
+      new GithubStrategy(
+        {
+          clientID: clientId,
+          clientSecret: clientSecret,
+          callbackURL: callbackUrl,
+          tokenURL: tokenUrl,
+          userProfileURL: userProfileUrl,
+          authorizationURL: authorizationUrl,
+        },
+        (
+          accessToken: string,
+          refreshToken: string,
+          params: any,
+          fullProfile: PassportProfile,
+          done: PassportOAuthDoneCallback,
+        ) => {
+          done(
+            undefined,
+            { fullProfile, params, accessToken },
+            { refreshToken },
+          );
+        },
+      ),
+    );
+  },
+
+  async start(input, helper) {
+    return helper.start(input, {
+      accessType: 'offline',
+      prompt: 'consent',
+    });
+  },
+
+  async authenticate(input, helper) {
+    const { fullProfile, session } = await helper.authenticate(input);
+
+    // If we do not have a real refresh token and we have a non-expiring
+    // access token, then we use that as our refresh token.
+    if (!session.refreshToken && !session.expiresInSeconds) {
+      session.refreshToken = ACCESS_TOKEN_PREFIX + session.accessToken;
+    }
+    return { fullProfile, session };
+  },
+
+  async refresh(input, helper) {
+    // This is the OAuth App flow. A non-expiring access token is stored in the
+    // refresh token cookie. We use that token to fetch the user profile and
+    // refresh the Backstage session when needed.
+    if (input.refreshToken?.startsWith(ACCESS_TOKEN_PREFIX)) {
+      const accessToken = input.refreshToken.slice(ACCESS_TOKEN_PREFIX.length);
+
+      const fullProfile = await helper
+        .fetchProfile(accessToken)
+        .catch(error => {
+          if (error.oauthError?.statusCode === 401) {
+            throw new Error('Invalid access token');
+          }
+          throw error;
+        });
+
+      return {
+        fullProfile,
+        session: {
+          accessToken,
+          tokenType: 'bearer',
+          scope: input.scope,
+          refreshToken: input.refreshToken,
+          // No expiration
+        },
+      };
+    }
+
+    // This is the App flow, which is close to a standard OAuth refresh flow. It has a
+    // pretty long session expiration, and it also ignores the requested scope, instead
+    // just allowing access to whatever is configured as part of the app installation.
+    return helper.refresh(input);
+  },
+});
diff --git a/plugins/auth-backend-module-github-provider/src/index.ts b/plugins/auth-backend-module-github-provider/src/index.ts
new file mode 100644
index 0000000000..646ba7c92a
--- /dev/null
+++ b/plugins/auth-backend-module-github-provider/src/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.
+ */
+
+/**
+ * The github-provider backend module for the auth plugin.
+ *
+ * @packageDocumentation
+ */
+
+export { githubAuthenticator } from './authenticator';
+export { authModuleGithubProvider as default } from './module';
+export { githubSignInResolvers } from './resolvers';
diff --git a/plugins/auth-backend-module-github-provider/src/module.test.ts b/plugins/auth-backend-module-github-provider/src/module.test.ts
new file mode 100644
index 0000000000..437e002bc3
--- /dev/null
+++ b/plugins/auth-backend-module-github-provider/src/module.test.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 { mockServices, startTestBackend } from '@backstage/backend-test-utils';
+import { authModuleGithubProvider } from './module';
+import request from 'supertest';
+import { decodeOAuthState } from '@backstage/plugin-auth-node';
+
+describe('authModuleGithubProvider', () => {
+  it('should start', async () => {
+    const { server } = await startTestBackend({
+      features: [
+        import('@backstage/plugin-auth-backend'),
+        authModuleGithubProvider,
+        mockServices.rootConfig.factory({
+          data: {
+            app: {
+              baseUrl: 'http://localhost:3000',
+            },
+            auth: {
+              providers: {
+                github: {
+                  development: {
+                    clientId: 'my-client-id',
+                    clientSecret: 'my-client-secret',
+                  },
+                },
+              },
+            },
+          },
+        }),
+      ],
+    });
+
+    const agent = request.agent(server);
+
+    const res = await agent.get('/api/auth/github/start?env=development');
+
+    expect(res.status).toEqual(302);
+
+    const nonceCookie = agent.jar.getCookie('github-nonce', {
+      domain: 'localhost',
+      path: '/api/auth/github/handler',
+      script: false,
+      secure: false,
+    });
+    expect(nonceCookie).toBeDefined();
+
+    const startUrl = new URL(res.get('location'));
+    expect(startUrl.origin).toBe('https://github.com');
+    expect(startUrl.pathname).toBe('/login/oauth/authorize');
+    expect(Object.fromEntries(startUrl.searchParams)).toEqual({
+      response_type: 'code',
+      client_id: 'my-client-id',
+      redirect_uri: `http://localhost:${server.port()}/api/auth/github/handler/frame`,
+      state: expect.any(String),
+    });
+
+    expect(decodeOAuthState(startUrl.searchParams.get('state')!)).toEqual({
+      env: 'development',
+      nonce: decodeURIComponent(nonceCookie.value),
+    });
+  });
+});
diff --git a/plugins/auth-backend-module-github-provider/src/module.ts b/plugins/auth-backend-module-github-provider/src/module.ts
new file mode 100644
index 0000000000..54286c94a7
--- /dev/null
+++ b/plugins/auth-backend-module-github-provider/src/module.ts
@@ -0,0 +1,48 @@
+/*
+ * 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 { createBackendModule } from '@backstage/backend-plugin-api';
+import {
+  authProvidersExtensionPoint,
+  commonSignInResolvers,
+  createOAuthProviderFactory,
+} from '@backstage/plugin-auth-node';
+import { githubAuthenticator } from './authenticator';
+import { githubSignInResolvers } from './resolvers';
+
+/** @public */
+export const authModuleGithubProvider = createBackendModule({
+  pluginId: 'auth',
+  moduleId: 'github-provider',
+  register(reg) {
+    reg.registerInit({
+      deps: {
+        providers: authProvidersExtensionPoint,
+      },
+      async init({ providers }) {
+        providers.registerProvider({
+          providerId: 'github',
+          factory: createOAuthProviderFactory({
+            authenticator: githubAuthenticator,
+            signInResolverFactories: {
+              ...githubSignInResolvers,
+              ...commonSignInResolvers,
+            },
+          }),
+        });
+      },
+    });
+  },
+});
diff --git a/plugins/auth-backend-module-github-provider/src/resolvers.ts b/plugins/auth-backend-module-github-provider/src/resolvers.ts
new file mode 100644
index 0000000000..496080a33c
--- /dev/null
+++ b/plugins/auth-backend-module-github-provider/src/resolvers.ts
@@ -0,0 +1,50 @@
+/*
+ * Copyright 2023 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import {
+  createSignInResolverFactory,
+  OAuthAuthenticatorResult,
+  PassportProfile,
+  SignInInfo,
+} from '@backstage/plugin-auth-node';
+
+/**
+ * Available sign-in resolvers for the GitHub auth provider.
+ *
+ * @public
+ */
+export namespace githubSignInResolvers {
+  /**
+   * Looks up the user by matching their GitHub username to the entity name.
+   */
+  export const usernameMatchingUserEntityName = createSignInResolverFactory({
+    create() {
+      return async (
+        info: SignInInfo<OAuthAuthenticatorResult<PassportProfile>>,
+        ctx,
+      ) => {
+        const { fullProfile } = info.result;
+
+        const userId = fullProfile.username;
+        if (!userId) {
+          throw new Error(`GitHub user profile does not contain a username`);
+        }
+
+        return ctx.signInWithCatalogUser({ entityRef: { name: userId } });
+      };
+    },
+  });
+}
diff --git a/plugins/auth-backend-module-gitlab-provider/.eslintrc.js b/plugins/auth-backend-module-gitlab-provider/.eslintrc.js
new file mode 100644
index 0000000000..e2a53a6ad2
--- /dev/null
+++ b/plugins/auth-backend-module-gitlab-provider/.eslintrc.js
@@ -0,0 +1 @@
+module.exports = require('@backstage/cli/config/eslint-factory')(__dirname);
diff --git a/plugins/auth-backend-module-gitlab-provider/CHANGELOG.md b/plugins/auth-backend-module-gitlab-provider/CHANGELOG.md
new file mode 100644
index 0000000000..54c2240c17
--- /dev/null
+++ b/plugins/auth-backend-module-gitlab-provider/CHANGELOG.md
@@ -0,0 +1,23 @@
+# @backstage/plugin-auth-backend-module-gitlab-provider
+
+## 0.1.0-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.19.5-next.2
+  - @backstage/plugin-auth-node@0.3.0-next.2
+  - @backstage/backend-plugin-api@0.6.3-next.2
+
+## 0.1.0-next.0
+
+### Minor Changes
+
+- 080cc7794700: New module for `@backstage/plugin-auth-backend` that adds a GitLab auth provider.
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.19.5-next.1
+  - @backstage/backend-plugin-api@0.6.3-next.1
+  - @backstage/plugin-auth-node@0.3.0-next.1
diff --git a/plugins/auth-backend-module-gitlab-provider/README.md b/plugins/auth-backend-module-gitlab-provider/README.md
new file mode 100644
index 0000000000..b9eb561990
--- /dev/null
+++ b/plugins/auth-backend-module-gitlab-provider/README.md
@@ -0,0 +1,8 @@
+# Auth Module: GitLab Provider
+
+This module provides an GitLab auth provider implementation for `@backstage/plugin-auth-backend`.
+
+## Links
+
+- [Repository](https://gitlab.com/backstage/backstage/tree/master/plugins/auth-backend-module-gitlab-provider)
+- [Backstage Project Homepage](https://backstage.io)
diff --git a/plugins/auth-backend-module-gitlab-provider/api-report.md b/plugins/auth-backend-module-gitlab-provider/api-report.md
new file mode 100644
index 0000000000..d6ec7ee82a
--- /dev/null
+++ b/plugins/auth-backend-module-gitlab-provider/api-report.md
@@ -0,0 +1,30 @@
+## API Report File for "@backstage/plugin-auth-backend-module-gitlab-provider"
+
+> Do not edit this file. It is a report generated by [API Extractor](https://api-extractor.com/).
+
+```ts
+import { BackendFeature } from '@backstage/backend-plugin-api';
+import { OAuthAuthenticator } from '@backstage/plugin-auth-node';
+import { OAuthAuthenticatorResult } from '@backstage/plugin-auth-node';
+import { PassportOAuthAuthenticatorHelper } from '@backstage/plugin-auth-node';
+import { PassportProfile } from '@backstage/plugin-auth-node';
+import { SignInResolverFactory } from '@backstage/plugin-auth-node';
+
+// @public (undocumented)
+const authModuleGitlabProvider: () => BackendFeature;
+export default authModuleGitlabProvider;
+
+// @public (undocumented)
+export const gitlabAuthenticator: OAuthAuthenticator<
+  PassportOAuthAuthenticatorHelper,
+  PassportProfile
+>;
+
+// @public
+export namespace gitlabSignInResolvers {
+  const usernameMatchingUserEntityName: SignInResolverFactory<
+    OAuthAuthenticatorResult<PassportProfile>,
+    unknown
+  >;
+}
+```
diff --git a/plugins/auth-backend-module-gitlab-provider/catalog-info.yaml b/plugins/auth-backend-module-gitlab-provider/catalog-info.yaml
new file mode 100644
index 0000000000..55086778e4
--- /dev/null
+++ b/plugins/auth-backend-module-gitlab-provider/catalog-info.yaml
@@ -0,0 +1,10 @@
+apiVersion: backstage.io/v1alpha1
+kind: Component
+metadata:
+  name: backstage-plugin-auth-backend-module-gitlab-provider
+  title: '@backstage/plugin-auth-backend-module-gitlab-provider'
+  description: The gitlab-provider backend module for the auth plugin.
+spec:
+  lifecycle: experimental
+  type: backstage-backend-plugin-module
+  owner: maintainers
diff --git a/plugins/auth-backend-module-gitlab-provider/config.d.ts b/plugins/auth-backend-module-gitlab-provider/config.d.ts
new file mode 100644
index 0000000000..d7f04d872a
--- /dev/null
+++ b/plugins/auth-backend-module-gitlab-provider/config.d.ts
@@ -0,0 +1,34 @@
+/*
+ * 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 interface Config {
+  auth?: {
+    providers?: {
+      /** @visibility frontend */
+      gitlab?: {
+        [authEnv: string]: {
+          clientId: string;
+          /**
+           * @visibility secret
+           */
+          clientSecret: string;
+          audience?: string;
+          callbackUrl?: string;
+        };
+      };
+    };
+  };
+}
diff --git a/plugins/auth-backend-module-gitlab-provider/dev/index.ts b/plugins/auth-backend-module-gitlab-provider/dev/index.ts
new file mode 100644
index 0000000000..d3c18c1d48
--- /dev/null
+++ b/plugins/auth-backend-module-gitlab-provider/dev/index.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.
+ */
+
+import { createBackend } from '@backstage/backend-defaults';
+
+const backend = createBackend();
+
+backend.add(import('@backstage/plugin-auth-backend'));
+backend.add(import('../src'));
+
+backend.start();
diff --git a/plugins/auth-backend-module-gitlab-provider/package.json b/plugins/auth-backend-module-gitlab-provider/package.json
new file mode 100644
index 0000000000..090dfe6dfb
--- /dev/null
+++ b/plugins/auth-backend-module-gitlab-provider/package.json
@@ -0,0 +1,45 @@
+{
+  "name": "@backstage/plugin-auth-backend-module-gitlab-provider",
+  "description": "The gitlab-provider backend module for the auth plugin.",
+  "version": "0.1.0-next.1",
+  "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/backend-common": "workspace:^",
+    "@backstage/backend-plugin-api": "workspace:^",
+    "@backstage/plugin-auth-node": "workspace:^",
+    "express": "^4.18.2",
+    "passport": "^0.6.0",
+    "passport-gitlab2": "^5.0.0"
+  },
+  "devDependencies": {
+    "@backstage/backend-defaults": "workspace:^",
+    "@backstage/backend-test-utils": "workspace:^",
+    "@backstage/cli": "workspace:^",
+    "@backstage/plugin-auth-backend": "workspace:^",
+    "supertest": "^6.3.3"
+  },
+  "configSchema": "config.d.ts",
+  "files": [
+    "dist",
+    "config.d.ts"
+  ]
+}
diff --git a/plugins/auth-backend-module-gitlab-provider/src/authenticator.ts b/plugins/auth-backend-module-gitlab-provider/src/authenticator.ts
new file mode 100644
index 0000000000..9cd5857b0d
--- /dev/null
+++ b/plugins/auth-backend-module-gitlab-provider/src/authenticator.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 { Strategy as GitlabStrategy } from 'passport-gitlab2';
+import {
+  createOAuthAuthenticator,
+  PassportOAuthAuthenticatorHelper,
+  PassportOAuthDoneCallback,
+  PassportProfile,
+} from '@backstage/plugin-auth-node';
+
+/** @public */
+export const gitlabAuthenticator = createOAuthAuthenticator({
+  defaultProfileTransform:
+    PassportOAuthAuthenticatorHelper.defaultProfileTransform,
+  initialize({ callbackUrl, config }) {
+    const clientId = config.getString('clientId');
+    const clientSecret = config.getString('clientSecret');
+    const baseUrl =
+      config.getOptionalString('audience') || 'https://gitlab.com';
+
+    return PassportOAuthAuthenticatorHelper.from(
+      new GitlabStrategy(
+        {
+          clientID: clientId,
+          clientSecret: clientSecret,
+          callbackURL: callbackUrl,
+          baseURL: baseUrl,
+          authorizationURL: `${baseUrl}/oauth/authorize`,
+          tokenURL: `${baseUrl}/oauth/token`,
+          profileURL: `${baseUrl}/api/v4/user`,
+        },
+        (
+          accessToken: string,
+          refreshToken: string,
+          params: any,
+          fullProfile: PassportProfile,
+          done: PassportOAuthDoneCallback,
+        ) => {
+          done(
+            undefined,
+            { fullProfile, params, accessToken },
+            { refreshToken },
+          );
+        },
+      ),
+    );
+  },
+
+  async start(input, helper) {
+    return helper.start(input, {
+      accessType: 'offline',
+      prompt: 'consent',
+    });
+  },
+
+  async authenticate(input, helper) {
+    return helper.authenticate(input);
+  },
+
+  async refresh(input, helper) {
+    return helper.refresh(input);
+  },
+});
diff --git a/plugins/auth-backend-module-gitlab-provider/src/index.ts b/plugins/auth-backend-module-gitlab-provider/src/index.ts
new file mode 100644
index 0000000000..c581b76005
--- /dev/null
+++ b/plugins/auth-backend-module-gitlab-provider/src/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.
+ */
+
+/**
+ * The gitlab-provider backend module for the auth plugin.
+ *
+ * @packageDocumentation
+ */
+
+export { gitlabAuthenticator } from './authenticator';
+export { authModuleGitlabProvider as default } from './module';
+export { gitlabSignInResolvers } from './resolvers';
diff --git a/plugins/auth-backend-module-gitlab-provider/src/module.test.ts b/plugins/auth-backend-module-gitlab-provider/src/module.test.ts
new file mode 100644
index 0000000000..da34d64d03
--- /dev/null
+++ b/plugins/auth-backend-module-gitlab-provider/src/module.test.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.
+ */
+
+import { mockServices, startTestBackend } from '@backstage/backend-test-utils';
+import { authModuleGitlabProvider } from './module';
+import request from 'supertest';
+import { decodeOAuthState } from '@backstage/plugin-auth-node';
+
+describe('authModuleGitlabProvider', () => {
+  it('should start', async () => {
+    const { server } = await startTestBackend({
+      features: [
+        import('@backstage/plugin-auth-backend'),
+        authModuleGitlabProvider,
+        mockServices.rootConfig.factory({
+          data: {
+            app: {
+              baseUrl: 'http://localhost:3000',
+            },
+            auth: {
+              providers: {
+                gitlab: {
+                  development: {
+                    clientId: 'my-client-id',
+                    clientSecret: 'my-client-secret',
+                  },
+                },
+              },
+            },
+          },
+        }),
+      ],
+    });
+
+    const agent = request.agent(server);
+
+    const res = await agent.get('/api/auth/gitlab/start?env=development');
+
+    expect(res.status).toEqual(302);
+
+    const nonceCookie = agent.jar.getCookie('gitlab-nonce', {
+      domain: 'localhost',
+      path: '/api/auth/gitlab/handler',
+      script: false,
+      secure: false,
+    });
+    expect(nonceCookie).toBeDefined();
+
+    const startUrl = new URL(res.get('location'));
+    expect(startUrl.origin).toBe('https://gitlab.com');
+    expect(startUrl.pathname).toBe('/oauth/authorize');
+    expect(Object.fromEntries(startUrl.searchParams)).toEqual({
+      response_type: 'code',
+      scope: 'read_user',
+      client_id: 'my-client-id',
+      redirect_uri: `http://localhost:${server.port()}/api/auth/gitlab/handler/frame`,
+      state: expect.any(String),
+    });
+
+    expect(decodeOAuthState(startUrl.searchParams.get('state')!)).toEqual({
+      env: 'development',
+      nonce: decodeURIComponent(nonceCookie.value),
+    });
+  });
+});
diff --git a/plugins/auth-backend-module-gitlab-provider/src/module.ts b/plugins/auth-backend-module-gitlab-provider/src/module.ts
new file mode 100644
index 0000000000..790d522494
--- /dev/null
+++ b/plugins/auth-backend-module-gitlab-provider/src/module.ts
@@ -0,0 +1,48 @@
+/*
+ * 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 { createBackendModule } from '@backstage/backend-plugin-api';
+import {
+  authProvidersExtensionPoint,
+  commonSignInResolvers,
+  createOAuthProviderFactory,
+} from '@backstage/plugin-auth-node';
+import { gitlabAuthenticator } from './authenticator';
+import { gitlabSignInResolvers } from './resolvers';
+
+/** @public */
+export const authModuleGitlabProvider = createBackendModule({
+  pluginId: 'auth',
+  moduleId: 'gitlab-provider',
+  register(reg) {
+    reg.registerInit({
+      deps: {
+        providers: authProvidersExtensionPoint,
+      },
+      async init({ providers }) {
+        providers.registerProvider({
+          providerId: 'gitlab',
+          factory: createOAuthProviderFactory({
+            authenticator: gitlabAuthenticator,
+            signInResolverFactories: {
+              ...gitlabSignInResolvers,
+              ...commonSignInResolvers,
+            },
+          }),
+        });
+      },
+    });
+  },
+});
diff --git a/plugins/auth-backend-module-gitlab-provider/src/resolvers.ts b/plugins/auth-backend-module-gitlab-provider/src/resolvers.ts
new file mode 100644
index 0000000000..755ed08aa0
--- /dev/null
+++ b/plugins/auth-backend-module-gitlab-provider/src/resolvers.ts
@@ -0,0 +1,50 @@
+/*
+ * Copyright 2023 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import {
+  createSignInResolverFactory,
+  OAuthAuthenticatorResult,
+  PassportProfile,
+  SignInInfo,
+} from '@backstage/plugin-auth-node';
+
+/**
+ * Available sign-in resolvers for the GitLab auth provider.
+ *
+ * @public
+ */
+export namespace gitlabSignInResolvers {
+  /**
+   * Looks up the user by matching their GitLab username to the entity name.
+   */
+  export const usernameMatchingUserEntityName = createSignInResolverFactory({
+    create() {
+      return async (
+        info: SignInInfo<OAuthAuthenticatorResult<PassportProfile>>,
+        ctx,
+      ) => {
+        const { result } = info;
+
+        const id = result.fullProfile.username;
+        if (!id) {
+          throw new Error(`GitLab user profile does not contain a username`);
+        }
+
+        return ctx.signInWithCatalogUser({ entityRef: { name: id } });
+      };
+    },
+  });
+}
diff --git a/plugins/auth-backend/src/providers/gitlab/types.d.ts b/plugins/auth-backend-module-gitlab-provider/src/types.d.ts
similarity index 100%
rename from plugins/auth-backend/src/providers/gitlab/types.d.ts
rename to plugins/auth-backend-module-gitlab-provider/src/types.d.ts
diff --git a/plugins/auth-backend-module-google-provider/.eslintrc.js b/plugins/auth-backend-module-google-provider/.eslintrc.js
new file mode 100644
index 0000000000..e2a53a6ad2
--- /dev/null
+++ b/plugins/auth-backend-module-google-provider/.eslintrc.js
@@ -0,0 +1 @@
+module.exports = require('@backstage/cli/config/eslint-factory')(__dirname);
diff --git a/plugins/auth-backend-module-google-provider/CHANGELOG.md b/plugins/auth-backend-module-google-provider/CHANGELOG.md
new file mode 100644
index 0000000000..e74380aa3a
--- /dev/null
+++ b/plugins/auth-backend-module-google-provider/CHANGELOG.md
@@ -0,0 +1,29 @@
+# @backstage/plugin-auth-backend-module-google-provider
+
+## 0.1.0-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-auth-node@0.3.0-next.2
+  - @backstage/backend-plugin-api@0.6.3-next.2
+
+## 0.1.0-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@0.6.3-next.1
+  - @backstage/plugin-auth-node@0.3.0-next.1
+
+## 0.1.0-next.0
+
+### Minor Changes
+
+- 8513cd7d00e3: New module for `@backstage/plugin-auth-backend` that adds a Google auth provider.
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-auth-node@0.3.0-next.0
+  - @backstage/backend-plugin-api@0.6.2-next.0
diff --git a/plugins/auth-backend-module-google-provider/README.md b/plugins/auth-backend-module-google-provider/README.md
new file mode 100644
index 0000000000..633dd13717
--- /dev/null
+++ b/plugins/auth-backend-module-google-provider/README.md
@@ -0,0 +1,8 @@
+# Auth Module: Google Provider
+
+This module provides a Google auth provider implementation for `@backstage/plugin-auth-backend`.
+
+## Links
+
+- [Backstage](https://backstage.io)
+- [Repository](https://github.com/backstage/backstage/tree/master/plugins/auth-backend-module-google-provider)
diff --git a/plugins/auth-backend-module-google-provider/api-report.md b/plugins/auth-backend-module-google-provider/api-report.md
new file mode 100644
index 0000000000..7fab5d33a9
--- /dev/null
+++ b/plugins/auth-backend-module-google-provider/api-report.md
@@ -0,0 +1,32 @@
+## API Report File for "@backstage/plugin-auth-backend-module-google-provider"
+
+> Do not edit this file. It is a report generated by [API Extractor](https://api-extractor.com/).
+
+```ts
+import { BackendFeature } from '@backstage/backend-plugin-api';
+import { OAuthAuthenticator } from '@backstage/plugin-auth-node';
+import { OAuthAuthenticatorResult } from '@backstage/plugin-auth-node';
+import { PassportOAuthAuthenticatorHelper } from '@backstage/plugin-auth-node';
+import { PassportProfile } from '@backstage/plugin-auth-node';
+import { SignInResolverFactory } from '@backstage/plugin-auth-node';
+
+// @public (undocumented)
+const authModuleGoogleProvider: () => BackendFeature;
+export default authModuleGoogleProvider;
+
+// @public (undocumented)
+export const googleAuthenticator: OAuthAuthenticator<
+  PassportOAuthAuthenticatorHelper,
+  PassportProfile
+>;
+
+// @public
+export namespace googleSignInResolvers {
+  const emailMatchingUserEntityAnnotation: SignInResolverFactory<
+    OAuthAuthenticatorResult<PassportProfile>,
+    unknown
+  >;
+}
+
+// (No @packageDocumentation comment for this package)
+```
diff --git a/plugins/auth-backend-module-google-provider/catalog-info.yaml b/plugins/auth-backend-module-google-provider/catalog-info.yaml
new file mode 100644
index 0000000000..0897a12168
--- /dev/null
+++ b/plugins/auth-backend-module-google-provider/catalog-info.yaml
@@ -0,0 +1,10 @@
+apiVersion: backstage.io/v1alpha1
+kind: Component
+metadata:
+  name: backstage-plugin-auth-backend-module-google-provider
+  title: '@backstage/plugin-auth-backend-module-google-provider'
+  description: A Google auth provider module for the Backstage auth backend
+spec:
+  lifecycle: experimental
+  type: backstage-backend-plugin-module
+  owner: maintainers
diff --git a/plugins/auth-backend-module-google-provider/config.d.ts b/plugins/auth-backend-module-google-provider/config.d.ts
new file mode 100644
index 0000000000..6a1716c5bf
--- /dev/null
+++ b/plugins/auth-backend-module-google-provider/config.d.ts
@@ -0,0 +1,33 @@
+/*
+ * 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 interface Config {
+  /** Configuration options for the auth plugin */
+  auth?: {
+    providers?: {
+      google?: {
+        [authEnv: string]: {
+          clientId: string;
+          /**
+           * @visibility secret
+           */
+          clientSecret: string;
+          callbackUrl?: string;
+        };
+      };
+    };
+  };
+}
diff --git a/plugins/auth-backend-module-google-provider/package.json b/plugins/auth-backend-module-google-provider/package.json
new file mode 100644
index 0000000000..9c8f6201e2
--- /dev/null
+++ b/plugins/auth-backend-module-google-provider/package.json
@@ -0,0 +1,53 @@
+{
+  "name": "@backstage/plugin-auth-backend-module-google-provider",
+  "description": "A Google auth provider module for the Backstage auth backend",
+  "version": "0.1.0-next.2",
+  "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"
+  },
+  "homepage": "https://backstage.io",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/backstage/backstage",
+    "directory": "plugins/auth-backend-module-google-provider"
+  },
+  "keywords": [
+    "backstage"
+  ],
+  "scripts": {
+    "start": "backstage-cli package start",
+    "build": "backstage-cli package 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"
+  },
+  "dependencies": {
+    "@backstage/backend-plugin-api": "workspace:^",
+    "@backstage/plugin-auth-node": "workspace:^",
+    "google-auth-library": "^8.0.0",
+    "passport-google-oauth20": "^2.0.0"
+  },
+  "devDependencies": {
+    "@backstage/backend-test-utils": "workspace:^",
+    "@backstage/cli": "workspace:^",
+    "@backstage/plugin-auth-backend": "workspace:^",
+    "@types/passport-google-oauth20": "^2.0.3",
+    "msw": "^1.0.0",
+    "supertest": "^6.1.3"
+  },
+  "files": [
+    "dist",
+    "config.d.ts"
+  ],
+  "configSchema": "config.d.ts"
+}
diff --git a/plugins/auth-backend-module-google-provider/src/authenticator.ts b/plugins/auth-backend-module-google-provider/src/authenticator.ts
new file mode 100644
index 0000000000..a428519fee
--- /dev/null
+++ b/plugins/auth-backend-module-google-provider/src/authenticator.ts
@@ -0,0 +1,86 @@
+/*
+ * 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 {
+  PassportOAuthAuthenticatorHelper,
+  PassportOAuthDoneCallback,
+  PassportProfile,
+  createOAuthAuthenticator,
+} from '@backstage/plugin-auth-node';
+import { OAuth2Client } from 'google-auth-library';
+import { Strategy as GoogleStrategy } from 'passport-google-oauth20';
+
+/** @public */
+export const googleAuthenticator = createOAuthAuthenticator({
+  defaultProfileTransform:
+    PassportOAuthAuthenticatorHelper.defaultProfileTransform,
+  initialize({ callbackUrl, config }) {
+    const clientId = config.getString('clientId');
+    const clientSecret = config.getString('clientSecret');
+
+    return PassportOAuthAuthenticatorHelper.from(
+      new GoogleStrategy(
+        {
+          clientID: clientId,
+          clientSecret: clientSecret,
+          callbackURL: callbackUrl,
+          passReqToCallback: false,
+        },
+        (
+          accessToken: string,
+          refreshToken: string,
+          params: any,
+          fullProfile: PassportProfile,
+          done: PassportOAuthDoneCallback,
+        ) => {
+          done(
+            undefined,
+            {
+              fullProfile,
+              params,
+              accessToken,
+            },
+            {
+              refreshToken,
+            },
+          );
+        },
+      ),
+    );
+  },
+
+  async start(input, helper) {
+    return helper.start(input, {
+      accessType: 'offline',
+      prompt: 'consent',
+    });
+  },
+
+  async authenticate(input, helper) {
+    return helper.authenticate(input);
+  },
+
+  async refresh(input, helper) {
+    return helper.refresh(input);
+  },
+
+  async logout(input) {
+    if (input.refreshToken) {
+      const oauthClient = new OAuth2Client();
+      await oauthClient.revokeToken(input.refreshToken);
+    }
+  },
+});
diff --git a/plugins/auth-backend-module-google-provider/src/index.ts b/plugins/auth-backend-module-google-provider/src/index.ts
new file mode 100644
index 0000000000..96d3db9821
--- /dev/null
+++ b/plugins/auth-backend-module-google-provider/src/index.ts
@@ -0,0 +1,19 @@
+/*
+ * 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 { googleAuthenticator } from './authenticator';
+export { authModuleGoogleProvider as default } from './module';
+export { googleSignInResolvers } from './resolvers';
diff --git a/plugins/auth-backend-module-google-provider/src/module.test.ts b/plugins/auth-backend-module-google-provider/src/module.test.ts
new file mode 100644
index 0000000000..59066acd4c
--- /dev/null
+++ b/plugins/auth-backend-module-google-provider/src/module.test.ts
@@ -0,0 +1,79 @@
+/*
+ * 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 { mockServices, startTestBackend } from '@backstage/backend-test-utils';
+import { authModuleGoogleProvider } from './module';
+import request from 'supertest';
+import { decodeOAuthState } from '@backstage/plugin-auth-node';
+
+describe('authModuleGoogleProvider', () => {
+  it('should start', async () => {
+    const { server } = await startTestBackend({
+      features: [
+        import('@backstage/plugin-auth-backend'),
+        authModuleGoogleProvider,
+        mockServices.rootConfig.factory({
+          data: {
+            app: {
+              baseUrl: 'http://localhost:3000',
+            },
+            auth: {
+              providers: {
+                google: {
+                  development: {
+                    clientId: 'my-client-id',
+                    clientSecret: 'my-client-secret',
+                  },
+                },
+              },
+            },
+          },
+        }),
+      ],
+    });
+
+    const agent = request.agent(server);
+
+    const res = await agent.get('/api/auth/google/start?env=development');
+
+    expect(res.status).toBe(302);
+
+    const nonceCookie = agent.jar.getCookie('google-nonce', {
+      domain: 'localhost',
+      path: '/api/auth/google/handler',
+      script: false,
+      secure: false,
+    });
+    expect(nonceCookie).toBeDefined();
+
+    const startUrl = new URL(res.get('location'));
+    expect(startUrl.origin).toBe('https://accounts.google.com');
+    expect(startUrl.pathname).toBe('/o/oauth2/v2/auth');
+    expect(Object.fromEntries(startUrl.searchParams)).toEqual({
+      access_type: 'offline',
+      prompt: 'consent',
+      response_type: 'code',
+      client_id: 'my-client-id',
+      redirect_uri: `http://localhost:${server.port()}/api/auth/google/handler/frame`,
+      state: expect.any(String),
+    });
+
+    expect(decodeOAuthState(startUrl.searchParams.get('state')!)).toEqual({
+      env: 'development',
+      nonce: decodeURIComponent(nonceCookie.value),
+    });
+  });
+});
diff --git a/plugins/auth-backend-module-google-provider/src/module.ts b/plugins/auth-backend-module-google-provider/src/module.ts
new file mode 100644
index 0000000000..0354f99880
--- /dev/null
+++ b/plugins/auth-backend-module-google-provider/src/module.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 { createBackendModule } from '@backstage/backend-plugin-api';
+import {
+  authProvidersExtensionPoint,
+  commonSignInResolvers,
+  createOAuthProviderFactory,
+} from '@backstage/plugin-auth-node';
+import { googleAuthenticator } from './authenticator';
+import { googleSignInResolvers } from './resolvers';
+
+/** @public */
+export const authModuleGoogleProvider = createBackendModule({
+  pluginId: 'auth',
+  moduleId: 'googleProvider',
+  register(reg) {
+    reg.registerInit({
+      deps: {
+        providers: authProvidersExtensionPoint,
+      },
+      async init({ providers }) {
+        providers.registerProvider({
+          providerId: 'google',
+          factory: createOAuthProviderFactory({
+            authenticator: googleAuthenticator,
+            signInResolverFactories: {
+              ...googleSignInResolvers,
+              ...commonSignInResolvers,
+            },
+          }),
+        });
+      },
+    });
+  },
+});
diff --git a/plugins/auth-backend-module-google-provider/src/resolvers.ts b/plugins/auth-backend-module-google-provider/src/resolvers.ts
new file mode 100644
index 0000000000..b19fc4d49f
--- /dev/null
+++ b/plugins/auth-backend-module-google-provider/src/resolvers.ts
@@ -0,0 +1,53 @@
+/*
+ * 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 {
+  createSignInResolverFactory,
+  OAuthAuthenticatorResult,
+  PassportProfile,
+  SignInInfo,
+} from '@backstage/plugin-auth-node';
+
+/**
+ * Available sign-in resolvers for the Google auth provider.
+ *
+ * @public
+ */
+export namespace googleSignInResolvers {
+  /**
+   * Looks up the user by matching their email to the `google.com/email` annotation.
+   */
+  export const emailMatchingUserEntityAnnotation = createSignInResolverFactory({
+    create() {
+      return async (
+        info: SignInInfo<OAuthAuthenticatorResult<PassportProfile>>,
+        ctx,
+      ) => {
+        const { profile } = info;
+
+        if (!profile.email) {
+          throw new Error('Google profile contained no email');
+        }
+
+        return ctx.signInWithCatalogUser({
+          annotations: {
+            'google.com/email': profile.email,
+          },
+        });
+      };
+    },
+  });
+}
diff --git a/plugins/auth-backend/CHANGELOG.md b/plugins/auth-backend/CHANGELOG.md
index 478570bb31..f3b0c5b87c 100644
--- a/plugins/auth-backend/CHANGELOG.md
+++ b/plugins/auth-backend/CHANGELOG.md
@@ -1,5 +1,92 @@
 # @backstage/plugin-auth-backend
 
+## 0.18.9-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config@1.1.0-next.1
+  - @backstage/backend-common@0.19.5-next.2
+  - @backstage/plugin-auth-backend-module-gcp-iap-provider@0.1.0-next.2
+  - @backstage/plugin-auth-backend-module-github-provider@0.1.0-next.2
+  - @backstage/plugin-auth-backend-module-gitlab-provider@0.1.0-next.1
+  - @backstage/plugin-auth-backend-module-google-provider@0.1.0-next.2
+  - @backstage/plugin-auth-node@0.3.0-next.2
+  - @backstage/plugin-catalog-node@1.4.4-next.2
+  - @backstage/backend-plugin-api@0.6.3-next.2
+  - @backstage/catalog-model@1.4.2-next.1
+  - @backstage/catalog-client@1.4.4-next.1
+  - @backstage/errors@1.2.1
+  - @backstage/types@1.1.0
+
+## 0.18.9-next.1
+
+### Patch Changes
+
+- 080cc7794700: Migrated the GitLab auth provider to be implemented using the new `@backstage/plugin-auth-backend-module-gitlab-provider` module.
+- Updated dependencies
+  - @backstage/config@1.1.0-next.0
+  - @backstage/plugin-auth-backend-module-gitlab-provider@0.1.0-next.0
+  - @backstage/plugin-auth-backend-module-github-provider@0.1.0-next.1
+  - @backstage/plugin-auth-backend-module-google-provider@0.1.0-next.1
+  - @backstage/backend-common@0.19.5-next.1
+  - @backstage/backend-plugin-api@0.6.3-next.1
+  - @backstage/catalog-model@1.4.2-next.0
+  - @backstage/plugin-auth-node@0.3.0-next.1
+  - @backstage/plugin-catalog-node@1.4.4-next.1
+  - @backstage/plugin-auth-backend-module-gcp-iap-provider@0.1.0-next.1
+  - @backstage/catalog-client@1.4.4-next.0
+  - @backstage/errors@1.2.1
+  - @backstage/types@1.1.0
+
+## 0.18.8-next.0
+
+### Patch Changes
+
+- 7944d43f4790: Added `authPlugin` export for the new backend system. The plugin does not include any built-in auth providers, they must instead be added by installing additional modules, for example `authModuleGoogleProvider` from `@backstage/plugin-auth-backend-module-google-provider`.
+- 8513cd7d00e3: Deprecated several exports that are now available from `@backstage/plugin-auth-node` instead.
+- 7944d43f4790: Added the ability to disable the built-in auth providers by passing `disableDefaultProviderFactories` to `createRouter`.
+- 7944d43f4790: The algorithm used when generating Backstage tokens can be configured via `auth.identityTokenAlgorithm`.
+- Updated dependencies
+  - @backstage/plugin-auth-backend-module-gcp-iap-provider@0.1.0-next.0
+  - @backstage/plugin-auth-node@0.3.0-next.0
+  - @backstage/backend-common@0.19.4-next.0
+  - @backstage/plugin-auth-backend-module-google-provider@0.1.0-next.0
+  - @backstage/plugin-auth-backend-module-github-provider@0.1.0-next.0
+  - @backstage/backend-plugin-api@0.6.2-next.0
+  - @backstage/catalog-client@1.4.3
+  - @backstage/catalog-model@1.4.1
+  - @backstage/config@1.0.8
+  - @backstage/errors@1.2.1
+  - @backstage/types@1.1.0
+  - @backstage/plugin-catalog-node@1.4.3-next.0
+
+## 0.18.6
+
+### Patch Changes
+
+- 16452cd007ae: Updated `frameHandler` to return `undefined` when using the redirect flow instead of returning `postMessageReponse` which was causing errors
+- 9dad4b0e61bd: Updated config schema to match what was being used in code
+- bb70a9c3886a: Add frontend visibility to provider objects in `auth` config.
+- Updated dependencies
+  - @backstage/backend-common@0.19.2
+  - @backstage/plugin-auth-node@0.2.17
+  - @backstage/catalog-client@1.4.3
+  - @backstage/catalog-model@1.4.1
+  - @backstage/config@1.0.8
+  - @backstage/errors@1.2.1
+  - @backstage/types@1.1.0
+
+## 0.18.6-next.2
+
+### Patch Changes
+
+- 16452cd007ae: Updated `frameHandler` to return `undefined` when using the redirect flow instead of returning `postMessageReponse` which was causing errors
+- bb70a9c3886a: Add frontend visibility to provider objects in `auth` config.
+- Updated dependencies
+  - @backstage/backend-common@0.19.2-next.2
+  - @backstage/plugin-auth-node@0.2.17-next.2
+
 ## 0.18.6-next.1
 
 ### Patch Changes
diff --git a/plugins/auth-backend/api-report.md b/plugins/auth-backend/api-report.md
index 80db2e0b71..6372c2ee60 100644
--- a/plugins/auth-backend/api-report.md
+++ b/plugins/auth-backend/api-report.md
@@ -5,98 +5,74 @@
 ```ts
 /// <reference types="node" />
 
-import { BackstageIdentityResponse } from '@backstage/plugin-auth-node';
+import { AuthProviderConfig as AuthProviderConfig_2 } from '@backstage/plugin-auth-node';
+import { AuthProviderFactory as AuthProviderFactory_2 } from '@backstage/plugin-auth-node';
+import { AuthProviderRouteHandlers as AuthProviderRouteHandlers_2 } from '@backstage/plugin-auth-node';
+import { AuthResolverCatalogUserQuery as AuthResolverCatalogUserQuery_2 } from '@backstage/plugin-auth-node';
+import { AuthResolverContext as AuthResolverContext_2 } from '@backstage/plugin-auth-node';
+import { BackendFeature } from '@backstage/backend-plugin-api';
 import { BackstageSignInResult } from '@backstage/plugin-auth-node';
 import { CacheService } from '@backstage/backend-plugin-api';
 import { CatalogApi } from '@backstage/catalog-client';
+import { ClientAuthResponse } from '@backstage/plugin-auth-node';
 import { Config } from '@backstage/config';
+import { CookieConfigurer as CookieConfigurer_2 } from '@backstage/plugin-auth-node';
+import { decodeOAuthState } from '@backstage/plugin-auth-node';
+import { encodeOAuthState } from '@backstage/plugin-auth-node';
 import { Entity } from '@backstage/catalog-model';
 import express from 'express';
-import { GetEntitiesRequest } from '@backstage/catalog-client';
+import { GcpIapResult as GcpIapResult_2 } from '@backstage/plugin-auth-backend-module-gcp-iap-provider';
+import { GcpIapTokenInfo as GcpIapTokenInfo_2 } from '@backstage/plugin-auth-backend-module-gcp-iap-provider';
 import { IncomingHttpHeaders } from 'http';
-import { JsonValue } from '@backstage/types';
-import { Logger } from 'winston';
+import { LoggerService } from '@backstage/backend-plugin-api';
+import { OAuthEnvironmentHandler as OAuthEnvironmentHandler_2 } from '@backstage/plugin-auth-node';
+import { OAuthState as OAuthState_2 } from '@backstage/plugin-auth-node';
 import { PluginDatabaseManager } from '@backstage/backend-common';
 import { PluginEndpointDiscovery } from '@backstage/backend-common';
+import { prepareBackstageIdentityResponse as prepareBackstageIdentityResponse_2 } from '@backstage/plugin-auth-node';
 import { Profile } from 'passport';
+import { ProfileInfo as ProfileInfo_2 } from '@backstage/plugin-auth-node';
+import { SignInInfo as SignInInfo_2 } from '@backstage/plugin-auth-node';
+import { SignInResolver as SignInResolver_2 } from '@backstage/plugin-auth-node';
 import { TokenManager } from '@backstage/backend-common';
+import { TokenParams as TokenParams_2 } from '@backstage/plugin-auth-node';
 import { TokenSet } from 'openid-client';
 import { UserEntity } from '@backstage/catalog-model';
 import { UserinfoResponse } from 'openid-client';
+import { WebMessageResponse as WebMessageResponse_2 } from '@backstage/plugin-auth-node';
 
-// @public
+// @public @deprecated
 export type AuthHandler<TAuthResult> = (
   input: TAuthResult,
   context: AuthResolverContext,
 ) => Promise<AuthHandlerResult>;
 
-// @public
+// @public @deprecated
 export type AuthHandlerResult = {
   profile: ProfileInfo;
 };
 
-// @public (undocumented)
-export type AuthProviderConfig = {
-  baseUrl: string;
-  appUrl: string;
-  isOriginAllowed: (origin: string) => boolean;
-  cookieConfigurer?: CookieConfigurer;
-};
-
-// @public (undocumented)
-export type AuthProviderFactory = (options: {
-  providerId: string;
-  globalConfig: AuthProviderConfig;
-  config: Config;
-  logger: Logger;
-  resolverContext: AuthResolverContext;
-}) => AuthProviderRouteHandlers;
-
 // @public
-export interface AuthProviderRouteHandlers {
-  frameHandler(req: express.Request, res: express.Response): Promise<void>;
-  logout?(req: express.Request, res: express.Response): Promise<void>;
-  refresh?(req: express.Request, res: express.Response): Promise<void>;
-  start(req: express.Request, res: express.Response): Promise<void>;
-}
+const authPlugin: () => BackendFeature;
+export default authPlugin;
 
-// @public
-export type AuthResolverCatalogUserQuery =
-  | {
-      entityRef:
-        | string
-        | {
-            kind?: string;
-            namespace?: string;
-            name: string;
-          };
-    }
-  | {
-      annotations: Record<string, string>;
-    }
-  | {
-      filter: Exclude<GetEntitiesRequest['filter'], undefined>;
-    };
+// @public @deprecated (undocumented)
+export type AuthProviderConfig = AuthProviderConfig_2;
 
-// @public
-export type AuthResolverContext = {
-  issueToken(params: TokenParams): Promise<{
-    token: string;
-  }>;
-  findCatalogUser(query: AuthResolverCatalogUserQuery): Promise<{
-    entity: Entity;
-  }>;
-  signInWithCatalogUser(
-    query: AuthResolverCatalogUserQuery,
-  ): Promise<BackstageSignInResult>;
-};
+// @public @deprecated (undocumented)
+export type AuthProviderFactory = AuthProviderFactory_2;
 
-// @public (undocumented)
-export type AuthResponse<ProviderInfo> = {
-  providerInfo: ProviderInfo;
-  profile: ProfileInfo;
-  backstageIdentity?: BackstageIdentityResponse;
-};
+// @public @deprecated (undocumented)
+export type AuthProviderRouteHandlers = AuthProviderRouteHandlers_2;
+
+// @public @deprecated (undocumented)
+export type AuthResolverCatalogUserQuery = AuthResolverCatalogUserQuery_2;
+
+// @public @deprecated (undocumented)
+export type AuthResolverContext = AuthResolverContext_2;
+
+// @public @deprecated (undocumented)
+export type AuthResponse<TProviderInfo> = ClientAuthResponse<TProviderInfo>;
 
 // @public (undocumented)
 export type AwsAlbResult = {
@@ -151,7 +127,7 @@ export class CatalogIdentityClient {
   findUser(query: { annotations: Record<string, string> }): Promise<UserEntity>;
   resolveCatalogMembership(query: {
     entityRefs: string[];
-    logger?: Logger;
+    logger?: LoggerService;
   }): Promise<string[]>;
 }
 
@@ -191,18 +167,8 @@ export type CloudflareAccessResult = {
   token: string;
 };
 
-// @public
-export type CookieConfigurer = (ctx: {
-  providerId: string;
-  baseUrl: string;
-  callbackUrl: string;
-  appOrigin: string;
-}) => {
-  domain: string;
-  path: string;
-  secure: boolean;
-  sameSite?: 'none' | 'lax' | 'strict';
-};
+// @public @deprecated (undocumented)
+export type CookieConfigurer = CookieConfigurer_2;
 
 // @public
 export function createAuthProviderIntegration<
@@ -235,23 +201,17 @@ export type EasyAuthResult = {
   accessToken?: string;
 };
 
-// @public (undocumented)
-export const encodeState: (state: OAuthState) => string;
+// @public @deprecated (undocumented)
+export const encodeState: typeof encodeOAuthState;
 
-// @public (undocumented)
+// @public @deprecated (undocumented)
 export const ensuresXRequestedWith: (req: express.Request) => boolean;
 
-// @public
-export type GcpIapResult = {
-  iapToken: GcpIapTokenInfo;
-};
+// @public @deprecated
+export type GcpIapResult = GcpIapResult_2;
 
-// @public
-export type GcpIapTokenInfo = {
-  sub: string;
-  email: string;
-  [key: string]: JsonValue;
-};
+// @public @deprecated
+export type GcpIapTokenInfo = GcpIapTokenInfo_2;
 
 // @public
 export function getDefaultOwnershipEntityRefs(entity: Entity): string[];
@@ -276,7 +236,7 @@ export type OAuth2ProxyResult<JWTPayload = {}> = {
   getHeader(name: string): string | undefined;
 };
 
-// @public (undocumented)
+// @public @deprecated (undocumented)
 export class OAuthAdapter implements AuthProviderRouteHandlers {
   constructor(handlers: OAuthHandlers, options: OAuthAdapterOptions);
   // (undocumented)
@@ -298,7 +258,7 @@ export class OAuthAdapter implements AuthProviderRouteHandlers {
   start(req: express.Request, res: express.Response): Promise<void>;
 }
 
-// @public (undocumented)
+// @public @deprecated (undocumented)
 export type OAuthAdapterOptions = {
   providerId: string;
   persistScopes?: boolean;
@@ -309,25 +269,10 @@ export type OAuthAdapterOptions = {
   callbackUrl: string;
 };
 
-// @public (undocumented)
-export class OAuthEnvironmentHandler implements AuthProviderRouteHandlers {
-  constructor(handlers: Map<string, AuthProviderRouteHandlers>);
-  // (undocumented)
-  frameHandler(req: express.Request, res: express.Response): Promise<void>;
-  // (undocumented)
-  logout(req: express.Request, res: express.Response): Promise<void>;
-  // (undocumented)
-  static mapConfig(
-    config: Config,
-    factoryFunc: (envConfig: Config) => AuthProviderRouteHandlers,
-  ): OAuthEnvironmentHandler;
-  // (undocumented)
-  refresh(req: express.Request, res: express.Response): Promise<void>;
-  // (undocumented)
-  start(req: express.Request, res: express.Response): Promise<void>;
-}
+// @public @deprecated (undocumented)
+export const OAuthEnvironmentHandler: typeof OAuthEnvironmentHandler_2;
 
-// @public
+// @public @deprecated (undocumented)
 export interface OAuthHandlers {
   handler(req: express.Request): Promise<{
     response: OAuthResponse;
@@ -341,12 +286,12 @@ export interface OAuthHandlers {
   start(req: OAuthStartRequest): Promise<OAuthStartResponse>;
 }
 
-// @public (undocumented)
+// @public @deprecated (undocumented)
 export type OAuthLogoutRequest = express.Request<{}> & {
   refreshToken: string;
 };
 
-// @public (undocumented)
+// @public @deprecated (undocumented)
 export type OAuthProviderInfo = {
   accessToken: string;
   idToken?: string;
@@ -354,59 +299,53 @@ export type OAuthProviderInfo = {
   scope: string;
 };
 
-// @public
+// @public @deprecated
 export type OAuthProviderOptions = {
   clientId: string;
   clientSecret: string;
   callbackUrl: string;
 };
 
-// @public (undocumented)
+// @public @deprecated (undocumented)
 export type OAuthRefreshRequest = express.Request<{}> & {
   scope: string;
   refreshToken: string;
 };
 
-// @public
+// @public @deprecated (undocumented)
 export type OAuthResponse = {
   profile: ProfileInfo;
   providerInfo: OAuthProviderInfo;
   backstageIdentity?: BackstageSignInResult;
 };
 
-// @public (undocumented)
+// @public @deprecated (undocumented)
 export type OAuthResult = {
   fullProfile: Profile;
   params: {
     id_token?: string;
     scope: string;
+    token_type?: string;
     expires_in: number;
   };
   accessToken: string;
   refreshToken?: string;
 };
 
-// @public (undocumented)
+// @public @deprecated (undocumented)
 export type OAuthStartRequest = express.Request<{}> & {
   scope: string;
   state: OAuthState;
 };
 
-// @public (undocumented)
+// @public @deprecated (undocumented)
 export type OAuthStartResponse = {
   url: string;
   status?: number;
 };
 
-// @public (undocumented)
-export type OAuthState = {
-  nonce: string;
-  env: string;
-  origin?: string;
-  scope?: string;
-  redirectUrl?: string;
-  flow?: string;
-};
+// @public @deprecated (undocumented)
+export type OAuthState = OAuthState_2;
 
 // @public
 export type OidcAuthResult = {
@@ -414,24 +353,18 @@ export type OidcAuthResult = {
   userinfo: UserinfoResponse;
 };
 
-// @public (undocumented)
+// @public @deprecated (undocumented)
 export const postMessageResponse: (
   res: express.Response,
   appOrigin: string,
   response: WebMessageResponse,
 ) => void;
 
-// @public
-export function prepareBackstageIdentityResponse(
-  result: BackstageSignInResult,
-): BackstageIdentityResponse;
+// @public @deprecated (undocumented)
+export const prepareBackstageIdentityResponse: typeof prepareBackstageIdentityResponse_2;
 
-// @public
-export type ProfileInfo = {
-  email?: string;
-  displayName?: string;
-  picture?: string;
-};
+// @public @deprecated (undocumented)
+export type ProfileInfo = ProfileInfo_2;
 
 // @public (undocumented)
 export type ProviderFactories = {
@@ -452,7 +385,7 @@ export const providers: Readonly<{
               | undefined;
           }
         | undefined,
-    ) => AuthProviderFactory;
+    ) => AuthProviderFactory_2;
     resolvers: never;
   }>;
   auth0: Readonly<{
@@ -467,7 +400,7 @@ export const providers: Readonly<{
               | undefined;
           }
         | undefined,
-    ) => AuthProviderFactory;
+    ) => AuthProviderFactory_2;
     resolvers: never;
   }>;
   awsAlb: Readonly<{
@@ -480,7 +413,7 @@ export const providers: Readonly<{
             };
           }
         | undefined,
-    ) => AuthProviderFactory;
+    ) => AuthProviderFactory_2;
     resolvers: never;
   }>;
   bitbucket: Readonly<{
@@ -495,7 +428,7 @@ export const providers: Readonly<{
               | undefined;
           }
         | undefined,
-    ) => AuthProviderFactory;
+    ) => AuthProviderFactory_2;
     resolvers: Readonly<{
       usernameMatchingUserEntityAnnotation(): SignInResolver<OAuthResult>;
       userIdMatchingUserEntityAnnotation(): SignInResolver<OAuthResult>;
@@ -513,7 +446,7 @@ export const providers: Readonly<{
               | undefined;
           }
         | undefined,
-    ) => AuthProviderFactory;
+    ) => AuthProviderFactory_2;
     resolvers: Readonly<{
       emailMatchingUserEntityProfileEmail: () => SignInResolver<BitbucketServerOAuthResult>;
     }>;
@@ -525,18 +458,18 @@ export const providers: Readonly<{
         resolver: SignInResolver<CloudflareAccessResult>;
       };
       cache?: CacheService | undefined;
-    }) => AuthProviderFactory;
+    }) => AuthProviderFactory_2;
     resolvers: Readonly<{
       emailMatchingUserEntityProfileEmail: () => SignInResolver<unknown>;
     }>;
   }>;
   gcpIap: Readonly<{
     create: (options: {
-      authHandler?: AuthHandler<GcpIapResult> | undefined;
+      authHandler?: AuthHandler<GcpIapResult_2> | undefined;
       signIn: {
-        resolver: SignInResolver<GcpIapResult>;
+        resolver: SignInResolver<GcpIapResult_2>;
       };
-    }) => AuthProviderFactory;
+    }) => AuthProviderFactory_2;
     resolvers: never;
   }>;
   github: Readonly<{
@@ -546,15 +479,15 @@ export const providers: Readonly<{
             authHandler?: AuthHandler<GithubOAuthResult> | undefined;
             signIn?:
               | {
-                  resolver: SignInResolver<GithubOAuthResult>;
+                  resolver: SignInResolver_2<GithubOAuthResult>;
                 }
               | undefined;
             stateEncoder?: StateEncoder | undefined;
           }
         | undefined,
-    ) => AuthProviderFactory;
+    ) => AuthProviderFactory_2;
     resolvers: Readonly<{
-      usernameMatchingUserEntityName: () => SignInResolver<GithubOAuthResult>;
+      usernameMatchingUserEntityName: () => SignInResolver_2<GithubOAuthResult>;
     }>;
   }>;
   gitlab: Readonly<{
@@ -569,7 +502,7 @@ export const providers: Readonly<{
               | undefined;
           }
         | undefined,
-    ) => AuthProviderFactory;
+    ) => AuthProviderFactory_2;
     resolvers: never;
   }>;
   google: Readonly<{
@@ -584,11 +517,11 @@ export const providers: Readonly<{
               | undefined;
           }
         | undefined,
-    ) => AuthProviderFactory;
+    ) => AuthProviderFactory_2;
     resolvers: Readonly<{
-      emailLocalPartMatchingUserEntityName: () => SignInResolver<unknown>;
-      emailMatchingUserEntityProfileEmail: () => SignInResolver<unknown>;
-      emailMatchingUserEntityAnnotation(): SignInResolver<OAuthResult>;
+      emailMatchingUserEntityProfileEmail: () => SignInResolver_2<OAuthResult>;
+      emailLocalPartMatchingUserEntityName: () => SignInResolver_2<OAuthResult>;
+      emailMatchingUserEntityAnnotation: () => SignInResolver_2<OAuthResult>;
     }>;
   }>;
   microsoft: Readonly<{
@@ -603,7 +536,7 @@ export const providers: Readonly<{
               | undefined;
           }
         | undefined,
-    ) => AuthProviderFactory;
+    ) => AuthProviderFactory_2;
     resolvers: Readonly<{
       emailLocalPartMatchingUserEntityName: () => SignInResolver<unknown>;
       emailMatchingUserEntityProfileEmail: () => SignInResolver<unknown>;
@@ -622,7 +555,7 @@ export const providers: Readonly<{
               | undefined;
           }
         | undefined,
-    ) => AuthProviderFactory;
+    ) => AuthProviderFactory_2;
     resolvers: never;
   }>;
   oauth2Proxy: Readonly<{
@@ -631,7 +564,7 @@ export const providers: Readonly<{
       signIn: {
         resolver: SignInResolver<OAuth2ProxyResult<unknown>>;
       };
-    }) => AuthProviderFactory;
+    }) => AuthProviderFactory_2;
     resolvers: never;
   }>;
   oidc: Readonly<{
@@ -646,7 +579,7 @@ export const providers: Readonly<{
               | undefined;
           }
         | undefined,
-    ) => AuthProviderFactory;
+    ) => AuthProviderFactory_2;
     resolvers: Readonly<{
       emailLocalPartMatchingUserEntityName: () => SignInResolver<unknown>;
       emailMatchingUserEntityProfileEmail: () => SignInResolver<unknown>;
@@ -664,7 +597,7 @@ export const providers: Readonly<{
               | undefined;
           }
         | undefined,
-    ) => AuthProviderFactory;
+    ) => AuthProviderFactory_2;
     resolvers: Readonly<{
       emailLocalPartMatchingUserEntityName: () => SignInResolver<unknown>;
       emailMatchingUserEntityProfileEmail: () => SignInResolver<unknown>;
@@ -683,7 +616,7 @@ export const providers: Readonly<{
               | undefined;
           }
         | undefined,
-    ) => AuthProviderFactory;
+    ) => AuthProviderFactory_2;
     resolvers: never;
   }>;
   saml: Readonly<{
@@ -698,7 +631,7 @@ export const providers: Readonly<{
               | undefined;
           }
         | undefined,
-    ) => AuthProviderFactory;
+    ) => AuthProviderFactory_2;
     resolvers: Readonly<{
       nameIdMatchingUserEntityName(): SignInResolver<SamlAuthResult>;
     }>;
@@ -713,13 +646,13 @@ export const providers: Readonly<{
             };
           }
         | undefined,
-    ) => AuthProviderFactory;
+    ) => AuthProviderFactory_2;
     resolvers: never;
   }>;
 }>;
 
-// @public (undocumented)
-export const readState: (stateString: string) => OAuthState;
+// @public @deprecated (undocumented)
+export const readState: typeof decodeOAuthState;
 
 // @public (undocumented)
 export interface RouterOptions {
@@ -730,9 +663,11 @@ export interface RouterOptions {
   // (undocumented)
   database: PluginDatabaseManager;
   // (undocumented)
+  disableDefaultProviderFactories?: boolean;
+  // (undocumented)
   discovery: PluginEndpointDiscovery;
   // (undocumented)
-  logger: Logger;
+  logger: LoggerService;
   // (undocumented)
   providerFactories?: ProviderFactories;
   // (undocumented)
@@ -746,42 +681,23 @@ export type SamlAuthResult = {
   fullProfile: any;
 };
 
-// @public
-export type SignInInfo<TAuthResult> = {
-  profile: ProfileInfo;
-  result: TAuthResult;
-};
+// @public @deprecated (undocumented)
+export type SignInInfo<TAuthResult> = SignInInfo_2<TAuthResult>;
 
-// @public
-export type SignInResolver<TAuthResult> = (
-  info: SignInInfo<TAuthResult>,
-  context: AuthResolverContext,
-) => Promise<BackstageSignInResult>;
+// @public @deprecated (undocumented)
+export type SignInResolver<TAuthResult> = SignInResolver_2<TAuthResult>;
 
-// @public (undocumented)
+// @public @deprecated (undocumented)
 export type StateEncoder = (req: OAuthStartRequest) => Promise<{
   encodedState: string;
 }>;
 
-// @public
-export type TokenParams = {
-  claims: {
-    sub: string;
-    ent?: string[];
-  } & Record<string, JsonValue>;
-};
+// @public @deprecated (undocumented)
+export type TokenParams = TokenParams_2;
 
-// @public (undocumented)
+// @public @deprecated (undocumented)
 export const verifyNonce: (req: express.Request, providerId: string) => void;
 
-// @public
-export type WebMessageResponse =
-  | {
-      type: 'authorization_response';
-      response: AuthResponse<unknown>;
-    }
-  | {
-      type: 'authorization_response';
-      error: Error;
-    };
+// @public @deprecated (undocumented)
+export type WebMessageResponse = WebMessageResponse_2;
 ```
diff --git a/plugins/auth-backend/architecture.drawio.svg b/plugins/auth-backend/architecture.drawio.svg
new file mode 100644
index 0000000000..d709935e3e
--- /dev/null
+++ b/plugins/auth-backend/architecture.drawio.svg
@@ -0,0 +1,262 @@
+<svg host="65bd71144e" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" width="801px" height="271px" viewBox="-0.5 -0.5 801 271" content="&lt;mxfile&gt;&lt;diagram id=&quot;m9H7LUwiOP4VaYd3QZaE&quot; name=&quot;Page-1&quot;&gt;zVnLjpswFP2abCpNBSbP5TSTaboYNWoqtbO04AasGoyMk5B+fU2ww8NklGkbw2Iy+Pp5jo/v9WPkLeP8M8dp9MICoCPkBPnIexoh5LqLqfxXWE6lBTmTeWkJOQlUqcqwJb9BGR1l3ZMAskZBwRgVJG0afZYk4IuGDXPOjs1iO0abvaY4BMOw9TE1rT9IIKLS6o2dyr4GEka657nKiLEuqwxZhAN2rJm81chbcsZE+RXnS6AFeZqWst7zldzLuDgk4pYKqKxwwHSvoG1wlqWMi63gWEB4UuMUJ42ds30SQFHfGXmfjhERsE2xX+Qe5XRLWyRiKlOu/FTNAxeQXx2iewEuFQMsBsFlt46q8OBqspRa3IVKHyvqL2WiGu16OrCa7fDSdsWI/FCkdBM0NvBDIKWgkglLoAtwUeZtuLJJtue+KoWU/AXmIYja1JiscKBYkEOz+S6EquqGEdlxxebsCpm6iXJYqlaLp8swbqIOLaxwN+mgbv6P3N2qjomxfL4+7kVU/MkhEx8LxntfQPPWjKOO5TO90/JxPSsamJoaWFiSgDvpC6E7tgVx3hvEqSWIl/FUEO+Cx5Yqp4Zj2nCWn+TPQe6c+DP2pWfqP7aPW75pbNM1OQb8e6i6I7Jbc02mqN9GCDkRP4vJ/zhRqddazlOudHFOnFTiv7EyscXKrK95t+fNepO2NQeH7ITdrn25rbCLehMqsiXUuRGmzvvnoYWpHqPUwmBIkrMjFL5znGQ7xuPe2emTHnfcxU9+GtYJrL3NsXsEM/eCj74PWbaMwP/VOzdt9XRd7tyNGnN1bUmYfEm+QcaohDU4dh5ci/Sg9x7e7e0fC0M7atm69NF911SDpbt5YcGewgcdu3qXTls5Nt0yMt3yObCvkgPhLIklhDVOAjoAmszrZZs8mb65vEAMcCqGSM7MJjnm7lA/Tpi3rGug6SAIm7bU5JmMIedOjHnvPfD/nfPVkOrO19aJQfc9cOfb3vHd0/vKZPVgWL7TVM+u3uoP&lt;/diagram&gt;&lt;/mxfile&gt;">
+    <defs/>
+    <g>
+        <rect x="40" y="230" width="120" height="40" fill="rgb(255, 255, 255)" stroke="rgb(0, 0, 0)" pointer-events="all"/>
+        <g transform="translate(-0.5 -0.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: 118px; height: 1px; padding-top: 250px; margin-left: 41px;">
+                        <div data-drawio-colors="color: rgb(0, 0, 0); " style="box-sizing: border-box; font-size: 0px; text-align: center;">
+                            <div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; white-space: normal; overflow-wrap: normal;">
+                                PassportStrategy
+                            </div>
+                        </div>
+                    </div>
+                </foreignObject>
+                <text x="100" y="254" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="12px" text-anchor="middle">
+                    PassportStrategy
+                </text>
+            </switch>
+        </g>
+        <path d="M 100 210 L 100 223.63" fill="none" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="stroke"/>
+        <path d="M 100 228.88 L 96.5 221.88 L 100 223.63 L 103.5 221.88 Z" fill="rgb(0, 0, 0)" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="all"/>
+        <path d="M 240 183.64 L 206.36 185.17" fill="none" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="stroke"/>
+        <path d="M 201.12 185.4 L 207.95 181.59 L 206.36 185.17 L 208.27 188.58 Z" fill="rgb(0, 0, 0)" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="all"/>
+        <rect x="240" y="160" width="160" height="40" fill="rgb(255, 255, 255)" stroke="rgb(0, 0, 0)" pointer-events="all"/>
+        <g transform="translate(-0.5 -0.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: 158px; height: 1px; padding-top: 180px; margin-left: 241px;">
+                        <div data-drawio-colors="color: rgb(0, 0, 0); " style="box-sizing: border-box; font-size: 0px; text-align: center;">
+                            <div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; white-space: normal; overflow-wrap: normal;">
+                                OAuthAuthenticator
+                            </div>
+                        </div>
+                    </div>
+                </foreignObject>
+                <text x="320" y="184" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="12px" text-anchor="middle">
+                    OAuthAuthenticator
+                </text>
+            </switch>
+        </g>
+        <path d="M 640 100 L 606.37 100" fill="none" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="stroke"/>
+        <path d="M 601.12 100 L 608.12 96.5 L 606.37 100 L 608.12 103.5 Z" fill="rgb(0, 0, 0)" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="all"/>
+        <path d="M 720 120 L 720 153.63" fill="none" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="stroke"/>
+        <path d="M 720 158.88 L 716.5 151.88 L 720 153.63 L 723.5 151.88 Z" fill="rgb(0, 0, 0)" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="all"/>
+        <path d="M 640 120 L 606.18 128.46" fill="none" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="stroke"/>
+        <path d="M 601.08 129.73 L 607.03 124.64 L 606.18 128.46 L 608.72 131.43 Z" fill="rgb(0, 0, 0)" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="all"/>
+        <path d="M 640 80 L 606.18 71.54" fill="none" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="stroke"/>
+        <path d="M 601.08 70.27 L 608.72 68.57 L 606.18 71.54 L 607.03 75.36 Z" fill="rgb(0, 0, 0)" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="all"/>
+        <rect x="640" y="80" width="160" height="40" fill="rgb(255, 255, 255)" stroke="rgb(0, 0, 0)" pointer-events="all"/>
+        <g transform="translate(-0.5 -0.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: 158px; height: 1px; padding-top: 100px; margin-left: 641px;">
+                        <div data-drawio-colors="color: rgb(0, 0, 0); " style="box-sizing: border-box; font-size: 0px; text-align: center;">
+                            <div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; white-space: normal; overflow-wrap: normal;">
+                                ProxyProviderFactory
+                            </div>
+                        </div>
+                    </div>
+                </foreignObject>
+                <text x="720" y="104" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="12px" text-anchor="middle">
+                    ProxyProviderFactory
+                </text>
+            </switch>
+        </g>
+        <path d="M 400 100 L 433.63 100" fill="none" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="stroke"/>
+        <path d="M 438.88 100 L 431.88 103.5 L 433.63 100 L 431.88 96.5 Z" fill="rgb(0, 0, 0)" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="all"/>
+        <path d="M 320 120 L 320 153.63" fill="none" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="stroke"/>
+        <path d="M 320 158.88 L 316.5 151.88 L 320 153.63 L 323.5 151.88 Z" fill="rgb(0, 0, 0)" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="all"/>
+        <path d="M 400 120 L 433.82 128.46" fill="none" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="stroke"/>
+        <path d="M 438.92 129.73 L 431.28 131.43 L 433.82 128.46 L 432.97 124.64 Z" fill="rgb(0, 0, 0)" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="all"/>
+        <path d="M 400 80 L 433.82 71.54" fill="none" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="stroke"/>
+        <path d="M 438.92 70.27 L 432.97 75.36 L 433.82 71.54 L 431.28 68.57 Z" fill="rgb(0, 0, 0)" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="all"/>
+        <path d="M 240 88 L 206.3 82.94" fill="none" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="stroke"/>
+        <path d="M 201.11 82.17 L 208.55 79.74 L 206.3 82.94 L 207.51 86.67 Z" fill="rgb(0, 0, 0)" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="all"/>
+        <path d="M 240 112 L 206.3 117.06" fill="none" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="stroke"/>
+        <path d="M 201.11 117.83 L 207.51 113.33 L 206.3 117.06 L 208.55 120.26 Z" fill="rgb(0, 0, 0)" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="all"/>
+        <rect x="240" y="80" width="160" height="40" fill="rgb(255, 255, 255)" stroke="rgb(0, 0, 0)" pointer-events="all"/>
+        <g transform="translate(-0.5 -0.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: 158px; height: 1px; padding-top: 100px; margin-left: 241px;">
+                        <div data-drawio-colors="color: rgb(0, 0, 0); " style="box-sizing: border-box; font-size: 0px; text-align: center;">
+                            <div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; white-space: normal; overflow-wrap: normal;">
+                                OAuthProviderFactory
+                            </div>
+                        </div>
+                    </div>
+                </foreignObject>
+                <text x="320" y="104" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="12px" text-anchor="middle">
+                    OAuthProviderFactory
+                </text>
+            </switch>
+        </g>
+        <rect x="440" y="80" width="160" height="40" fill="rgb(255, 255, 255)" stroke="rgb(0, 0, 0)" pointer-events="all"/>
+        <g transform="translate(-0.5 -0.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: 158px; height: 1px; padding-top: 100px; margin-left: 441px;">
+                        <div data-drawio-colors="color: rgb(0, 0, 0); " style="box-sizing: border-box; font-size: 0px; text-align: center;">
+                            <div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; white-space: normal; overflow-wrap: normal;">
+                                ProfileTransform
+                            </div>
+                        </div>
+                    </div>
+                </foreignObject>
+                <text x="520" y="104" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="12px" text-anchor="middle">
+                    ProfileTransform
+                </text>
+            </switch>
+        </g>
+        <rect x="640" y="160" width="160" height="40" fill="rgb(255, 255, 255)" stroke="rgb(0, 0, 0)" pointer-events="all"/>
+        <g transform="translate(-0.5 -0.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: 158px; height: 1px; padding-top: 180px; margin-left: 641px;">
+                        <div data-drawio-colors="color: rgb(0, 0, 0); " style="box-sizing: border-box; font-size: 0px; text-align: center;">
+                            <div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; white-space: normal; overflow-wrap: normal;">
+                                ProxyAuthenticator
+                            </div>
+                        </div>
+                    </div>
+                </foreignObject>
+                <text x="720" y="184" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="12px" text-anchor="middle">
+                    ProxyAuthenticator
+                </text>
+            </switch>
+        </g>
+        <rect x="440" y="130" width="160" height="40" fill="rgb(255, 255, 255)" stroke="rgb(0, 0, 0)" pointer-events="all"/>
+        <g transform="translate(-0.5 -0.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: 158px; height: 1px; padding-top: 150px; margin-left: 441px;">
+                        <div data-drawio-colors="color: rgb(0, 0, 0); " style="box-sizing: border-box; font-size: 0px; text-align: center;">
+                            <div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; white-space: normal; overflow-wrap: normal;">
+                                AccessCheck
+                            </div>
+                        </div>
+                    </div>
+                </foreignObject>
+                <text x="520" y="154" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="12px" text-anchor="middle">
+                    AccessCheck
+                </text>
+            </switch>
+        </g>
+        <rect x="440" y="30" width="160" height="40" fill="rgb(255, 255, 255)" stroke="rgb(0, 0, 0)" pointer-events="all"/>
+        <g transform="translate(-0.5 -0.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: 158px; height: 1px; padding-top: 50px; margin-left: 441px;">
+                        <div data-drawio-colors="color: rgb(0, 0, 0); " style="box-sizing: border-box; font-size: 0px; text-align: center;">
+                            <div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; white-space: normal; overflow-wrap: normal;">
+                                SignInResolver
+                            </div>
+                        </div>
+                    </div>
+                </foreignObject>
+                <text x="520" y="54" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="12px" text-anchor="middle">
+                    SignInResolver
+                </text>
+            </switch>
+        </g>
+        <path d="M 320 40 L 320 73.63" fill="none" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="stroke"/>
+        <path d="M 320 78.88 L 316.5 71.88 L 320 73.63 L 323.5 71.88 Z" fill="rgb(0, 0, 0)" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="all"/>
+        <rect x="240" y="0" width="160" height="40" fill="rgb(255, 255, 255)" stroke="rgb(0, 0, 0)" pointer-events="all"/>
+        <g transform="translate(-0.5 -0.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: 158px; height: 1px; padding-top: 20px; margin-left: 241px;">
+                        <div data-drawio-colors="color: rgb(0, 0, 0); " style="box-sizing: border-box; font-size: 0px; text-align: center;">
+                            <div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; white-space: normal; overflow-wrap: normal;">
+                                authModule*Provider
+                            </div>
+                        </div>
+                    </div>
+                </foreignObject>
+                <text x="320" y="24" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="12px" text-anchor="middle">
+                    authModule*Provider
+                </text>
+            </switch>
+        </g>
+        <rect x="40" y="50" width="160" height="40" fill="rgb(255, 255, 255)" stroke="rgb(0, 0, 0)" pointer-events="all"/>
+        <g transform="translate(-0.5 -0.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: 158px; height: 1px; padding-top: 70px; margin-left: 41px;">
+                        <div data-drawio-colors="color: rgb(0, 0, 0); " style="box-sizing: border-box; font-size: 0px; text-align: center;">
+                            <div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; white-space: normal; overflow-wrap: normal;">
+                                OAuthEnvironmentHandler
+                            </div>
+                        </div>
+                    </div>
+                </foreignObject>
+                <text x="120" y="74" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="12px" text-anchor="middle">
+                    OAuthEnvironmentHandler
+                </text>
+            </switch>
+        </g>
+        <rect x="40" y="110" width="160" height="40" fill="rgb(255, 255, 255)" stroke="rgb(0, 0, 0)" pointer-events="all"/>
+        <g transform="translate(-0.5 -0.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: 158px; height: 1px; padding-top: 130px; margin-left: 41px;">
+                        <div data-drawio-colors="color: rgb(0, 0, 0); " style="box-sizing: border-box; font-size: 0px; text-align: center;">
+                            <div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; white-space: normal; overflow-wrap: normal;">
+                                OAuthAdapter
+                            </div>
+                        </div>
+                    </div>
+                </foreignObject>
+                <text x="120" y="134" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="12px" text-anchor="middle">
+                    OAuthAdapter
+                </text>
+            </switch>
+        </g>
+        <rect x="0" y="170" width="200" height="40" fill="rgb(255, 255, 255)" stroke="rgb(0, 0, 0)" pointer-events="all"/>
+        <g transform="translate(-0.5 -0.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: 198px; height: 1px; padding-top: 190px; margin-left: 1px;">
+                        <div data-drawio-colors="color: rgb(0, 0, 0); " style="box-sizing: border-box; font-size: 0px; text-align: center;">
+                            <div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; white-space: normal; overflow-wrap: normal;">
+                                PassportOAuthAuthenticatorHelper
+                            </div>
+                        </div>
+                    </div>
+                </foreignObject>
+                <text x="100" y="194" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="12px" text-anchor="middle">
+                    PassportOAuthAuthenticatorHelper
+                </text>
+            </switch>
+        </g>
+        <path d="M 720 40 L 720 73.63" fill="none" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="stroke"/>
+        <path d="M 720 78.88 L 716.5 71.88 L 720 73.63 L 723.5 71.88 Z" fill="rgb(0, 0, 0)" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="all"/>
+        <rect x="640" y="0" width="160" height="40" fill="rgb(255, 255, 255)" stroke="rgb(0, 0, 0)" pointer-events="all"/>
+        <g transform="translate(-0.5 -0.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: 158px; height: 1px; padding-top: 20px; margin-left: 641px;">
+                        <div data-drawio-colors="color: rgb(0, 0, 0); " style="box-sizing: border-box; font-size: 0px; text-align: center;">
+                            <div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; white-space: normal; overflow-wrap: normal;">
+                                authModule*Provider
+                            </div>
+                        </div>
+                    </div>
+                </foreignObject>
+                <text x="720" y="24" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="12px" text-anchor="middle">
+                    authModule*Provider
+                </text>
+            </switch>
+        </g>
+    </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%">
+                Text is not SVG - cannot display
+            </text>
+        </a>
+    </switch>
+</svg>
diff --git a/plugins/auth-backend/catalog-info.yaml b/plugins/auth-backend/catalog-info.yaml
new file mode 100644
index 0000000000..38ac5f0753
--- /dev/null
+++ b/plugins/auth-backend/catalog-info.yaml
@@ -0,0 +1,10 @@
+apiVersion: backstage.io/v1alpha1
+kind: Component
+metadata:
+  name: backstage-plugin-auth-backend
+  title: '@backstage/plugin-auth-backend'
+  description: A Backstage backend plugin that handles authentication
+spec:
+  lifecycle: experimental
+  type: backstage-backend-plugin
+  owner: maintainers
diff --git a/plugins/auth-backend/config.d.ts b/plugins/auth-backend/config.d.ts
index 4ebf7c9de1..e719468ac1 100644
--- a/plugins/auth-backend/config.d.ts
+++ b/plugins/auth-backend/config.d.ts
@@ -31,6 +31,16 @@ export interface Config {
       secret?: string;
     };
 
+    /**
+     * JWS "alg" (Algorithm) Header Parameter value. Defaults to ES256.
+     * Must match one of the algorithms defined for IdentityClient.
+     * When setting a different algorithm, check if the `key` field
+     * of the `signing_keys` table can fit the length of the generated keys.
+     * If not, add a knex migration file in the migrations folder.
+     * More info on supported algorithms: https://github.com/panva/jose
+     */
+    identityTokenAlgorithm?: string;
+
     /** To control how to store JWK data in auth-backend */
     keyStore?: {
       provider?: 'database' | 'memory' | 'firestore';
@@ -86,18 +96,6 @@ export interface Config {
         };
       };
       /** @visibility frontend */
-      gitlab?: {
-        [authEnv: string]: {
-          clientId: string;
-          /**
-           * @visibility secret
-           */
-          clientSecret: string;
-          audience?: string;
-          callbackUrl?: string;
-        };
-      };
-      /** @visibility frontend */
       saml?: {
         entryPoint: string;
         logoutUrl?: string;
diff --git a/plugins/auth-backend/dev/index.ts b/plugins/auth-backend/dev/index.ts
new file mode 100644
index 0000000000..e1fac31318
--- /dev/null
+++ b/plugins/auth-backend/dev/index.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.
+ */
+
+import { createBackend } from '@backstage/backend-defaults';
+
+const backend = createBackend();
+
+backend.add(import('../src'));
+backend.add(import('@backstage/plugin-auth-backend-module-google-provider'));
+
+backend.start();
diff --git a/plugins/auth-backend/package.json b/plugins/auth-backend/package.json
index 2a3b80de6a..73bd3aa2ea 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.18.6-next.1",
+  "version": "0.18.9-next.2",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
@@ -33,11 +33,17 @@
   },
   "dependencies": {
     "@backstage/backend-common": "workspace:^",
+    "@backstage/backend-plugin-api": "workspace:^",
     "@backstage/catalog-client": "workspace:^",
     "@backstage/catalog-model": "workspace:^",
     "@backstage/config": "workspace:^",
     "@backstage/errors": "workspace:^",
+    "@backstage/plugin-auth-backend-module-gcp-iap-provider": "workspace:^",
+    "@backstage/plugin-auth-backend-module-github-provider": "workspace:^",
+    "@backstage/plugin-auth-backend-module-gitlab-provider": "workspace:^",
+    "@backstage/plugin-auth-backend-module-google-provider": "workspace:^",
     "@backstage/plugin-auth-node": "workspace:^",
+    "@backstage/plugin-catalog-node": "workspace:^",
     "@backstage/types": "workspace:^",
     "@davidzemon/passport-okta-oauth": "^0.0.5",
     "@google-cloud/firestore": "^6.0.0",
@@ -77,6 +83,7 @@
     "yn": "^4.0.0"
   },
   "devDependencies": {
+    "@backstage/backend-defaults": "workspace:^",
     "@backstage/backend-test-utils": "workspace:^",
     "@backstage/cli": "workspace:^",
     "@types/body-parser": "^1.19.0",
diff --git a/plugins/auth-backend/src/authPlugin.test.ts b/plugins/auth-backend/src/authPlugin.test.ts
new file mode 100644
index 0000000000..d8a15eba3e
--- /dev/null
+++ b/plugins/auth-backend/src/authPlugin.test.ts
@@ -0,0 +1,45 @@
+/*
+ * 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 { mockServices, startTestBackend } from '@backstage/backend-test-utils';
+import request from 'supertest';
+import { authPlugin } from './authPlugin';
+
+describe('authPlugin', () => {
+  it('should provide an OpenID configuration', async () => {
+    const { server } = await startTestBackend({
+      features: [
+        authPlugin,
+        mockServices.rootConfig.factory({
+          data: {
+            app: {
+              baseUrl: 'http://localhost:3000',
+            },
+          },
+        }),
+      ],
+    });
+
+    const res = await request(server).get(
+      '/api/auth/.well-known/openid-configuration',
+    );
+    expect(res.status).toBe(200);
+    expect(res.body).toMatchObject({
+      claims_supported: ['sub'],
+      issuer: `http://localhost:${server.port()}/api/auth`,
+    });
+  });
+});
diff --git a/plugins/auth-backend/src/authPlugin.ts b/plugins/auth-backend/src/authPlugin.ts
new file mode 100644
index 0000000000..0522424a99
--- /dev/null
+++ b/plugins/auth-backend/src/authPlugin.ts
@@ -0,0 +1,82 @@
+/*
+ * 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 {
+  AuthProviderFactory,
+  authProvidersExtensionPoint,
+} from '@backstage/plugin-auth-node';
+import { catalogServiceRef } from '@backstage/plugin-catalog-node/alpha';
+import { createRouter } from './service/router';
+
+/**
+ * Auth plugin
+ *
+ * @public
+ */
+export const authPlugin = createBackendPlugin({
+  pluginId: 'auth',
+  register(reg) {
+    const providers = new Map<string, AuthProviderFactory>();
+
+    reg.registerExtensionPoint(authProvidersExtensionPoint, {
+      registerProvider({ providerId, factory }) {
+        if (providers.has(providerId)) {
+          throw new Error(
+            `Auth provider '${providerId}' was already registered`,
+          );
+        }
+        providers.set(providerId, factory);
+      },
+    });
+
+    reg.registerInit({
+      deps: {
+        httpRouter: coreServices.httpRouter,
+        logger: coreServices.logger,
+        config: coreServices.rootConfig,
+        database: coreServices.database,
+        discovery: coreServices.discovery,
+        tokenManager: coreServices.tokenManager,
+        catalogApi: catalogServiceRef,
+      },
+      async init({
+        httpRouter,
+        logger,
+        config,
+        database,
+        discovery,
+        tokenManager,
+        catalogApi,
+      }) {
+        const router = await createRouter({
+          logger,
+          config,
+          database,
+          discovery,
+          tokenManager,
+          catalogApi,
+          providerFactories: Object.fromEntries(providers),
+          disableDefaultProviderFactories: true,
+        });
+        httpRouter.use(router);
+      },
+    });
+  },
+});
diff --git a/plugins/auth-backend/src/identity/FirestoreKeyStore.ts b/plugins/auth-backend/src/identity/FirestoreKeyStore.ts
index a5479a6470..b5f4f5dcfb 100644
--- a/plugins/auth-backend/src/identity/FirestoreKeyStore.ts
+++ b/plugins/auth-backend/src/identity/FirestoreKeyStore.ts
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-import { Logger } from 'winston';
+import { LoggerService } from '@backstage/backend-plugin-api';
 import {
   DocumentData,
   Firestore,
@@ -57,7 +57,7 @@ export class FirestoreKeyStore implements KeyStore {
 
   static async verifyConnection(
     keyStore: FirestoreKeyStore,
-    logger?: Logger,
+    logger?: LoggerService,
   ): Promise<void> {
     try {
       await keyStore.verify();
diff --git a/plugins/auth-backend/src/identity/KeyStores.ts b/plugins/auth-backend/src/identity/KeyStores.ts
index 4cd8f91842..cc35c0d84e 100644
--- a/plugins/auth-backend/src/identity/KeyStores.ts
+++ b/plugins/auth-backend/src/identity/KeyStores.ts
@@ -15,7 +15,7 @@
  */
 
 import { pickBy } from 'lodash';
-import { Logger } from 'winston';
+import { LoggerService } from '@backstage/backend-plugin-api';
 
 import { Config } from '@backstage/config';
 
@@ -26,7 +26,7 @@ import { MemoryKeyStore } from './MemoryKeyStore';
 import { KeyStore } from './types';
 
 type Options = {
-  logger: Logger;
+  logger: LoggerService;
   database: AuthDatabase;
 };
 
diff --git a/plugins/auth-backend/src/identity/TokenFactory.ts b/plugins/auth-backend/src/identity/TokenFactory.ts
index f80b79b6bc..ca16f8821f 100644
--- a/plugins/auth-backend/src/identity/TokenFactory.ts
+++ b/plugins/auth-backend/src/identity/TokenFactory.ts
@@ -18,14 +18,14 @@ import { AuthenticationError } from '@backstage/errors';
 import { exportJWK, generateKeyPair, importJWK, JWK, SignJWT } from 'jose';
 import { DateTime } from 'luxon';
 import { v4 as uuid } from 'uuid';
-import { Logger } from 'winston';
+import { LoggerService } from '@backstage/backend-plugin-api';
 
 import { AnyJWK, KeyStore, TokenIssuer, TokenParams } from './types';
 
 const MS_IN_S = 1000;
 
 type Options = {
-  logger: Logger;
+  logger: LoggerService;
   /** Value of the issuer claim in issued tokens */
   issuer: string;
   /** Key store used for storing signing keys */
@@ -57,7 +57,7 @@ type Options = {
  */
 export class TokenFactory implements TokenIssuer {
   private readonly issuer: string;
-  private readonly logger: Logger;
+  private readonly logger: LoggerService;
   private readonly keyStore: KeyStore;
   private readonly keyDurationSeconds: number;
   private readonly algorithm: string;
diff --git a/plugins/auth-backend/src/identity/types.ts b/plugins/auth-backend/src/identity/types.ts
index e325f74c81..fcfc0345cc 100644
--- a/plugins/auth-backend/src/identity/types.ts
+++ b/plugins/auth-backend/src/identity/types.ts
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-import { JsonValue } from '@backstage/types';
+import { TokenParams as _TokenParams } from '@backstage/plugin-auth-node';
 
 /** Represents any form of serializable JWK */
 export interface AnyJWK extends Record<string, string> {
@@ -25,26 +25,10 @@ export interface AnyJWK extends Record<string, string> {
 }
 
 /**
- * Parameters used to issue new ID Tokens
- *
  * @public
+ * @deprecated import from `@backstage/plugin-auth-node` instead
  */
-export type TokenParams = {
-  /**
-   * The claims that will be embedded within the token. At a minimum, this should include
-   * the subject claim, `sub`. It is common to also list entity ownership relations in the
-   * `ent` list. Additional claims may also be added at the developer's discretion except
-   * for the following list, which will be overwritten by the TokenIssuer: `iss`, `aud`,
-   * `iat`, and `exp`. The Backstage team also maintains the right add new claims in the future
-   * without listing the change as a "breaking change".
-   */
-  claims: {
-    /** The token subject, i.e. User ID */
-    sub: string;
-    /** A list of entity references that the user claims ownership through */
-    ent?: string[];
-  } & Record<string, JsonValue>;
-};
+export type TokenParams = _TokenParams;
 
 /**
  * A TokenIssuer is able to issue verifiable ID Tokens on demand.
diff --git a/plugins/auth-backend/src/index.ts b/plugins/auth-backend/src/index.ts
index f8a8580359..3943387e15 100644
--- a/plugins/auth-backend/src/index.ts
+++ b/plugins/auth-backend/src/index.ts
@@ -20,6 +20,7 @@
  * @packageDocumentation
  */
 
+export { authPlugin as default } from './authPlugin';
 export * from './service/router';
 export type { TokenParams } from './identity';
 export * from './providers';
diff --git a/plugins/auth-backend/src/lib/catalog/CatalogIdentityClient.ts b/plugins/auth-backend/src/lib/catalog/CatalogIdentityClient.ts
index 494e8b4d38..ff983e27a5 100644
--- a/plugins/auth-backend/src/lib/catalog/CatalogIdentityClient.ts
+++ b/plugins/auth-backend/src/lib/catalog/CatalogIdentityClient.ts
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-import { Logger } from 'winston';
+import { LoggerService } from '@backstage/backend-plugin-api';
 import { ConflictError, NotFoundError } from '@backstage/errors';
 import { CatalogApi } from '@backstage/catalog-client';
 import {
@@ -78,7 +78,7 @@ export class CatalogIdentityClient {
    */
   async resolveCatalogMembership(query: {
     entityRefs: string[];
-    logger?: Logger;
+    logger?: LoggerService;
   }): Promise<string[]> {
     const { entityRefs, logger } = query;
     const resolvedEntityRefs = entityRefs
diff --git a/plugins/auth-backend/src/lib/flow/authFlowHelpers.ts b/plugins/auth-backend/src/lib/flow/authFlowHelpers.ts
index 94ac4fba15..2f1770a3d4 100644
--- a/plugins/auth-backend/src/lib/flow/authFlowHelpers.ts
+++ b/plugins/auth-backend/src/lib/flow/authFlowHelpers.ts
@@ -24,7 +24,10 @@ export const safelyEncodeURIComponent = (value: string) => {
   return encodeURIComponent(value).replace(/'/g, '%27');
 };
 
-/** @public */
+/**
+ * @public
+ * @deprecated Use `sendWebMessageResponse` from `@backstage/plugin-auth-node` instead
+ */
 export const postMessageResponse = (
   res: express.Response,
   appOrigin: string,
@@ -69,7 +72,10 @@ export const postMessageResponse = (
   res.end(`<html><body><script>${script}</script></body></html>`);
 };
 
-/** @public */
+/**
+ * @public
+ * @deprecated Use inline logic to check that the `X-Requested-With` header is set to `'XMLHttpRequest'` instead.
+ */
 export const ensuresXRequestedWith = (req: express.Request) => {
   const requiredHeader = req.header('X-Requested-With');
   if (!requiredHeader || requiredHeader !== 'XMLHttpRequest') {
diff --git a/plugins/auth-backend/src/lib/flow/types.ts b/plugins/auth-backend/src/lib/flow/types.ts
index f67198a1b0..36f3033b21 100644
--- a/plugins/auth-backend/src/lib/flow/types.ts
+++ b/plugins/auth-backend/src/lib/flow/types.ts
@@ -14,20 +14,10 @@
  * limitations under the License.
  */
 
-import { AuthResponse } from '../../providers/types';
+import { WebMessageResponse as _WebMessageResponse } from '@backstage/plugin-auth-node';
 
 /**
- * Payload sent as a post message after the auth request is complete.
- * If successful then has a valid payload with Auth information else contains an error.
- *
  * @public
+ * @deprecated import from `@backstage/plugin-auth-node` instead
  */
-export type WebMessageResponse =
-  | {
-      type: 'authorization_response';
-      response: AuthResponse<unknown>;
-    }
-  | {
-      type: 'authorization_response';
-      error: Error;
-    };
+export type WebMessageResponse = _WebMessageResponse;
diff --git a/plugins/auth-backend/src/lib/legacy/adaptLegacyOAuthHandler.test.ts b/plugins/auth-backend/src/lib/legacy/adaptLegacyOAuthHandler.test.ts
new file mode 100644
index 0000000000..5c5de6a890
--- /dev/null
+++ b/plugins/auth-backend/src/lib/legacy/adaptLegacyOAuthHandler.test.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 { AuthResolverContext } from '@backstage/plugin-auth-node';
+import { AuthHandler } from '../../providers';
+import { OAuthResult } from '../oauth';
+import { PassportProfile } from '../passport/types';
+import { adaptLegacyOAuthHandler } from './adaptLegacyOAuthHandler';
+
+describe('adaptLegacyOAuthHandler', () => {
+  it('should pass through undefined', () => {
+    expect(adaptLegacyOAuthHandler(undefined)).toBeUndefined();
+  });
+
+  it('should convert an old auth handler to a new profile transform', () => {
+    const authHandler: AuthHandler<OAuthResult> = jest.fn();
+    const profileTransform = adaptLegacyOAuthHandler(authHandler);
+
+    profileTransform?.(
+      {
+        fullProfile: { id: 'id' } as PassportProfile,
+        session: {
+          accessToken: 'token',
+          expiresInSeconds: 3,
+          scope: 'sco pe',
+          tokenType: 'bear',
+          idToken: 'id-token',
+          refreshToken: 'refresh-token',
+        },
+      },
+      { ctx: 'ctx' } as unknown as AuthResolverContext,
+    );
+
+    expect(authHandler).toHaveBeenCalledWith(
+      {
+        fullProfile: { id: 'id' },
+        accessToken: 'token',
+        params: {
+          scope: 'sco pe',
+          id_token: 'id-token',
+          expires_in: 3,
+          token_type: 'bear',
+        },
+      },
+      { ctx: 'ctx' },
+    );
+  });
+});
diff --git a/plugins/auth-backend/src/lib/legacy/adaptLegacyOAuthHandler.ts b/plugins/auth-backend/src/lib/legacy/adaptLegacyOAuthHandler.ts
new file mode 100644
index 0000000000..3b8eca0a95
--- /dev/null
+++ b/plugins/auth-backend/src/lib/legacy/adaptLegacyOAuthHandler.ts
@@ -0,0 +1,46 @@
+/*
+ * 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 {
+  OAuthAuthenticatorResult,
+  ProfileTransform,
+} from '@backstage/plugin-auth-node';
+import { AuthHandler } from '../../providers';
+import { OAuthResult } from '../oauth';
+import { PassportProfile } from '../passport/types';
+
+/** @internal */
+export function adaptLegacyOAuthHandler(
+  authHandler?: AuthHandler<OAuthResult>,
+): ProfileTransform<OAuthAuthenticatorResult<PassportProfile>> | undefined {
+  return (
+    authHandler &&
+    (async (result, ctx) =>
+      authHandler(
+        {
+          fullProfile: result.fullProfile,
+          accessToken: result.session.accessToken,
+          params: {
+            scope: result.session.scope,
+            id_token: result.session.idToken,
+            token_type: result.session.tokenType,
+            expires_in: result.session.expiresInSeconds!,
+          },
+        },
+        ctx,
+      ))
+  );
+}
diff --git a/plugins/auth-backend/src/lib/legacy/adaptLegacyOAuthSignInResolver.test.ts b/plugins/auth-backend/src/lib/legacy/adaptLegacyOAuthSignInResolver.test.ts
new file mode 100644
index 0000000000..749cf96cbb
--- /dev/null
+++ b/plugins/auth-backend/src/lib/legacy/adaptLegacyOAuthSignInResolver.test.ts
@@ -0,0 +1,69 @@
+/*
+ * 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 {
+  AuthResolverContext,
+  PassportProfile,
+} from '@backstage/plugin-auth-node';
+import { adaptLegacyOAuthSignInResolver } from './adaptLegacyOAuthSignInResolver';
+
+describe('adaptLegacyOAuthSignInResolver', () => {
+  it('should pass through undefined', () => {
+    expect(adaptLegacyOAuthSignInResolver(undefined)).toBeUndefined();
+  });
+
+  it('should convert a legacy resolver to a new one', () => {
+    const legacyResolver = jest.fn();
+
+    const newResolver = adaptLegacyOAuthSignInResolver(legacyResolver);
+
+    newResolver?.(
+      {
+        profile: { email: 'em@i.l' },
+        result: {
+          fullProfile: { id: 'id' } as PassportProfile,
+          session: {
+            accessToken: 'token',
+            expiresInSeconds: 3,
+            scope: 'sco pe',
+            tokenType: 'bear',
+            idToken: 'id-token',
+            refreshToken: 'refresh-token',
+          },
+        },
+      },
+      { ctx: 'ctx' } as unknown as AuthResolverContext,
+    );
+
+    expect(legacyResolver).toHaveBeenCalledWith(
+      {
+        profile: { email: 'em@i.l' },
+        result: {
+          fullProfile: { id: 'id' },
+          accessToken: 'token',
+          refreshToken: 'refresh-token',
+          params: {
+            scope: 'sco pe',
+            id_token: 'id-token',
+            expires_in: 3,
+            token_type: 'bear',
+          },
+        },
+      },
+      { ctx: 'ctx' },
+    );
+  });
+});
diff --git a/plugins/auth-backend/src/lib/legacy/adaptLegacyOAuthSignInResolver.ts b/plugins/auth-backend/src/lib/legacy/adaptLegacyOAuthSignInResolver.ts
new file mode 100644
index 0000000000..e671a62d52
--- /dev/null
+++ b/plugins/auth-backend/src/lib/legacy/adaptLegacyOAuthSignInResolver.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 {
+  OAuthAuthenticatorResult,
+  PassportProfile,
+  SignInResolver,
+} from '@backstage/plugin-auth-node';
+import { OAuthResult } from '../oauth';
+
+/** @internal */
+export function adaptLegacyOAuthSignInResolver(
+  signInResolver?: SignInResolver<OAuthResult>,
+): SignInResolver<OAuthAuthenticatorResult<PassportProfile>> | undefined {
+  return (
+    signInResolver &&
+    (async (input, ctx) =>
+      signInResolver(
+        {
+          profile: input.profile,
+          result: {
+            fullProfile: input.result.fullProfile,
+            accessToken: input.result.session.accessToken,
+            refreshToken: input.result.session.refreshToken,
+            params: {
+              scope: input.result.session.scope,
+              id_token: input.result.session.idToken,
+              token_type: input.result.session.tokenType,
+              expires_in: input.result.session.expiresInSeconds!,
+            },
+          },
+        },
+        ctx,
+      ))
+  );
+}
diff --git a/plugins/auth-backend/src/lib/legacy/adaptOAuthSignInResolverToLegacy.test.ts b/plugins/auth-backend/src/lib/legacy/adaptOAuthSignInResolverToLegacy.test.ts
new file mode 100644
index 0000000000..521dcf6395
--- /dev/null
+++ b/plugins/auth-backend/src/lib/legacy/adaptOAuthSignInResolverToLegacy.test.ts
@@ -0,0 +1,85 @@
+/*
+ * 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 {
+  AuthResolverContext,
+  PassportProfile,
+} from '@backstage/plugin-auth-node';
+import { adaptOAuthSignInResolverToLegacy } from './adaptOAuthSignInResolverToLegacy';
+
+describe('adaptOAuthSignInResolverToLegacy', () => {
+  it('should pass through an empty object', () => {
+    const legacyResolvers = adaptOAuthSignInResolverToLegacy({});
+    expect(legacyResolvers).toEqual({});
+
+    // @ts-expect-error
+    legacyResolvers.missing?.();
+  });
+
+  it('should adapt a collection of sign-in resolvers', () => {
+    const resolverA = jest.fn();
+    const resolverB = jest.fn();
+
+    const legacyResolvers = adaptOAuthSignInResolverToLegacy({
+      resolverA,
+      resolverB,
+    });
+
+    const legacyResolverA = legacyResolvers.resolverA();
+    legacyResolverA(
+      {
+        profile: { email: 'em@i.l' },
+        result: {
+          fullProfile: { id: 'id' } as PassportProfile,
+          accessToken: 'token',
+          refreshToken: 'refresh-token',
+          params: {
+            scope: 'sco pe',
+            id_token: 'id-token',
+            expires_in: 3,
+            token_type: 'bear',
+          },
+        },
+      },
+      { ctx: 'ctx' } as unknown as AuthResolverContext,
+    );
+
+    expect(resolverA).toHaveBeenCalledWith(
+      {
+        profile: { email: 'em@i.l' },
+        result: {
+          fullProfile: { id: 'id' } as PassportProfile,
+          session: {
+            accessToken: 'token',
+            expiresInSeconds: 3,
+            scope: 'sco pe',
+            tokenType: 'bear',
+            idToken: 'id-token',
+            refreshToken: 'refresh-token',
+          },
+        },
+      },
+      { ctx: 'ctx' },
+    );
+
+    expect(resolverB).not.toHaveBeenCalled();
+    legacyResolvers.resolverB()(
+      { profile: {}, result: { params: {} } } as any,
+      {} as any,
+    );
+    expect(resolverB).toHaveBeenCalled();
+  });
+});
diff --git a/plugins/auth-backend/src/lib/legacy/adaptOAuthSignInResolverToLegacy.ts b/plugins/auth-backend/src/lib/legacy/adaptOAuthSignInResolverToLegacy.ts
new file mode 100644
index 0000000000..8be6049348
--- /dev/null
+++ b/plugins/auth-backend/src/lib/legacy/adaptOAuthSignInResolverToLegacy.ts
@@ -0,0 +1,55 @@
+/*
+ * 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 {
+  OAuthAuthenticatorResult,
+  PassportProfile,
+  SignInResolver,
+} from '@backstage/plugin-auth-node';
+import { OAuthResult } from '../oauth';
+
+/** @internal */
+export function adaptOAuthSignInResolverToLegacy<
+  TKeys extends string,
+>(resolvers: {
+  [key in TKeys]: SignInResolver<OAuthAuthenticatorResult<PassportProfile>>;
+}): { [key in TKeys]: () => SignInResolver<OAuthResult> } {
+  const legacyResolvers = {} as {
+    [key in TKeys]: () => SignInResolver<OAuthResult>;
+  };
+  for (const name of Object.keys(resolvers) as TKeys[]) {
+    const resolver = resolvers[name];
+    legacyResolvers[name] = () => async (input, ctx) =>
+      resolver(
+        {
+          profile: input.profile,
+          result: {
+            fullProfile: input.result.fullProfile,
+            session: {
+              accessToken: input.result.accessToken,
+              expiresInSeconds: input.result.params.expires_in,
+              scope: input.result.params.scope,
+              idToken: input.result.params.id_token,
+              tokenType: input.result.params.token_type ?? 'bearer',
+              refreshToken: input.result.refreshToken,
+            },
+          },
+        },
+        ctx,
+      );
+  }
+  return legacyResolvers;
+}
diff --git a/plugins/auth-backend/src/lib/legacy/index.ts b/plugins/auth-backend/src/lib/legacy/index.ts
new file mode 100644
index 0000000000..8bd8b5c62e
--- /dev/null
+++ b/plugins/auth-backend/src/lib/legacy/index.ts
@@ -0,0 +1,19 @@
+/*
+ * 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 { adaptLegacyOAuthHandler } from './adaptLegacyOAuthHandler';
+export { adaptLegacyOAuthSignInResolver } from './adaptLegacyOAuthSignInResolver';
+export { adaptOAuthSignInResolverToLegacy } from './adaptOAuthSignInResolverToLegacy';
diff --git a/plugins/auth-backend/src/lib/oauth/OAuthAdapter.ts b/plugins/auth-backend/src/lib/oauth/OAuthAdapter.ts
index fb0750f0cb..9b4afb4b2b 100644
--- a/plugins/auth-backend/src/lib/oauth/OAuthAdapter.ts
+++ b/plugins/auth-backend/src/lib/oauth/OAuthAdapter.ts
@@ -50,7 +50,10 @@ import { prepareBackstageIdentityResponse } from '../../providers/prepareBacksta
 export const THOUSAND_DAYS_MS = 1000 * 24 * 60 * 60 * 1000;
 export const TEN_MINUTES_MS = 600 * 1000;
 
-/** @public */
+/**
+ * @public
+ * @deprecated Use `createOAuthRouteHandlers` from `@backstage/plugin-auth-node` instead
+ */
 export type OAuthAdapterOptions = {
   providerId: string;
   persistScopes?: boolean;
@@ -61,7 +64,10 @@ export type OAuthAdapterOptions = {
   callbackUrl: string;
 };
 
-/** @public */
+/**
+ * @public
+ * @deprecated Use `createOAuthRouteHandlers` from `@backstage/plugin-auth-node` instead
+ */
 export class OAuthAdapter implements AuthProviderRouteHandlers {
   static fromConfig(
     config: AuthProviderConfig,
diff --git a/plugins/auth-backend/src/lib/oauth/OAuthEnvironmentHandler.ts b/plugins/auth-backend/src/lib/oauth/OAuthEnvironmentHandler.ts
index 1c6d45d0a4..c9244eb29e 100644
--- a/plugins/auth-backend/src/lib/oauth/OAuthEnvironmentHandler.ts
+++ b/plugins/auth-backend/src/lib/oauth/OAuthEnvironmentHandler.ts
@@ -14,84 +14,10 @@
  * limitations under the License.
  */
 
-import express from 'express';
-import { Config } from '@backstage/config';
-import { InputError, NotFoundError } from '@backstage/errors';
-import { readState } from './helpers';
-import { AuthProviderRouteHandlers } from '../../providers/types';
+import { OAuthEnvironmentHandler as _OAuthEnvironmentHandler } from '@backstage/plugin-auth-node';
 
-/** @public */
-export class OAuthEnvironmentHandler implements AuthProviderRouteHandlers {
-  static mapConfig(
-    config: Config,
-    factoryFunc: (envConfig: Config) => AuthProviderRouteHandlers,
-  ) {
-    const envs = config.keys();
-    const handlers = new Map<string, AuthProviderRouteHandlers>();
-
-    for (const env of envs) {
-      const envConfig = config.getConfig(env);
-      const handler = factoryFunc(envConfig);
-      handlers.set(env, handler);
-    }
-
-    return new OAuthEnvironmentHandler(handlers);
-  }
-
-  constructor(
-    private readonly handlers: Map<string, AuthProviderRouteHandlers>,
-  ) {}
-
-  async start(req: express.Request, res: express.Response): Promise<void> {
-    const provider = this.getProviderForEnv(req);
-    await provider.start(req, res);
-  }
-
-  async frameHandler(
-    req: express.Request,
-    res: express.Response,
-  ): Promise<void> {
-    const provider = this.getProviderForEnv(req);
-    await provider.frameHandler(req, res);
-  }
-
-  async refresh(req: express.Request, res: express.Response): Promise<void> {
-    const provider = this.getProviderForEnv(req);
-    await provider.refresh?.(req, res);
-  }
-
-  async logout(req: express.Request, res: express.Response): Promise<void> {
-    const provider = this.getProviderForEnv(req);
-    await provider.logout?.(req, res);
-  }
-
-  private getRequestFromEnv(req: express.Request): string | undefined {
-    const reqEnv = req.query.env?.toString();
-    if (reqEnv) {
-      return reqEnv;
-    }
-    const stateParams = req.query.state?.toString();
-    if (!stateParams) {
-      return undefined;
-    }
-    const env = readState(stateParams).env;
-    return env;
-  }
-
-  private getProviderForEnv(req: express.Request): AuthProviderRouteHandlers {
-    const env: string | undefined = this.getRequestFromEnv(req);
-
-    if (!env) {
-      throw new InputError(`Must specify 'env' query to select environment`);
-    }
-
-    const handler = this.handlers.get(env);
-    if (!handler) {
-      throw new NotFoundError(
-        `No configuration available for the '${env}' environment of this provider.`,
-      );
-    }
-
-    return handler;
-  }
-}
+/**
+ * @public
+ * @deprecated import from `@backstage/plugin-auth-node` instead
+ */
+export const OAuthEnvironmentHandler = _OAuthEnvironmentHandler;
diff --git a/plugins/auth-backend/src/lib/oauth/helpers.test.ts b/plugins/auth-backend/src/lib/oauth/helpers.test.ts
index 58a3dcab05..c8db34e2cc 100644
--- a/plugins/auth-backend/src/lib/oauth/helpers.test.ts
+++ b/plugins/auth-backend/src/lib/oauth/helpers.test.ts
@@ -76,7 +76,7 @@ describe('OAuthProvider Utils', () => {
       } as unknown as express.Request;
       expect(() => {
         verifyNonce(mockRequest, 'providera');
-      }).toThrow('Invalid state passed via request');
+      }).toThrow('OAuth state is invalid, missing env');
     });
 
     it('should throw error if nonce mismatch', () => {
diff --git a/plugins/auth-backend/src/lib/oauth/helpers.ts b/plugins/auth-backend/src/lib/oauth/helpers.ts
index 2b4e50b477..5e67b072e3 100644
--- a/plugins/auth-backend/src/lib/oauth/helpers.ts
+++ b/plugins/auth-backend/src/lib/oauth/helpers.ts
@@ -16,36 +16,28 @@
 
 import express from 'express';
 import { OAuthState } from './types';
-import pickBy from 'lodash/pickBy';
 import { CookieConfigurer } from '../../providers/types';
+import {
+  decodeOAuthState,
+  encodeOAuthState,
+} from '@backstage/plugin-auth-node';
 
-/** @public */
-export const readState = (stateString: string): OAuthState => {
-  const state = Object.fromEntries(
-    new URLSearchParams(Buffer.from(stateString, 'hex').toString('utf-8')),
-  );
-  if (
-    !state.nonce ||
-    !state.env ||
-    state.nonce?.length === 0 ||
-    state.env?.length === 0
-  ) {
-    throw Error(`Invalid state passed via request`);
-  }
+/**
+ * @public
+ * @deprecated Use `decodeOAuthState` from `@backstage/plugin-auth-node` instead
+ */
+export const readState = decodeOAuthState;
 
-  return state as OAuthState;
-};
+/**
+ * @public
+ * @deprecated Use `encodeOAuthState` from `@backstage/plugin-auth-node` instead
+ */
+export const encodeState = encodeOAuthState;
 
-/** @public */
-export const encodeState = (state: OAuthState): string => {
-  const stateString = new URLSearchParams(
-    pickBy<string>(state, value => value !== undefined),
-  ).toString();
-
-  return Buffer.from(stateString, 'utf-8').toString('hex');
-};
-
-/** @public */
+/**
+ * @public
+ * @deprecated Use inline logic to make sure the session and state nonce matches instead.
+ */
 export const verifyNonce = (req: express.Request, providerId: string) => {
   const cookieNonce = req.cookies[`${providerId}-nonce`];
   const state: OAuthState = readState(req.query.state?.toString() ?? '');
diff --git a/plugins/auth-backend/src/lib/oauth/types.ts b/plugins/auth-backend/src/lib/oauth/types.ts
index e960af2988..b7205c9b85 100644
--- a/plugins/auth-backend/src/lib/oauth/types.ts
+++ b/plugins/auth-backend/src/lib/oauth/types.ts
@@ -16,13 +16,17 @@
 
 import express from 'express';
 import { Profile as PassportProfile } from 'passport';
-import { BackstageSignInResult } from '@backstage/plugin-auth-node';
+import {
+  BackstageSignInResult,
+  OAuthState as _OAuthState,
+} from '@backstage/plugin-auth-node';
 import { OAuthStartResponse, ProfileInfo } from '../../providers/types';
 
 /**
  * Common options for passport.js-based OAuth providers
  *
  * @public
+ * @deprecated No longer in use
  */
 export type OAuthProviderOptions = {
   /**
@@ -39,12 +43,16 @@ export type OAuthProviderOptions = {
   callbackUrl: string;
 };
 
-/** @public */
+/**
+ * @public
+ * @deprecated Use `OAuthAuthenticatorResult<PassportProfile>` from `@backstage/plugin-auth-node` instead
+ */
 export type OAuthResult = {
   fullProfile: PassportProfile;
   params: {
     id_token?: string;
     scope: string;
+    token_type?: string;
     expires_in: number;
   };
   accessToken: string;
@@ -52,9 +60,8 @@ export type OAuthResult = {
 };
 
 /**
- * The expected response from an OAuth flow.
- *
  * @public
+ * @deprecated Use `ClientAuthResponse` from `@backstage/plugin-auth-node` instead
  */
 export type OAuthResponse = {
   profile: ProfileInfo;
@@ -62,7 +69,10 @@ export type OAuthResponse = {
   backstageIdentity?: BackstageSignInResult;
 };
 
-/** @public */
+/**
+ * @public
+ * @deprecated Use `createOAuthRouteHandlers` from `@backstage/plugin-auth-node` instead
+ */
 export type OAuthProviderInfo = {
   /**
    * An access token issued for the signed in user.
@@ -82,41 +92,41 @@ export type OAuthProviderInfo = {
   scope: string;
 };
 
-/** @public */
-export type OAuthState = {
-  /* A type for the serialized value in the `state` parameter of the OAuth authorization flow
-   */
-  nonce: string;
-  env: string;
-  origin?: string;
-  scope?: string;
-  redirectUrl?: string;
-  flow?: string;
-};
+/**
+ * @public
+ * @deprecated import from `@backstage/plugin-auth-node` instead
+ */
+export type OAuthState = _OAuthState;
 
-/** @public */
+/**
+ * @public
+ * @deprecated Use `createOAuthRouteHandlers` from `@backstage/plugin-auth-node` instead
+ */
 export type OAuthStartRequest = express.Request<{}> & {
   scope: string;
   state: OAuthState;
 };
 
-/** @public */
+/**
+ * @public
+ * @deprecated Use `createOAuthRouteHandlers` from `@backstage/plugin-auth-node` instead
+ */
 export type OAuthRefreshRequest = express.Request<{}> & {
   scope: string;
   refreshToken: string;
 };
 
-/** @public */
+/**
+ * @public
+ * @deprecated Use `createOAuthRouteHandlers` from `@backstage/plugin-auth-node` instead
+ */
 export type OAuthLogoutRequest = express.Request<{}> & {
   refreshToken: string;
 };
 
 /**
- * Any OAuth provider needs to implement this interface which has provider specific
- * handlers for different methods to perform authentication, get access tokens,
- * refresh tokens and perform sign out.
- *
  * @public
+ * @deprecated Use `createOAuthRouteHandlers` from `@backstage/plugin-auth-node` instead
  */
 export interface OAuthHandlers {
   /**
diff --git a/plugins/auth-backend/src/lib/resolvers/CatalogAuthResolverContext.ts b/plugins/auth-backend/src/lib/resolvers/CatalogAuthResolverContext.ts
index cbc2439563..7d22526193 100644
--- a/plugins/auth-backend/src/lib/resolvers/CatalogAuthResolverContext.ts
+++ b/plugins/auth-backend/src/lib/resolvers/CatalogAuthResolverContext.ts
@@ -24,7 +24,7 @@ import {
   stringifyEntityRef,
 } from '@backstage/catalog-model';
 import { ConflictError, InputError, NotFoundError } from '@backstage/errors';
-import { Logger } from 'winston';
+import { LoggerService } from '@backstage/backend-plugin-api';
 import { TokenIssuer, TokenParams } from '../../identity/types';
 import { AuthResolverContext } from '../../providers';
 import { AuthResolverCatalogUserQuery } from '../../providers/types';
@@ -54,7 +54,7 @@ export function getDefaultOwnershipEntityRefs(entity: Entity) {
  */
 export class CatalogAuthResolverContext implements AuthResolverContext {
   static create(options: {
-    logger: Logger;
+    logger: LoggerService;
     catalogApi: CatalogApi;
     tokenIssuer: TokenIssuer;
     tokenManager: TokenManager;
@@ -73,7 +73,7 @@ export class CatalogAuthResolverContext implements AuthResolverContext {
   }
 
   private constructor(
-    public readonly logger: Logger,
+    public readonly logger: LoggerService,
     public readonly tokenIssuer: TokenIssuer,
     public readonly catalogIdentityClient: CatalogIdentityClient,
     private readonly catalogApi: CatalogApi,
diff --git a/plugins/auth-backend/src/providers/gcp-iap/helpers.test.ts b/plugins/auth-backend/src/providers/gcp-iap/helpers.test.ts
deleted file mode 100644
index 0162366f61..0000000000
--- a/plugins/auth-backend/src/providers/gcp-iap/helpers.test.ts
+++ /dev/null
@@ -1,134 +0,0 @@
-/*
- * 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 { ConflictError } from '@backstage/errors';
-import { OAuth2Client } from 'google-auth-library';
-import { createTokenValidator, parseRequestToken } from './helpers';
-
-const validJwt =
-  'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCIsImtpZCI6ImZvbyIsImlzcyI6ImZvbyJ9.eyJzdWIiOiIxMjM0NTY3ODkwIiwibmFtZSI6IkpvaG4gRG9lIiwiaWF0IjoxNTE2MjM5MDIyfQ.T2BNS4G-6RoiFnXc8Q8TiwdWzTpNitY8jcsGM3N3-Yo';
-
-beforeEach(() => {
-  jest.clearAllMocks();
-});
-
-describe('helpers', () => {
-  describe('createTokenValidator', () => {
-    it('runs the happy path', async () => {
-      const mockClient = {
-        getIapPublicKeys: async () => ({ pubkeys: '' }),
-        verifySignedJwtWithCertsAsync: async () => ({
-          getPayload: () => ({ sub: 's', email: 'e@mail.com' }),
-        }),
-      };
-      const validator = createTokenValidator(
-        'a',
-        mockClient as unknown as OAuth2Client,
-      );
-      await expect(validator(validJwt)).resolves.toMatchObject({
-        sub: 's',
-        email: 'e@mail.com',
-      });
-    });
-
-    it('throws if the client throws', async () => {
-      const mockClient = {
-        getIapPublicKeys: async () => {
-          throw new TypeError('bam');
-        },
-      };
-      const validator = createTokenValidator(
-        'a',
-        mockClient as unknown as OAuth2Client,
-      );
-      await expect(validator(validJwt)).rejects.toThrow(TypeError);
-    });
-
-    it('rejects empty payload', async () => {
-      const mockClient = {
-        getIapPublicKeys: async () => ({ pubkeys: '' }),
-        verifySignedJwtWithCertsAsync: async () => ({
-          getPayload: () => undefined,
-        }),
-      };
-      const validator = createTokenValidator(
-        'a',
-        mockClient as unknown as OAuth2Client,
-      );
-      await expect(validator(validJwt)).rejects.toMatchObject({
-        name: 'TypeError',
-        message: 'Token had no payload',
-      });
-    });
-  });
-
-  describe('parseRequestToken', () => {
-    it('runs the happy path', async () => {
-      await expect(
-        parseRequestToken(
-          validJwt,
-          async () => ({ sub: 's', email: 'e@mail.com' } as any),
-        ),
-      ).resolves.toMatchObject({
-        iapToken: {
-          sub: 's',
-          email: 'e@mail.com',
-        },
-      });
-    });
-
-    it('rejects bad tokens', async () => {
-      await expect(
-        parseRequestToken(7, undefined as any),
-      ).rejects.toMatchObject({
-        name: 'AuthenticationError',
-        message: 'Missing Google IAP header',
-      });
-      await expect(
-        parseRequestToken(undefined, undefined as any),
-      ).rejects.toMatchObject({
-        name: 'AuthenticationError',
-        message: 'Missing Google IAP header',
-      });
-      await expect(
-        parseRequestToken('', undefined as any),
-      ).rejects.toMatchObject({
-        name: 'AuthenticationError',
-        message: 'Missing Google IAP header',
-      });
-    });
-
-    it('translates validator errors', async () => {
-      await expect(
-        parseRequestToken(validJwt, async () => {
-          throw new ConflictError('Ouch');
-        }),
-      ).rejects.toMatchObject({
-        name: 'AuthenticationError',
-        message: 'Google IAP token verification failed, ConflictError: Ouch',
-      });
-    });
-
-    it('rejects bad token payloads', async () => {
-      await expect(
-        parseRequestToken(validJwt, async () => ({ sub: 'a' } as any)),
-      ).rejects.toMatchObject({
-        name: 'AuthenticationError',
-        message: 'Google IAP token payload is missing sub and/or email claim',
-      });
-    });
-  });
-});
diff --git a/plugins/auth-backend/src/providers/gcp-iap/helpers.ts b/plugins/auth-backend/src/providers/gcp-iap/helpers.ts
deleted file mode 100644
index 26d9a8c904..0000000000
--- a/plugins/auth-backend/src/providers/gcp-iap/helpers.ts
+++ /dev/null
@@ -1,82 +0,0 @@
-/*
- * 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 { AuthenticationError } from '@backstage/errors';
-import { OAuth2Client, TokenPayload } from 'google-auth-library';
-import { AuthHandler } from '../types';
-import { GcpIapResult } from './types';
-
-export function createTokenValidator(
-  audience: string,
-  mockClient?: OAuth2Client,
-): (token: string) => Promise<TokenPayload> {
-  const client = mockClient ?? new OAuth2Client();
-
-  return async function tokenValidator(token) {
-    // TODO(freben): Rate limit the public key reads. It may be sensible to
-    // cache these for some reasonable time rather than asking for the public
-    // keys on every single sign-in. But since the rate of events here is so
-    // slow, I decided to keep it simple for now.
-    const response = await client.getIapPublicKeys();
-    const ticket = await client.verifySignedJwtWithCertsAsync(
-      token,
-      response.pubkeys,
-      audience,
-      ['https://cloud.google.com/iap'],
-    );
-
-    const payload = ticket.getPayload();
-    if (!payload) {
-      throw new TypeError('Token had no payload');
-    }
-
-    return payload;
-  };
-}
-
-export async function parseRequestToken(
-  jwtToken: unknown,
-  tokenValidator: (token: string) => Promise<TokenPayload>,
-): Promise<GcpIapResult> {
-  if (typeof jwtToken !== 'string' || !jwtToken) {
-    throw new AuthenticationError('Missing Google IAP header');
-  }
-
-  let payload: TokenPayload;
-  try {
-    payload = await tokenValidator(jwtToken);
-  } catch (e) {
-    throw new AuthenticationError(`Google IAP token verification failed, ${e}`);
-  }
-
-  if (!payload.sub || !payload.email) {
-    throw new AuthenticationError(
-      'Google IAP token payload is missing sub and/or email claim',
-    );
-  }
-
-  return {
-    iapToken: {
-      ...payload,
-      sub: payload.sub,
-      email: payload.email,
-    },
-  };
-}
-
-export const defaultAuthHandler: AuthHandler<GcpIapResult> = async ({
-  iapToken,
-}) => ({ profile: { email: iapToken.email } });
diff --git a/plugins/auth-backend/src/providers/gcp-iap/provider.test.ts b/plugins/auth-backend/src/providers/gcp-iap/provider.test.ts
deleted file mode 100644
index c01db3a853..0000000000
--- a/plugins/auth-backend/src/providers/gcp-iap/provider.test.ts
+++ /dev/null
@@ -1,75 +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 express from 'express';
-import request from 'supertest';
-import { AuthResolverContext } from '../types';
-import { GcpIapProvider } from './provider';
-import { DEFAULT_IAP_JWT_HEADER } from './types';
-
-beforeEach(() => {
-  jest.clearAllMocks();
-});
-
-describe('GcpIapProvider', () => {
-  const authHandler = jest.fn();
-  const signInResolver = jest.fn();
-  const tokenValidator = jest.fn();
-
-  it.each([undefined, 'x-custom-header'])(
-    'runs the happy path',
-    async jwtHeader => {
-      const provider = new GcpIapProvider({
-        authHandler,
-        signInResolver,
-        tokenValidator,
-        resolverContext: {} as AuthResolverContext,
-        jwtHeader: jwtHeader,
-      });
-
-      // { "sub": "user:default/me", "ent": ["group:default/home"] }
-      const backstageToken =
-        'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJzdWIiOiJ1c2VyOmRlZmF1bHQvbWUiLCJlbnQiOlsiZ3JvdXA6ZGVmYXVsdC9ob21lIl19.CbmAKzFErGmtsnpRxyPc7dHv7WEjb5lY6206YCzR_Rc';
-      const iapToken = { sub: 's', email: 'e@mail.com' };
-
-      authHandler.mockResolvedValueOnce({ email: 'e@mail.com' });
-      signInResolver.mockResolvedValueOnce({ token: backstageToken });
-      tokenValidator.mockResolvedValueOnce(iapToken);
-
-      const app = express();
-      app.use('/refresh', provider.refresh.bind(provider));
-
-      const header = jwtHeader || DEFAULT_IAP_JWT_HEADER;
-      const response = await request(app).get('/refresh').set(header, 'token');
-
-      expect(response.status).toBe(200);
-      expect(response.get('content-type')).toBe(
-        'application/json; charset=utf-8',
-      );
-      expect(response.body).toEqual({
-        backstageIdentity: {
-          token: backstageToken,
-          identity: {
-            type: 'user',
-            userEntityRef: 'user:default/me',
-            ownershipEntityRefs: ['group:default/home'],
-          },
-        },
-        providerInfo: { iapToken },
-      });
-    },
-  );
-});
diff --git a/plugins/auth-backend/src/providers/gcp-iap/provider.ts b/plugins/auth-backend/src/providers/gcp-iap/provider.ts
index 7e77853737..db4d9195b2 100644
--- a/plugins/auth-backend/src/providers/gcp-iap/provider.ts
+++ b/plugins/auth-backend/src/providers/gcp-iap/provider.ts
@@ -14,70 +14,11 @@
  * limitations under the License.
  */
 
-import express from 'express';
-import { TokenPayload } from 'google-auth-library';
+import { gcpIapAuthenticator } from '@backstage/plugin-auth-backend-module-gcp-iap-provider';
+import { createProxyAuthProviderFactory } from '@backstage/plugin-auth-node';
 import { createAuthProviderIntegration } from '../createAuthProviderIntegration';
-import { prepareBackstageIdentityResponse } from '../prepareBackstageIdentityResponse';
-import {
-  AuthHandler,
-  AuthProviderRouteHandlers,
-  AuthResolverContext,
-  SignInResolver,
-} from '../types';
-import {
-  createTokenValidator,
-  defaultAuthHandler,
-  parseRequestToken,
-} from './helpers';
-import { GcpIapResponse, GcpIapResult, DEFAULT_IAP_JWT_HEADER } from './types';
-
-export class GcpIapProvider implements AuthProviderRouteHandlers {
-  private readonly authHandler: AuthHandler<GcpIapResult>;
-  private readonly signInResolver: SignInResolver<GcpIapResult>;
-  private readonly tokenValidator: (token: string) => Promise<TokenPayload>;
-  private readonly resolverContext: AuthResolverContext;
-  private readonly jwtHeader: string;
-
-  constructor(options: {
-    authHandler: AuthHandler<GcpIapResult>;
-    signInResolver: SignInResolver<GcpIapResult>;
-    tokenValidator: (token: string) => Promise<TokenPayload>;
-    resolverContext: AuthResolverContext;
-    jwtHeader?: string;
-  }) {
-    this.authHandler = options.authHandler;
-    this.signInResolver = options.signInResolver;
-    this.tokenValidator = options.tokenValidator;
-    this.resolverContext = options.resolverContext;
-    this.jwtHeader = options?.jwtHeader || DEFAULT_IAP_JWT_HEADER;
-  }
-
-  async start() {}
-
-  async frameHandler() {}
-
-  async refresh(req: express.Request, res: express.Response): Promise<void> {
-    const result = await parseRequestToken(
-      req.header(this.jwtHeader),
-      this.tokenValidator,
-    );
-
-    const { profile } = await this.authHandler(result, this.resolverContext);
-
-    const backstageIdentity = await this.signInResolver(
-      { profile, result },
-      this.resolverContext,
-    );
-
-    const response: GcpIapResponse = {
-      providerInfo: { iapToken: result.iapToken },
-      profile,
-      backstageIdentity: prepareBackstageIdentityResponse(backstageIdentity),
-    };
-
-    res.json(response);
-  }
-}
+import { AuthHandler, SignInResolver } from '../types';
+import { GcpIapResult } from './types';
 
 /**
  * Auth provider integration for Google Identity-Aware Proxy auth
@@ -104,21 +45,10 @@ export const gcpIap = createAuthProviderIntegration({
       resolver: SignInResolver<GcpIapResult>;
     };
   }) {
-    return ({ config, resolverContext }) => {
-      const audience = config.getString('audience');
-      const jwtHeader = config.getOptionalString('jwtHeader');
-
-      const authHandler = options.authHandler ?? defaultAuthHandler;
-      const signInResolver = options.signIn.resolver;
-      const tokenValidator = createTokenValidator(audience);
-
-      return new GcpIapProvider({
-        authHandler,
-        signInResolver,
-        tokenValidator,
-        resolverContext,
-        jwtHeader,
-      });
-    };
+    return createProxyAuthProviderFactory({
+      authenticator: gcpIapAuthenticator,
+      profileTransform: options?.authHandler,
+      signInResolver: options?.signIn?.resolver,
+    });
   },
 });
diff --git a/plugins/auth-backend/src/providers/gcp-iap/types.ts b/plugins/auth-backend/src/providers/gcp-iap/types.ts
index 6519de64ac..b1f69318fc 100644
--- a/plugins/auth-backend/src/providers/gcp-iap/types.ts
+++ b/plugins/auth-backend/src/providers/gcp-iap/types.ts
@@ -14,58 +14,24 @@
  * limitations under the License.
  */
 
-import { JsonValue } from '@backstage/types';
-import { AuthResponse } from '../types';
-
-/**
- * The header name used by the IAP.
- */
-export const DEFAULT_IAP_JWT_HEADER = 'x-goog-iap-jwt-assertion';
+import {
+  GcpIapTokenInfo as _GcpIapTokenInfo,
+  GcpIapResult as _GcpIapResult,
+} from '@backstage/plugin-auth-backend-module-gcp-iap-provider';
 
 /**
  * The data extracted from an IAP token.
  *
  * @public
+ * @deprecated import from `@backstage/plugin-auth-backend-module-gcp-iap-provider` instead
  */
-export type GcpIapTokenInfo = {
-  /**
-   * The unique, stable identifier for the user.
-   */
-  sub: string;
-  /**
-   * User email address.
-   */
-  email: string;
-  /**
-   * Other fields.
-   */
-  [key: string]: JsonValue;
-};
+export type GcpIapTokenInfo = _GcpIapTokenInfo;
 
 /**
  * The result of the initial auth challenge. This is the input to the auth
  * callbacks.
  *
  * @public
+ * @deprecated import from `@backstage/plugin-auth-backend-module-gcp-iap-provider` instead
  */
-export type GcpIapResult = {
-  /**
-   * The data extracted from the IAP token header.
-   */
-  iapToken: GcpIapTokenInfo;
-};
-
-/**
- * The provider info to return to the frontend.
- */
-export type GcpIapProviderInfo = {
-  /**
-   * The data extracted from the IAP token header.
-   */
-  iapToken: GcpIapTokenInfo;
-};
-
-/**
- * The shape of the response to return to callers.
- */
-export type GcpIapResponse = AuthResponse<GcpIapProviderInfo>;
+export type GcpIapResult = _GcpIapResult;
diff --git a/plugins/auth-backend/src/providers/github/provider.test.ts b/plugins/auth-backend/src/providers/github/provider.test.ts
deleted file mode 100644
index ff750223d3..0000000000
--- a/plugins/auth-backend/src/providers/github/provider.test.ts
+++ /dev/null
@@ -1,410 +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 { Profile as PassportProfile } from 'passport';
-import { GithubAuthProvider, GithubOAuthResult, github } from './provider';
-import * as helpers from '../../lib/passport/PassportStrategyHelper';
-import { makeProfileInfo } from '../../lib/passport/PassportStrategyHelper';
-import { OAuthStartRequest, encodeState } from '../../lib/oauth';
-import { AuthResolverContext } from '../types';
-
-jest.mock('../../lib/passport/PassportStrategyHelper', () => {
-  return {
-    ...jest.requireActual('../../lib/passport/PassportStrategyHelper'),
-    executeFrameHandlerStrategy: jest.fn(),
-    executeRefreshTokenStrategy: jest.fn(),
-    executeFetchUserProfileStrategy: jest.fn(),
-  };
-});
-
-const mockFrameHandler = jest.spyOn(
-  helpers,
-  'executeFrameHandlerStrategy',
-) as unknown as jest.MockedFunction<
-  () => Promise<{
-    result: GithubOAuthResult;
-    privateInfo: { refreshToken?: string };
-  }>
->;
-
-describe('GithubAuthProvider', () => {
-  const provider = new GithubAuthProvider({
-    resolverContext: {
-      signInWithCatalogUser: jest.fn(({ entityRef }) => ({
-        token: `token-for-user:${entityRef.name}`,
-      })),
-    } as unknown as AuthResolverContext,
-    signInResolver: github.resolvers.usernameMatchingUserEntityName(),
-    authHandler: async ({ fullProfile }) => ({
-      profile: makeProfileInfo(fullProfile),
-    }),
-    stateEncoder: async (req: OAuthStartRequest) => ({
-      encodedState: encodeState(req.state),
-    }),
-    callbackUrl: 'mock',
-    clientId: 'mock',
-    clientSecret: 'mock',
-  });
-
-  describe('should transform to type OAuthResponse', () => {
-    it('when all fields are present, it should be able to map them', async () => {
-      const accessToken = '19xasczxcm9n7gacn9jdgm19me';
-      const fullProfile = {
-        id: 'uid-123',
-        username: 'jimmymarkum',
-        provider: 'github',
-        displayName: 'Jimmy Markum',
-        emails: [
-          {
-            value: 'jimmymarkum@gmail.com',
-          },
-        ],
-        photos: [
-          {
-            value:
-              'https://a1cf74336522e87f135f-2f21ace9a6cf0052456644b80fa06d4f.ssl.cf2.rackcdn.com/images/characters_opt/p-mystic-river-sean-penn.jpg',
-          },
-        ],
-      };
-
-      const params = {
-        scope: 'read:scope',
-      };
-
-      const expected = {
-        backstageIdentity: {
-          token: 'token-for-user:jimmymarkum',
-        },
-        providerInfo: {
-          accessToken: '19xasczxcm9n7gacn9jdgm19me',
-          scope: 'read:scope',
-          expiresInSeconds: 3600,
-        },
-        profile: {
-          email: 'jimmymarkum@gmail.com',
-          displayName: 'Jimmy Markum',
-          picture:
-            'https://a1cf74336522e87f135f-2f21ace9a6cf0052456644b80fa06d4f.ssl.cf2.rackcdn.com/images/characters_opt/p-mystic-river-sean-penn.jpg',
-        },
-      };
-
-      mockFrameHandler.mockResolvedValueOnce({
-        result: { fullProfile, accessToken, params },
-        privateInfo: {},
-      });
-      const { response } = await provider.handler({} as any);
-      expect(response).toEqual(expected);
-    });
-
-    it('when "email" is missing, it should be able to create the profile without it', async () => {
-      const accessToken = '19xasczxcm9n7gacn9jdgm19me';
-      const fullProfile = {
-        id: 'uid-123',
-        username: 'jimmymarkum',
-        provider: 'github',
-        displayName: 'Jimmy Markum',
-        emails: null,
-        photos: [
-          {
-            value:
-              'https://a1cf74336522e87f135f-2f21ace9a6cf0052456644b80fa06d4f.ssl.cf2.rackcdn.com/images/characters_opt/p-mystic-river-sean-penn.jpg',
-          },
-        ],
-      } as unknown as PassportProfile;
-
-      const params = {
-        scope: 'read:scope',
-      };
-
-      const expected = {
-        backstageIdentity: {
-          token: 'token-for-user:jimmymarkum',
-        },
-        providerInfo: {
-          accessToken: '19xasczxcm9n7gacn9jdgm19me',
-          scope: 'read:scope',
-          expiresInSeconds: 3600,
-        },
-        profile: {
-          displayName: 'Jimmy Markum',
-          picture:
-            'https://a1cf74336522e87f135f-2f21ace9a6cf0052456644b80fa06d4f.ssl.cf2.rackcdn.com/images/characters_opt/p-mystic-river-sean-penn.jpg',
-        },
-      };
-
-      mockFrameHandler.mockResolvedValueOnce({
-        result: { fullProfile, accessToken, params },
-        privateInfo: {},
-      });
-      const { response } = await provider.handler({} as any);
-      expect(response).toEqual(expected);
-    });
-
-    it('when "displayName" is missing, it should be able to create the profile and map "displayName" with "username"', async () => {
-      const accessToken = '19xasczxcm9n7gacn9jdgm19me';
-      const fullProfile = {
-        id: 'uid-123',
-        username: 'jimmymarkum',
-        provider: 'github',
-        displayName: null,
-        emails: null,
-        photos: [
-          {
-            value:
-              'https://a1cf74336522e87f135f-2f21ace9a6cf0052456644b80fa06d4f.ssl.cf2.rackcdn.com/images/characters_opt/p-mystic-river-sean-penn.jpg',
-          },
-        ],
-      } as unknown as PassportProfile;
-
-      const params = {
-        scope: 'read:scope',
-      };
-      const expected = {
-        backstageIdentity: {
-          token: 'token-for-user:jimmymarkum',
-        },
-        providerInfo: {
-          accessToken: '19xasczxcm9n7gacn9jdgm19me',
-          scope: 'read:scope',
-          expiresInSeconds: 3600,
-        },
-        profile: {
-          displayName: 'jimmymarkum',
-          picture:
-            'https://a1cf74336522e87f135f-2f21ace9a6cf0052456644b80fa06d4f.ssl.cf2.rackcdn.com/images/characters_opt/p-mystic-river-sean-penn.jpg',
-        },
-      };
-
-      mockFrameHandler.mockResolvedValueOnce({
-        result: { fullProfile, accessToken, params },
-        privateInfo: {},
-      });
-      const { response } = await provider.handler({} as any);
-      expect(response).toEqual(expected);
-    });
-
-    it('when "photos" is missing, it should be able to create the profile without it', async () => {
-      const accessToken =
-        'ajakljsdoiahoawxbrouawucmbawe.awkxjemaneasdxwe.sodijxqeqwexeqwxe';
-      const fullProfile = {
-        id: 'ipd12039',
-        username: 'daveboyle',
-        provider: 'github',
-        displayName: 'Dave Boyle',
-        emails: [
-          {
-            value: 'daveboyle@github.org',
-          },
-        ],
-      };
-
-      const params = {
-        scope: 'read:user',
-      };
-
-      const expected = {
-        backstageIdentity: {
-          token: 'token-for-user:daveboyle',
-        },
-        providerInfo: {
-          accessToken:
-            'ajakljsdoiahoawxbrouawucmbawe.awkxjemaneasdxwe.sodijxqeqwexeqwxe',
-          scope: 'read:user',
-          expiresInSeconds: 3600,
-        },
-        profile: {
-          displayName: 'Dave Boyle',
-          email: 'daveboyle@github.org',
-        },
-      };
-
-      mockFrameHandler.mockResolvedValueOnce({
-        result: { fullProfile, accessToken, params },
-        privateInfo: {},
-      });
-      const { response } = await provider.handler({} as any);
-      expect(response).toEqual(expected);
-    });
-
-    it('should forward a refresh token', async () => {
-      mockFrameHandler.mockResolvedValueOnce({
-        result: {
-          fullProfile: {
-            id: 'ipd12039',
-            username: 'daveboyle',
-            provider: 'github',
-            displayName: 'Dave Boyle',
-          },
-          accessToken: 'a.b.c',
-          params: {
-            scope: 'read:user',
-            expires_in: '123',
-          },
-        },
-        privateInfo: { refreshToken: 'refresh-me' },
-      });
-
-      const response = await provider.handler({} as any);
-
-      expect(response).toEqual({
-        response: {
-          backstageIdentity: {
-            token: 'token-for-user:daveboyle',
-          },
-          providerInfo: {
-            accessToken: 'a.b.c',
-            scope: 'read:user',
-            expiresInSeconds: 123,
-          },
-          profile: {
-            displayName: 'Dave Boyle',
-          },
-        },
-        refreshToken: 'refresh-me',
-      });
-    });
-
-    it('should fail if username is not available', async () => {
-      mockFrameHandler.mockResolvedValueOnce({
-        result: {
-          fullProfile: {
-            id: 'ipd12039',
-            provider: 'github',
-            displayName: 'Dave Boyle',
-          },
-          accessToken: 'a.b.c',
-          params: {
-            scope: 'read:user',
-            expires_in: '123',
-          },
-        },
-        privateInfo: { refreshToken: 'refresh-me' },
-      });
-
-      await expect(provider.handler({} as any)).rejects.toThrow(
-        'GitHub user profile does not contain a username',
-      );
-    });
-
-    it('should forward a new refresh token on refresh', async () => {
-      const mockRefreshToken = jest.spyOn(
-        helpers,
-        'executeRefreshTokenStrategy',
-      ) as unknown as jest.MockedFunction<() => Promise<{}>>;
-
-      mockRefreshToken.mockResolvedValueOnce({
-        accessToken: 'a.b.c',
-        refreshToken: 'dont-forget-to-send-refresh',
-        params: {
-          id_token: 'my-id',
-          expires_in: '123',
-          scope: 'read_user',
-        },
-      });
-
-      const mockUserProfile = jest.spyOn(
-        helpers,
-        'executeFetchUserProfileStrategy',
-      ) as unknown as jest.MockedFunction<() => Promise<PassportProfile>>;
-
-      mockUserProfile.mockResolvedValueOnce({
-        id: 'mockid',
-        username: 'mockuser',
-        provider: 'github',
-        displayName: 'Mocked User',
-        emails: [
-          {
-            value: 'mockuser@gmail.com',
-          },
-        ],
-      });
-
-      const result = await provider.refresh({ scope: 'actual-scope' } as any);
-
-      expect(result).toEqual({
-        response: {
-          backstageIdentity: {
-            token: 'token-for-user:mockuser',
-          },
-          profile: {
-            displayName: 'Mocked User',
-            email: 'mockuser@gmail.com',
-            picture: undefined,
-          },
-          providerInfo: {
-            accessToken: 'a.b.c',
-            expiresInSeconds: 123,
-            scope: 'actual-scope',
-          },
-        },
-        refreshToken: 'dont-forget-to-send-refresh',
-      });
-
-      mockRefreshToken.mockRestore();
-      mockUserProfile.mockRestore();
-    });
-
-    it('should use access token as refresh token', async () => {
-      const mockUserProfile = jest.spyOn(
-        helpers,
-        'executeFetchUserProfileStrategy',
-      ) as unknown as jest.MockedFunction<() => Promise<PassportProfile>>;
-
-      mockUserProfile.mockResolvedValueOnce({
-        id: 'mockid',
-        username: 'mockuser',
-        provider: 'github',
-        displayName: 'Mocked User',
-        emails: [
-          {
-            value: 'mockuser@gmail.com',
-          },
-        ],
-      });
-
-      const result = await provider.refresh({
-        refreshToken: 'access-token.le-token',
-        scope: 'the-scope',
-      } as any);
-
-      expect(mockUserProfile).toHaveBeenCalledTimes(1);
-      expect(mockUserProfile).toHaveBeenCalledWith(
-        expect.anything(),
-        'le-token',
-      );
-      expect(result).toEqual({
-        response: {
-          backstageIdentity: {
-            token: 'token-for-user:mockuser',
-          },
-          profile: {
-            displayName: 'Mocked User',
-            email: 'mockuser@gmail.com',
-            picture: undefined,
-          },
-          providerInfo: {
-            accessToken: 'le-token',
-            expiresInSeconds: 3600,
-            scope: 'the-scope',
-          },
-        },
-        refreshToken: 'access-token.le-token',
-      });
-
-      mockUserProfile.mockRestore();
-    });
-  });
-});
diff --git a/plugins/auth-backend/src/providers/github/provider.ts b/plugins/auth-backend/src/providers/github/provider.ts
index 11a71ca018..51595b0428 100644
--- a/plugins/auth-backend/src/providers/github/provider.ts
+++ b/plugins/auth-backend/src/providers/github/provider.ts
@@ -14,41 +14,16 @@
  * limitations under the License.
  */
 
-import express from 'express';
 import { Profile as PassportProfile } from 'passport';
-import { Strategy as GithubStrategy } from 'passport-github2';
-import {
-  executeFetchUserProfileStrategy,
-  executeFrameHandlerStrategy,
-  executeRedirectStrategy,
-  executeRefreshTokenStrategy,
-  makeProfileInfo,
-  PassportDoneCallback,
-} from '../../lib/passport';
-import {
-  OAuthStartResponse,
-  AuthHandler,
-  SignInResolver,
-  StateEncoder,
-  AuthResolverContext,
-} from '../types';
-import {
-  OAuthAdapter,
-  OAuthProviderOptions,
-  OAuthHandlers,
-  OAuthEnvironmentHandler,
-  OAuthStartRequest,
-  encodeState,
-  OAuthRefreshRequest,
-} from '../../lib/oauth';
+import { AuthHandler, StateEncoder } from '../types';
 import { createAuthProviderIntegration } from '../createAuthProviderIntegration';
-import { BACKSTAGE_SESSION_EXPIRATION } from '../../lib/session';
-
-const ACCESS_TOKEN_PREFIX = 'access-token.';
-
-type PrivateInfo = {
-  refreshToken?: string;
-};
+import {
+  createOAuthProviderFactory,
+  OAuthAuthenticatorResult,
+  ProfileTransform,
+  SignInResolver,
+} from '@backstage/plugin-auth-node';
+import { githubAuthenticator } from '@backstage/plugin-auth-backend-module-github-provider';
 
 /** @public */
 export type GithubOAuthResult = {
@@ -62,170 +37,6 @@ export type GithubOAuthResult = {
   refreshToken?: string;
 };
 
-export type GithubAuthProviderOptions = OAuthProviderOptions & {
-  tokenUrl?: string;
-  userProfileUrl?: string;
-  authorizationUrl?: string;
-  signInResolver?: SignInResolver<GithubOAuthResult>;
-  authHandler: AuthHandler<GithubOAuthResult>;
-  stateEncoder: StateEncoder;
-  resolverContext: AuthResolverContext;
-};
-
-export class GithubAuthProvider implements OAuthHandlers {
-  private readonly _strategy: GithubStrategy;
-  private readonly signInResolver?: SignInResolver<GithubOAuthResult>;
-  private readonly authHandler: AuthHandler<GithubOAuthResult>;
-  private readonly resolverContext: AuthResolverContext;
-  private readonly stateEncoder: StateEncoder;
-
-  constructor(options: GithubAuthProviderOptions) {
-    this.signInResolver = options.signInResolver;
-    this.authHandler = options.authHandler;
-    this.stateEncoder = options.stateEncoder;
-    this.resolverContext = options.resolverContext;
-    this._strategy = new GithubStrategy(
-      {
-        clientID: options.clientId,
-        clientSecret: options.clientSecret,
-        callbackURL: options.callbackUrl,
-        tokenURL: options.tokenUrl,
-        userProfileURL: options.userProfileUrl,
-        authorizationURL: options.authorizationUrl,
-      },
-      (
-        accessToken: any,
-        refreshToken: any,
-        params: any,
-        fullProfile: any,
-        done: PassportDoneCallback<GithubOAuthResult, PrivateInfo>,
-      ) => {
-        done(undefined, { fullProfile, params, accessToken }, { refreshToken });
-      },
-    );
-  }
-
-  async start(req: OAuthStartRequest): Promise<OAuthStartResponse> {
-    return await executeRedirectStrategy(req, this._strategy, {
-      scope: req.scope,
-      state: (await this.stateEncoder(req)).encodedState,
-    });
-  }
-
-  async handler(req: express.Request) {
-    const { result, privateInfo } = await executeFrameHandlerStrategy<
-      GithubOAuthResult,
-      PrivateInfo
-    >(req, this._strategy);
-
-    let refreshToken = privateInfo.refreshToken;
-
-    // If we do not have a real refresh token and we have a non-expiring
-    // access token, then we use that as our refresh token.
-    if (!refreshToken && !result.params.expires_in) {
-      refreshToken = ACCESS_TOKEN_PREFIX + result.accessToken;
-    }
-
-    return {
-      response: await this.handleResult(result),
-      refreshToken,
-    };
-  }
-
-  async refresh(req: OAuthRefreshRequest) {
-    // We've enable persisting scope in the OAuth provider, so scope here will
-    // be whatever was stored in the cookie
-    const { scope, refreshToken } = req;
-
-    // This is the OAuth App flow. A non-expiring access token is stored in the
-    // refresh token cookie. We use that token to fetch the user profile and
-    // refresh the Backstage session when needed.
-    if (refreshToken?.startsWith(ACCESS_TOKEN_PREFIX)) {
-      const accessToken = refreshToken.slice(ACCESS_TOKEN_PREFIX.length);
-
-      const fullProfile = await executeFetchUserProfileStrategy(
-        this._strategy,
-        accessToken,
-      ).catch(error => {
-        if (error.oauthError?.statusCode === 401) {
-          throw new Error('Invalid access token');
-        }
-        throw error;
-      });
-
-      return {
-        response: await this.handleResult({
-          fullProfile,
-          params: { scope },
-          accessToken,
-        }),
-        refreshToken,
-      };
-    }
-
-    // This is the App flow, which is close to a standard OAuth refresh flow. It has a
-    // pretty long session expiration, and it also ignores the requested scope, instead
-    // just allowing access to whatever is configured as part of the app installation.
-    const result = await executeRefreshTokenStrategy(
-      this._strategy,
-      refreshToken,
-      scope,
-    );
-    return {
-      response: await this.handleResult({
-        fullProfile: await executeFetchUserProfileStrategy(
-          this._strategy,
-          result.accessToken,
-        ),
-        params: { ...result.params, scope },
-        accessToken: result.accessToken,
-      }),
-      refreshToken: result.refreshToken,
-    };
-  }
-
-  private async handleResult(result: GithubOAuthResult) {
-    const { profile } = await this.authHandler(result, this.resolverContext);
-
-    const expiresInStr = result.params.expires_in;
-    let expiresInSeconds =
-      expiresInStr === undefined ? undefined : Number(expiresInStr);
-
-    let backstageIdentity = undefined;
-
-    if (this.signInResolver) {
-      backstageIdentity = await this.signInResolver(
-        {
-          result,
-          profile,
-        },
-        this.resolverContext,
-      );
-
-      // GitHub sessions last longer than Backstage sessions, so if we're using
-      // GitHub for sign-in, then we need to expire the sessions earlier
-      if (expiresInSeconds) {
-        expiresInSeconds = Math.min(
-          expiresInSeconds,
-          BACKSTAGE_SESSION_EXPIRATION,
-        );
-      } else {
-        expiresInSeconds = BACKSTAGE_SESSION_EXPIRATION;
-      }
-    }
-
-    return {
-      backstageIdentity,
-      providerInfo: {
-        accessToken: result.accessToken,
-        scope: result.params.scope,
-        expiresInSeconds,
-      },
-      profile,
-    };
-  }
-}
-
 /**
  * Auth provider integration for GitHub auth
  *
@@ -267,60 +78,55 @@ export const github = createAuthProviderIntegration({
      */
     stateEncoder?: StateEncoder;
   }) {
-    return ({ providerId, globalConfig, config, resolverContext }) =>
-      OAuthEnvironmentHandler.mapConfig(config, envConfig => {
-        const clientId = envConfig.getString('clientId');
-        const clientSecret = envConfig.getString('clientSecret');
-        const enterpriseInstanceUrl = envConfig
-          .getOptionalString('enterpriseInstanceUrl')
-          ?.replace(/\/$/, '');
-        const customCallbackUrl = envConfig.getOptionalString('callbackUrl');
-        const authorizationUrl = enterpriseInstanceUrl
-          ? `${enterpriseInstanceUrl}/login/oauth/authorize`
-          : undefined;
-        const tokenUrl = enterpriseInstanceUrl
-          ? `${enterpriseInstanceUrl}/login/oauth/access_token`
-          : undefined;
-        const userProfileUrl = enterpriseInstanceUrl
-          ? `${enterpriseInstanceUrl}/api/v3/user`
-          : undefined;
-        const callbackUrl =
-          customCallbackUrl ||
-          `${globalConfig.baseUrl}/${providerId}/handler/frame`;
-
-        const authHandler: AuthHandler<GithubOAuthResult> = options?.authHandler
-          ? options.authHandler
-          : async ({ fullProfile }) => ({
-              profile: makeProfileInfo(fullProfile),
-            });
-
-        const stateEncoder: StateEncoder =
-          options?.stateEncoder ??
-          (async (
-            req: OAuthStartRequest,
-          ): Promise<{ encodedState: string }> => {
-            return { encodedState: encodeState(req.state) };
-          });
-
-        const provider = new GithubAuthProvider({
-          clientId,
-          clientSecret,
-          callbackUrl,
-          tokenUrl,
-          userProfileUrl,
-          authorizationUrl,
-          signInResolver: options?.signIn?.resolver,
-          authHandler,
-          stateEncoder,
-          resolverContext,
-        });
-
-        return OAuthAdapter.fromConfig(globalConfig, provider, {
-          persistScopes: true,
-          providerId,
-          callbackUrl,
-        });
-      });
+    const authHandler = options?.authHandler;
+    const signInResolver = options?.signIn?.resolver;
+    return createOAuthProviderFactory({
+      authenticator: githubAuthenticator,
+      profileTransform:
+        authHandler &&
+        ((async (result, ctx) =>
+          authHandler!(
+            {
+              fullProfile: result.fullProfile,
+              accessToken: result.session.accessToken,
+              params: {
+                scope: result.session.scope,
+                expires_in: result.session.expiresInSeconds
+                  ? String(result.session.expiresInSeconds)
+                  : '',
+                refresh_token_expires_in: result.session
+                  .refreshTokenExpiresInSeconds
+                  ? String(result.session.refreshTokenExpiresInSeconds)
+                  : '',
+              },
+            },
+            ctx,
+          )) as ProfileTransform<OAuthAuthenticatorResult<PassportProfile>>),
+      signInResolver:
+        signInResolver &&
+        ((async ({ profile, result }, ctx) =>
+          signInResolver(
+            {
+              profile: profile,
+              result: {
+                fullProfile: result.fullProfile,
+                accessToken: result.session.accessToken,
+                refreshToken: result.session.refreshToken,
+                params: {
+                  scope: result.session.scope,
+                  expires_in: result.session.expiresInSeconds
+                    ? String(result.session.expiresInSeconds)
+                    : '',
+                  refresh_token_expires_in: result.session
+                    .refreshTokenExpiresInSeconds
+                    ? String(result.session.refreshTokenExpiresInSeconds)
+                    : '',
+                },
+              },
+            },
+            ctx,
+          )) as SignInResolver<OAuthAuthenticatorResult<PassportProfile>>),
+    });
   },
   resolvers: {
     /**
diff --git a/plugins/auth-backend/src/providers/gitlab/provider.test.ts b/plugins/auth-backend/src/providers/gitlab/provider.test.ts
deleted file mode 100644
index f9e1442661..0000000000
--- a/plugins/auth-backend/src/providers/gitlab/provider.test.ts
+++ /dev/null
@@ -1,210 +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 {
-  GitlabAuthProvider,
-  gitlabUsernameEntityNameSignInResolver,
-} from './provider';
-import * as helpers from '../../lib/passport/PassportStrategyHelper';
-import { PassportProfile } from '../../lib/passport/types';
-import { OAuthResult } from '../../lib/oauth';
-import { AuthResolverContext } from '../types';
-
-jest.mock('../../lib/passport/PassportStrategyHelper', () => {
-  return {
-    executeFrameHandlerStrategy: jest.fn(),
-    executeRefreshTokenStrategy: jest.fn(),
-    executeFetchUserProfileStrategy: jest.fn(),
-  };
-});
-
-const mockFrameHandler = jest.spyOn(
-  helpers,
-  'executeFrameHandlerStrategy',
-) as unknown as jest.MockedFunction<() => Promise<{ result: OAuthResult }>>;
-
-describe('GitlabAuthProvider', () => {
-  const provider = new GitlabAuthProvider({
-    clientId: 'mock',
-    clientSecret: 'mock',
-    callbackUrl: 'mock',
-    baseUrl: 'mock',
-    resolverContext: {
-      signInWithCatalogUser: jest.fn(async ({ entityRef }) => ({
-        token: `token-for-user:${entityRef.name}`,
-      })),
-    } as unknown as AuthResolverContext,
-    authHandler: async ({ fullProfile }) => ({
-      profile: {
-        email: fullProfile.emails![0]!.value,
-        displayName: fullProfile.displayName,
-        picture: 'http://gitlab.com/lols',
-      },
-    }),
-    signInResolver: gitlabUsernameEntityNameSignInResolver,
-  });
-
-  it('should transform to type OAuthResponse', async () => {
-    const tests = [
-      {
-        input: {
-          result: {
-            accessToken: '19xasczxcm9n7gacn9jdgm19me',
-            fullProfile: {
-              id: 'uid-123',
-              username: 'jimmymarkum',
-              provider: 'gitlab',
-              displayName: 'Jimmy Markum',
-              emails: [
-                {
-                  value: 'jimmymarkum@gmail.com',
-                },
-              ],
-              avatarUrl:
-                'https://a1cf74336522e87f135f-2f21ace9a6cf0052456644b80fa06d4f.ssl.cf2.rackcdn.com/images/characters_opt/p-mystic-river-sean-penn.jpg',
-            },
-            params: {
-              scope: 'user_read write_repository',
-              expires_in: 100,
-            },
-          },
-          privateInfo: {
-            refreshToken: 'gacn9jdgm19me19xasczxcm9n7',
-          },
-        },
-        expect: {
-          backstageIdentity: {
-            token: 'token-for-user:jimmymarkum',
-          },
-          providerInfo: {
-            accessToken: '19xasczxcm9n7gacn9jdgm19me',
-            expiresInSeconds: 100,
-            scope: 'user_read write_repository',
-            idToken: undefined,
-          },
-          profile: {
-            email: 'jimmymarkum@gmail.com',
-            displayName: 'Jimmy Markum',
-            picture: 'http://gitlab.com/lols',
-          },
-        },
-      },
-      {
-        input: {
-          result: {
-            accessToken:
-              'ajakljsdoiahoawxbrouawucmbawe.awkxjemaneasdxwe.sodijxqeqwexeqwxe',
-            fullProfile: {
-              id: 'ipd12039',
-              username: 'daveboyle',
-              provider: 'gitlab',
-              displayName: 'Dave Boyle',
-              emails: [
-                {
-                  value: 'daveboyle@gitlab.org',
-                },
-              ],
-            },
-            params: {
-              scope: 'read_repository',
-              expires_in: 200,
-            },
-          },
-          privateInfo: {
-            refreshToken: 'gacn96f3y6y5jdgm19mec348nqrty719xasczf356yxcm9n7',
-          },
-        },
-        expect: {
-          backstageIdentity: {
-            token: 'token-for-user:daveboyle',
-          },
-          providerInfo: {
-            accessToken:
-              'ajakljsdoiahoawxbrouawucmbawe.awkxjemaneasdxwe.sodijxqeqwexeqwxe',
-            expiresInSeconds: 200,
-            idToken: undefined,
-            scope: 'read_repository',
-          },
-          profile: {
-            displayName: 'Dave Boyle',
-            email: 'daveboyle@gitlab.org',
-            picture: 'http://gitlab.com/lols',
-          },
-        },
-      },
-    ];
-
-    for (const test of tests) {
-      mockFrameHandler.mockResolvedValueOnce(test.input);
-      const { response } = await provider.handler({} as any);
-      expect(response).toEqual(test.expect);
-    }
-  });
-
-  it('should forward a new refresh token on refresh', async () => {
-    const mockRefreshToken = jest.spyOn(
-      helpers,
-      'executeRefreshTokenStrategy',
-    ) as unknown as jest.MockedFunction<() => Promise<{}>>;
-
-    mockRefreshToken.mockResolvedValueOnce({
-      accessToken: 'a.b.c',
-      refreshToken: 'dont-forget-to-send-refresh',
-      params: {
-        id_token: 'my-id',
-        scope: 'read_user',
-      },
-    });
-
-    const mockUserProfile = jest.spyOn(
-      helpers,
-      'executeFetchUserProfileStrategy',
-    ) as unknown as jest.MockedFunction<() => Promise<PassportProfile>>;
-
-    mockUserProfile.mockResolvedValueOnce({
-      id: 'uid-my-id',
-      username: 'mockuser',
-      provider: 'gitlab',
-      displayName: 'Mocked User',
-      emails: [
-        {
-          value: 'mockuser@gmail.com',
-        },
-      ],
-    });
-
-    const result = await provider.refresh({} as any);
-
-    expect(result).toEqual({
-      response: {
-        backstageIdentity: {
-          token: 'token-for-user:mockuser',
-        },
-        profile: {
-          displayName: 'Mocked User',
-          email: 'mockuser@gmail.com',
-          picture: 'http://gitlab.com/lols',
-        },
-        providerInfo: {
-          accessToken: 'a.b.c',
-          idToken: 'my-id',
-          scope: 'read_user',
-        },
-      },
-      refreshToken: 'dont-forget-to-send-refresh',
-    });
-  });
-});
diff --git a/plugins/auth-backend/src/providers/gitlab/provider.ts b/plugins/auth-backend/src/providers/gitlab/provider.ts
index 31efafa4ee..2551d334ec 100644
--- a/plugins/auth-backend/src/providers/gitlab/provider.ts
+++ b/plugins/auth-backend/src/providers/gitlab/provider.ts
@@ -14,172 +14,15 @@
  * limitations under the License.
  */
 
-import express from 'express';
-import { Strategy as GitlabStrategy } from 'passport-gitlab2';
-import {
-  executeRedirectStrategy,
-  executeFrameHandlerStrategy,
-  executeRefreshTokenStrategy,
-  executeFetchUserProfileStrategy,
-  makeProfileInfo,
-  PassportDoneCallback,
-} from '../../lib/passport';
-import {
-  OAuthStartResponse,
-  SignInResolver,
-  AuthHandler,
-  AuthResolverContext,
-} from '../types';
-import {
-  OAuthAdapter,
-  OAuthProviderOptions,
-  OAuthHandlers,
-  OAuthResponse,
-  OAuthEnvironmentHandler,
-  OAuthStartRequest,
-  OAuthRefreshRequest,
-  encodeState,
-  OAuthResult,
-} from '../../lib/oauth';
+import { SignInResolver, AuthHandler } from '../types';
+import { OAuthResult } from '../../lib/oauth';
 import { createAuthProviderIntegration } from '../createAuthProviderIntegration';
-
-type PrivateInfo = {
-  refreshToken: string;
-};
-
-export type GitlabAuthProviderOptions = OAuthProviderOptions & {
-  baseUrl: string;
-  signInResolver?: SignInResolver<OAuthResult>;
-  authHandler: AuthHandler<OAuthResult>;
-  resolverContext: AuthResolverContext;
-};
-
-export const gitlabUsernameEntityNameSignInResolver: SignInResolver<
-  OAuthResult
-> = async (info, ctx) => {
-  const { result } = info;
-
-  const id = result.fullProfile.username;
-  if (!id) {
-    throw new Error(`GitLab user profile does not contain a username`);
-  }
-
-  return ctx.signInWithCatalogUser({ entityRef: { name: id } });
-};
-
-export const gitlabDefaultAuthHandler: AuthHandler<OAuthResult> = async ({
-  fullProfile,
-  params,
-}) => ({
-  profile: makeProfileInfo(fullProfile, params.id_token),
-});
-
-export class GitlabAuthProvider implements OAuthHandlers {
-  private readonly _strategy: GitlabStrategy;
-  private readonly signInResolver?: SignInResolver<OAuthResult>;
-  private readonly authHandler: AuthHandler<OAuthResult>;
-  private readonly resolverContext: AuthResolverContext;
-
-  constructor(options: GitlabAuthProviderOptions) {
-    this.resolverContext = options.resolverContext;
-    this.authHandler = options.authHandler;
-    this.signInResolver = options.signInResolver;
-
-    this._strategy = new GitlabStrategy(
-      {
-        clientID: options.clientId,
-        clientSecret: options.clientSecret,
-        callbackURL: options.callbackUrl,
-        baseURL: options.baseUrl,
-        authorizationURL: `${options.baseUrl}/oauth/authorize`,
-        tokenURL: `${options.baseUrl}/oauth/token`,
-        profileURL: `${options.baseUrl}/api/v4/user`,
-      },
-      (
-        accessToken: any,
-        refreshToken: any,
-        params: any,
-        fullProfile: any,
-        done: PassportDoneCallback<OAuthResult, PrivateInfo>,
-      ) => {
-        done(
-          undefined,
-          { fullProfile, params, accessToken },
-          {
-            refreshToken,
-          },
-        );
-      },
-    );
-  }
-
-  async start(req: OAuthStartRequest): Promise<OAuthStartResponse> {
-    return await executeRedirectStrategy(req, this._strategy, {
-      scope: req.scope,
-      state: encodeState(req.state),
-    });
-  }
-
-  async handler(req: express.Request) {
-    const { result, privateInfo } = await executeFrameHandlerStrategy<
-      OAuthResult,
-      PrivateInfo
-    >(req, this._strategy);
-
-    return {
-      response: await this.handleResult(result),
-      refreshToken: privateInfo.refreshToken,
-    };
-  }
-
-  async refresh(req: OAuthRefreshRequest) {
-    const { accessToken, refreshToken, params } =
-      await executeRefreshTokenStrategy(
-        this._strategy,
-        req.refreshToken,
-        req.scope,
-      );
-
-    const fullProfile = await executeFetchUserProfileStrategy(
-      this._strategy,
-      accessToken,
-    );
-    return {
-      response: await this.handleResult({
-        fullProfile,
-        params,
-        accessToken,
-      }),
-      refreshToken,
-    };
-  }
-
-  private async handleResult(result: OAuthResult): Promise<OAuthResponse> {
-    const { profile } = await this.authHandler(result, this.resolverContext);
-
-    const response: OAuthResponse = {
-      providerInfo: {
-        idToken: result.params.id_token,
-        accessToken: result.accessToken,
-        scope: result.params.scope,
-        expiresInSeconds: result.params.expires_in,
-      },
-      profile,
-    };
-
-    if (this.signInResolver) {
-      response.backstageIdentity = await this.signInResolver(
-        {
-          result,
-          profile,
-        },
-        this.resolverContext,
-      );
-    }
-
-    return response;
-  }
-}
+import { createOAuthProviderFactory } from '@backstage/plugin-auth-node';
+import {
+  adaptLegacyOAuthHandler,
+  adaptLegacyOAuthSignInResolver,
+} from '../../lib/legacy';
+import { gitlabAuthenticator } from '@backstage/plugin-auth-backend-module-gitlab-provider';
 
 /**
  * Auth provider integration for GitLab auth
@@ -201,34 +44,10 @@ export const gitlab = createAuthProviderIntegration({
       resolver: SignInResolver<OAuthResult>;
     };
   }) {
-    return ({ providerId, globalConfig, config, resolverContext }) =>
-      OAuthEnvironmentHandler.mapConfig(config, envConfig => {
-        const clientId = envConfig.getString('clientId');
-        const clientSecret = envConfig.getString('clientSecret');
-        const audience = envConfig.getOptionalString('audience');
-        const baseUrl = audience || 'https://gitlab.com';
-        const customCallbackUrl = envConfig.getOptionalString('callbackUrl');
-        const callbackUrl =
-          customCallbackUrl ||
-          `${globalConfig.baseUrl}/${providerId}/handler/frame`;
-
-        const authHandler: AuthHandler<OAuthResult> =
-          options?.authHandler ?? gitlabDefaultAuthHandler;
-
-        const provider = new GitlabAuthProvider({
-          clientId,
-          clientSecret,
-          callbackUrl,
-          baseUrl,
-          authHandler,
-          signInResolver: options?.signIn?.resolver,
-          resolverContext,
-        });
-
-        return OAuthAdapter.fromConfig(globalConfig, provider, {
-          providerId,
-          callbackUrl,
-        });
-      });
+    return createOAuthProviderFactory({
+      authenticator: gitlabAuthenticator,
+      profileTransform: adaptLegacyOAuthHandler(options?.authHandler),
+      signInResolver: adaptLegacyOAuthSignInResolver(options?.signIn?.resolver),
+    });
   },
 });
diff --git a/plugins/auth-backend/src/providers/google/provider.test.ts b/plugins/auth-backend/src/providers/google/provider.test.ts
index 3c0b367be2..abde2b66d1 100644
--- a/plugins/auth-backend/src/providers/google/provider.test.ts
+++ b/plugins/auth-backend/src/providers/google/provider.test.ts
@@ -14,74 +14,57 @@
  * limitations under the License.
  */
 
-import { GoogleAuthProvider } from './provider';
-import * as helpers from '../../lib/passport/PassportStrategyHelper';
-import { OAuthResult } from '../../lib/oauth';
-import { AuthResolverContext } from '../types';
+import { googleAuthenticator } from '@backstage/plugin-auth-backend-module-google-provider';
+import { createOAuthProviderFactory } from '@backstage/plugin-auth-node';
+import { google } from './provider';
 
-jest.mock('../../lib/passport/PassportStrategyHelper', () => {
-  return {
-    executeFrameHandlerStrategy: jest.fn(),
-    executeRefreshTokenStrategy: jest.fn(),
-    executeFetchUserProfileStrategy: jest.fn(),
-  };
-});
-
-const mockFrameHandler = jest.spyOn(
-  helpers,
-  'executeFrameHandlerStrategy',
-) as unknown as jest.MockedFunction<
-  () => Promise<{ result: OAuthResult; privateInfo: any }>
->;
+jest.mock('@backstage/plugin-auth-node', () => ({
+  ...jest.requireActual('@backstage/plugin-auth-node'),
+  createOAuthProviderFactory: jest.fn(() => 'provider-factory'),
+}));
 
 describe('createGoogleProvider', () => {
-  it('should auth', async () => {
-    const provider = new GoogleAuthProvider({
-      resolverContext: {} as AuthResolverContext,
-      authHandler: async ({ fullProfile }) => ({
-        profile: {
-          email: fullProfile.emails![0]!.value,
-          displayName: fullProfile.displayName,
-          picture: 'http://google.com/lols',
-        },
-      }),
-      clientId: 'mock',
-      clientSecret: 'mock',
-      callbackUrl: 'mock',
-    });
+  afterEach(() => jest.clearAllMocks());
 
-    mockFrameHandler.mockResolvedValueOnce({
-      result: {
-        fullProfile: {
-          emails: [{ value: 'conrad@example.com' }],
-          displayName: 'Conrad',
-          id: 'conrad',
-          provider: 'google',
-        },
-        params: {
-          id_token: 'idToken',
-          scope: 'scope',
-          expires_in: 123,
-        },
-        accessToken: 'accessToken',
-      },
-      privateInfo: {
-        refreshToken: 'wacka',
-      },
+  it('should be created', async () => {
+    expect(google.create()).toBe('provider-factory');
+
+    expect(createOAuthProviderFactory).toHaveBeenCalledWith({
+      authenticator: googleAuthenticator,
     });
-    const { response } = await provider.handler({} as any);
-    expect(response).toEqual({
-      providerInfo: {
-        accessToken: 'accessToken',
-        expiresInSeconds: 123,
-        idToken: 'idToken',
-        scope: 'scope',
-      },
-      profile: {
-        email: 'conrad@example.com',
-        displayName: 'Conrad',
-        picture: 'http://google.com/lols',
-      },
+  });
+
+  it('should be created with sign-in resolver', async () => {
+    expect(google.create({ signIn: { resolver: jest.fn() } })).toBe(
+      'provider-factory',
+    );
+
+    expect(createOAuthProviderFactory).toHaveBeenCalledWith({
+      authenticator: googleAuthenticator,
+      signInResolver: expect.any(Function),
+    });
+  });
+
+  it('should be created with sign-in resolver and auth handler', async () => {
+    expect(
+      google.create({
+        signIn: { resolver: jest.fn() },
+        authHandler: jest.fn(),
+      }),
+    ).toBe('provider-factory');
+
+    expect(createOAuthProviderFactory).toHaveBeenCalledWith({
+      authenticator: googleAuthenticator,
+      signInResolver: expect.any(Function),
+      profileTransform: expect.any(Function),
+    });
+  });
+
+  it('should have resolvers', () => {
+    expect(google.resolvers).toEqual({
+      emailLocalPartMatchingUserEntityName: expect.any(Function),
+      emailMatchingUserEntityAnnotation: expect.any(Function),
+      emailMatchingUserEntityProfileEmail: expect.any(Function),
     });
   });
 });
diff --git a/plugins/auth-backend/src/providers/google/provider.ts b/plugins/auth-backend/src/providers/google/provider.ts
index afe5c27f6b..d467977094 100644
--- a/plugins/auth-backend/src/providers/google/provider.ts
+++ b/plugins/auth-backend/src/providers/google/provider.ts
@@ -14,166 +14,22 @@
  * limitations under the License.
  */
 
-import express from 'express';
-import passport from 'passport';
-import { OAuth2Client } from 'google-auth-library';
-import { Strategy as GoogleStrategy } from 'passport-google-oauth20';
 import {
-  encodeState,
-  OAuthAdapter,
-  OAuthEnvironmentHandler,
-  OAuthHandlers,
-  OAuthProviderOptions,
-  OAuthRefreshRequest,
-  OAuthResponse,
-  OAuthResult,
-  OAuthStartRequest,
-  OAuthLogoutRequest,
-} from '../../lib/oauth';
+  googleAuthenticator,
+  googleSignInResolvers,
+} from '@backstage/plugin-auth-backend-module-google-provider';
 import {
-  executeFetchUserProfileStrategy,
-  executeFrameHandlerStrategy,
-  executeRedirectStrategy,
-  executeRefreshTokenStrategy,
-  makeProfileInfo,
-  PassportDoneCallback,
-} from '../../lib/passport';
+  commonSignInResolvers,
+  createOAuthProviderFactory,
+} from '@backstage/plugin-auth-node';
 import {
-  AuthHandler,
-  AuthResolverContext,
-  OAuthStartResponse,
-  SignInResolver,
-} from '../types';
+  adaptLegacyOAuthHandler,
+  adaptLegacyOAuthSignInResolver,
+  adaptOAuthSignInResolverToLegacy,
+} from '../../lib/legacy';
+import { OAuthResult } from '../../lib/oauth';
 import { createAuthProviderIntegration } from '../createAuthProviderIntegration';
-import {
-  commonByEmailLocalPartResolver,
-  commonByEmailResolver,
-} from '../resolvers';
-
-type PrivateInfo = {
-  refreshToken: string;
-};
-
-type Options = OAuthProviderOptions & {
-  signInResolver?: SignInResolver<OAuthResult>;
-  authHandler: AuthHandler<OAuthResult>;
-  resolverContext: AuthResolverContext;
-};
-
-export class GoogleAuthProvider implements OAuthHandlers {
-  private readonly strategy: GoogleStrategy;
-  private readonly signInResolver?: SignInResolver<OAuthResult>;
-  private readonly authHandler: AuthHandler<OAuthResult>;
-  private readonly resolverContext: AuthResolverContext;
-
-  constructor(options: Options) {
-    this.authHandler = options.authHandler;
-    this.signInResolver = options.signInResolver;
-    this.resolverContext = options.resolverContext;
-    this.strategy = new GoogleStrategy(
-      {
-        clientID: options.clientId,
-        clientSecret: options.clientSecret,
-        callbackURL: options.callbackUrl,
-        passReqToCallback: false,
-      },
-      (
-        accessToken: any,
-        refreshToken: any,
-        params: any,
-        fullProfile: passport.Profile,
-        done: PassportDoneCallback<OAuthResult, PrivateInfo>,
-      ) => {
-        done(
-          undefined,
-          {
-            fullProfile,
-            params,
-            accessToken,
-            refreshToken,
-          },
-          {
-            refreshToken,
-          },
-        );
-      },
-    );
-  }
-
-  async start(req: OAuthStartRequest): Promise<OAuthStartResponse> {
-    return await executeRedirectStrategy(req, this.strategy, {
-      accessType: 'offline',
-      prompt: 'consent',
-      scope: req.scope,
-      state: encodeState(req.state),
-    });
-  }
-
-  async handler(req: express.Request) {
-    const { result, privateInfo } = await executeFrameHandlerStrategy<
-      OAuthResult,
-      PrivateInfo
-    >(req, this.strategy);
-
-    return {
-      response: await this.handleResult(result),
-      refreshToken: privateInfo.refreshToken,
-    };
-  }
-
-  async logout(req: OAuthLogoutRequest) {
-    const oauthClient = new OAuth2Client();
-    await oauthClient.revokeToken(req.refreshToken);
-  }
-
-  async refresh(req: OAuthRefreshRequest) {
-    const { accessToken, refreshToken, params } =
-      await executeRefreshTokenStrategy(
-        this.strategy,
-        req.refreshToken,
-        req.scope,
-      );
-    const fullProfile = await executeFetchUserProfileStrategy(
-      this.strategy,
-      accessToken,
-    );
-
-    return {
-      response: await this.handleResult({
-        fullProfile,
-        params,
-        accessToken,
-      }),
-      refreshToken,
-    };
-  }
-
-  private async handleResult(result: OAuthResult) {
-    const { profile } = await this.authHandler(result, this.resolverContext);
-
-    const response: OAuthResponse = {
-      providerInfo: {
-        idToken: result.params.id_token,
-        accessToken: result.accessToken,
-        scope: result.params.scope,
-        expiresInSeconds: result.params.expires_in,
-      },
-      profile,
-    };
-
-    if (this.signInResolver) {
-      response.backstageIdentity = await this.signInResolver(
-        {
-          result,
-          profile,
-        },
-        this.resolverContext,
-      );
-    }
-
-    return response;
-  }
-}
+import { AuthHandler, SignInResolver } from '../types';
 
 /**
  * Auth provider integration for Google auth
@@ -198,62 +54,18 @@ export const google = createAuthProviderIntegration({
       resolver: SignInResolver<OAuthResult>;
     };
   }) {
-    return ({ providerId, globalConfig, config, resolverContext }) =>
-      OAuthEnvironmentHandler.mapConfig(config, envConfig => {
-        const clientId = envConfig.getString('clientId');
-        const clientSecret = envConfig.getString('clientSecret');
-        const customCallbackUrl = envConfig.getOptionalString('callbackUrl');
-        const callbackUrl =
-          customCallbackUrl ||
-          `${globalConfig.baseUrl}/${providerId}/handler/frame`;
-
-        const authHandler: AuthHandler<OAuthResult> = options?.authHandler
-          ? options.authHandler
-          : async ({ fullProfile, params }) => ({
-              profile: makeProfileInfo(fullProfile, params.id_token),
-            });
-
-        const provider = new GoogleAuthProvider({
-          clientId,
-          clientSecret,
-          callbackUrl,
-          signInResolver: options?.signIn?.resolver,
-          authHandler,
-          resolverContext,
-        });
-
-        return OAuthAdapter.fromConfig(globalConfig, provider, {
-          providerId,
-          callbackUrl,
-        });
-      });
-  },
-  resolvers: {
-    /**
-     * Looks up the user by matching their email local part to the entity name.
-     */
-    emailLocalPartMatchingUserEntityName: () => commonByEmailLocalPartResolver,
-    /**
-     * Looks up the user by matching their email to the entity email.
-     */
-    emailMatchingUserEntityProfileEmail: () => commonByEmailResolver,
-    /**
-     * Looks up the user by matching their email to the `google.com/email` annotation.
-     */
-    emailMatchingUserEntityAnnotation(): SignInResolver<OAuthResult> {
-      return async (info, ctx) => {
-        const { profile } = info;
-
-        if (!profile.email) {
-          throw new Error('Google profile contained no email');
-        }
-
-        return ctx.signInWithCatalogUser({
-          annotations: {
-            'google.com/email': profile.email,
-          },
-        });
-      };
-    },
+    return createOAuthProviderFactory({
+      authenticator: googleAuthenticator,
+      profileTransform: adaptLegacyOAuthHandler(options?.authHandler),
+      signInResolver: adaptLegacyOAuthSignInResolver(options?.signIn?.resolver),
+    });
   },
+  resolvers: adaptOAuthSignInResolverToLegacy({
+    emailLocalPartMatchingUserEntityName:
+      commonSignInResolvers.emailLocalPartMatchingUserEntityName(),
+    emailMatchingUserEntityProfileEmail:
+      commonSignInResolvers.emailMatchingUserEntityProfileEmail(),
+    emailMatchingUserEntityAnnotation:
+      googleSignInResolvers.emailMatchingUserEntityAnnotation(),
+  }),
 });
diff --git a/plugins/auth-backend/src/providers/microsoft/provider.test.ts b/plugins/auth-backend/src/providers/microsoft/provider.test.ts
index 6f8df2d4df..7bbfd085d6 100644
--- a/plugins/auth-backend/src/providers/microsoft/provider.test.ts
+++ b/plugins/auth-backend/src/providers/microsoft/provider.test.ts
@@ -30,6 +30,10 @@ describe('MicrosoftAuthProvider', () => {
   const state = Buffer.from(
     `nonce=${encodeURIComponent(nonce)}&env=development`,
   ).toString('hex');
+  const mockBackstageToken = `header.${Buffer.from(
+    JSON.stringify({ sub: 'user:default/mock' }),
+    'utf8',
+  ).toString('base64')}.backstage`;
 
   const server = setupServer();
   const microsoftApi = new FakeMicrosoftAPI();
@@ -45,6 +49,9 @@ describe('MicrosoftAuthProvider', () => {
       },
     })({
       providerId: 'microsoft',
+      baseUrl: 'http://backstage.test/api/auth',
+      appUrl: 'http://backstage.test',
+      isOriginAllowed: _ => true,
       globalConfig: {
         baseUrl: 'http://backstage.test/api/auth',
         appUrl: 'http://backstage.test',
@@ -61,10 +68,9 @@ describe('MicrosoftAuthProvider', () => {
       resolverContext: {
         issueToken: jest.fn(),
         findCatalogUser: jest.fn(),
-        signInWithCatalogUser: _ =>
-          Promise.resolve({
-            token: 'header.e30K.backstage',
-          }),
+        signInWithCatalogUser: async _ => ({
+          token: mockBackstageToken,
+        }),
       } as AuthResolverContext,
     }) as AuthProviderRouteHandlers;
 
@@ -206,8 +212,12 @@ describe('MicrosoftAuthProvider', () => {
                   displayName: 'Conrad',
                 },
                 backstageIdentity: {
-                  token: 'header.e30K.backstage',
-                  identity: { type: 'user', ownershipEntityRefs: [] },
+                  token: mockBackstageToken,
+                  identity: {
+                    type: 'user',
+                    userEntityRef: 'user:default/mock',
+                    ownershipEntityRefs: [],
+                  },
                 },
               },
             }),
@@ -327,8 +337,12 @@ describe('MicrosoftAuthProvider', () => {
                   displayName: 'Conrad',
                 },
                 backstageIdentity: {
-                  token: 'header.e30K.backstage',
-                  identity: { type: 'user', ownershipEntityRefs: [] },
+                  token: mockBackstageToken,
+                  identity: {
+                    type: 'user',
+                    userEntityRef: 'user:default/mock',
+                    ownershipEntityRefs: [],
+                  },
                 },
               },
             }),
@@ -427,7 +441,7 @@ describe('MicrosoftAuthProvider', () => {
       expect(response.json).toHaveBeenCalledWith(
         expect.objectContaining({
           backstageIdentity: expect.objectContaining({
-            token: 'header.e30K.backstage',
+            token: mockBackstageToken,
           }),
         }),
       );
diff --git a/plugins/auth-backend/src/providers/microsoft/provider.ts b/plugins/auth-backend/src/providers/microsoft/provider.ts
index bc581f6d10..8fc8459f10 100644
--- a/plugins/auth-backend/src/providers/microsoft/provider.ts
+++ b/plugins/auth-backend/src/providers/microsoft/provider.ts
@@ -47,7 +47,7 @@ import {
   commonByEmailLocalPartResolver,
   commonByEmailResolver,
 } from '../resolvers';
-import { Logger } from 'winston';
+import { LoggerService } from '@backstage/backend-plugin-api';
 import fetch from 'node-fetch';
 import { decodeJwt } from 'jose';
 import { Profile as PassportProfile } from 'passport';
@@ -60,7 +60,7 @@ type PrivateInfo = {
 type Options = OAuthProviderOptions & {
   signInResolver?: SignInResolver<OAuthResult>;
   authHandler: AuthHandler<OAuthResult>;
-  logger: Logger;
+  logger: LoggerService;
   resolverContext: AuthResolverContext;
   authorizationUrl?: string;
   tokenUrl?: string;
@@ -70,7 +70,7 @@ export class MicrosoftAuthProvider implements OAuthHandlers {
   private readonly _strategy: MicrosoftStrategy;
   private readonly signInResolver?: SignInResolver<OAuthResult>;
   private readonly authHandler: AuthHandler<OAuthResult>;
-  private readonly logger: Logger;
+  private readonly logger: LoggerService;
   private readonly resolverContext: AuthResolverContext;
 
   constructor(options: Options) {
diff --git a/plugins/auth-backend/src/providers/oauth2-proxy/provider.test.ts b/plugins/auth-backend/src/providers/oauth2-proxy/provider.test.ts
index 0279604f2d..f585d4831f 100644
--- a/plugins/auth-backend/src/providers/oauth2-proxy/provider.test.ts
+++ b/plugins/auth-backend/src/providers/oauth2-proxy/provider.test.ts
@@ -22,7 +22,7 @@ jest.mock('@backstage/catalog-client');
 import { AuthenticationError } from '@backstage/errors';
 import express from 'express';
 import * as jose from 'jose';
-import { Logger } from 'winston';
+import { LoggerService } from '@backstage/backend-plugin-api';
 import { AuthHandler, AuthResolverContext, SignInResolver } from '../types';
 import {
   oauth2Proxy,
@@ -36,7 +36,7 @@ describe('Oauth2ProxyAuthProvider', () => {
     'eyblob.eyJzdWIiOiJ1c2VyOmRlZmF1bHQvamltbXltYXJrdW0iLCJlbnQiOlsidXNlcjpkZWZhdWx0L2ppbW15bWFya3VtIl19.eyblob';
 
   let provider: Oauth2ProxyAuthProvider<any>;
-  let logger: jest.Mocked<Logger>;
+  let logger: jest.Mocked<LoggerService>;
   let signInResolver: jest.MockedFunction<
     SignInResolver<OAuth2ProxyResult<any>>
   >;
@@ -53,7 +53,7 @@ describe('Oauth2ProxyAuthProvider', () => {
     >;
     authHandler = jest.fn();
     signInResolver = jest.fn();
-    logger = { error: jest.fn() } as unknown as jest.Mocked<Logger>;
+    logger = { error: jest.fn() } as unknown as jest.Mocked<LoggerService>;
 
     mockResponse = {
       status: jest.fn(),
diff --git a/plugins/auth-backend/src/providers/prepareBackstageIdentityResponse.ts b/plugins/auth-backend/src/providers/prepareBackstageIdentityResponse.ts
index 761618c225..1fa8f4a2fa 100644
--- a/plugins/auth-backend/src/providers/prepareBackstageIdentityResponse.ts
+++ b/plugins/auth-backend/src/providers/prepareBackstageIdentityResponse.ts
@@ -14,34 +14,11 @@
  * limitations under the License.
  */
 
-import {
-  BackstageIdentityResponse,
-  BackstageSignInResult,
-} from '@backstage/plugin-auth-node';
-
-function parseJwtPayload(token: string) {
-  const [_header, payload, _signature] = token.split('.');
-  return JSON.parse(Buffer.from(payload, 'base64').toString());
-}
+import { prepareBackstageIdentityResponse as _prepareBackstageIdentityResponse } from '@backstage/plugin-auth-node';
 
 /**
- * Parses a Backstage-issued token and decorates the
- * {@link @backstage/plugin-auth-node#BackstageIdentityResponse} with identity information sourced from the
- * token.
- *
  * @public
+ * @deprecated import from `@backstage/plugin-auth-node` instead
  */
-export function prepareBackstageIdentityResponse(
-  result: BackstageSignInResult,
-): BackstageIdentityResponse {
-  const { sub, ent } = parseJwtPayload(result.token);
-
-  return {
-    ...result,
-    identity: {
-      type: 'user',
-      userEntityRef: sub,
-      ownershipEntityRefs: ent ?? [],
-    },
-  };
-}
+export const prepareBackstageIdentityResponse =
+  _prepareBackstageIdentityResponse;
diff --git a/plugins/auth-backend/src/providers/types.ts b/plugins/auth-backend/src/providers/types.ts
index 1459cff484..354387153c 100644
--- a/plugins/auth-backend/src/providers/types.ts
+++ b/plugins/auth-backend/src/providers/types.ts
@@ -14,126 +14,42 @@
  * limitations under the License.
  */
 
-import { GetEntitiesRequest } from '@backstage/catalog-client';
-import { Entity } from '@backstage/catalog-model';
-import { Config } from '@backstage/config';
 import {
-  BackstageIdentityResponse,
-  BackstageSignInResult,
+  AuthProviderConfig as _AuthProviderConfig,
+  AuthProviderRouteHandlers as _AuthProviderRouteHandlers,
+  AuthProviderFactory as _AuthProviderFactory,
+  AuthResolverCatalogUserQuery as _AuthResolverCatalogUserQuery,
+  AuthResolverContext as _AuthResolverContext,
+  ClientAuthResponse as _ClientAuthResponse,
+  CookieConfigurer as _CookieConfigurer,
+  ProfileInfo as _ProfileInfo,
+  SignInInfo as _SignInInfo,
+  SignInResolver as _SignInResolver,
 } from '@backstage/plugin-auth-node';
-import express from 'express';
-import { Logger } from 'winston';
-import { TokenParams } from '../identity/types';
 import { OAuthStartRequest } from '../lib/oauth/types';
 
 /**
- * A query for a single user in the catalog.
- *
- * If `entityRef` is used, the default kind is `'User'`.
- *
- * If `annotations` are used, all annotations must be present and
- * match the provided value exactly. Only entities of kind `'User'` will be considered.
- *
- * If `filter` are used they are passed on as they are to the `CatalogApi`.
- *
- * Regardless of the query method, the query must match exactly one entity
- * in the catalog, or an error will be thrown.
- *
  * @public
+ * @deprecated import from `@backstage/plugin-auth-node` instead
  */
-export type AuthResolverCatalogUserQuery =
-  | {
-      entityRef:
-        | string
-        | {
-            kind?: string;
-            namespace?: string;
-            name: string;
-          };
-    }
-  | {
-      annotations: Record<string, string>;
-    }
-  | {
-      filter: Exclude<GetEntitiesRequest['filter'], undefined>;
-    };
+export type AuthResolverCatalogUserQuery = _AuthResolverCatalogUserQuery;
 
 /**
- * The context that is used for auth processing.
- *
  * @public
+ * @deprecated import from `@backstage/plugin-auth-node` instead
  */
-export type AuthResolverContext = {
-  /**
-   * Issues a Backstage token using the provided parameters.
-   */
-  issueToken(params: TokenParams): Promise<{ token: string }>;
-
-  /**
-   * Finds a single user in the catalog using the provided query.
-   *
-   * See {@link AuthResolverCatalogUserQuery} for details.
-   */
-  findCatalogUser(
-    query: AuthResolverCatalogUserQuery,
-  ): Promise<{ entity: Entity }>;
-
-  /**
-   * Finds a single user in the catalog using the provided query, and then
-   * issues an identity for that user using default ownership resolution.
-   *
-   * See {@link AuthResolverCatalogUserQuery} for details.
-   */
-  signInWithCatalogUser(
-    query: AuthResolverCatalogUserQuery,
-  ): Promise<BackstageSignInResult>;
-};
+export type AuthResolverContext = _AuthResolverContext;
 
 /**
- * The callback used to resolve the cookie configuration for auth providers that use cookies.
  * @public
+ * @deprecated import from `@backstage/plugin-auth-node` instead
  */
-export type CookieConfigurer = (ctx: {
-  /** ID of the auth provider that this configuration applies to */
-  providerId: string;
-  /** The externally reachable base URL of the auth-backend plugin */
-  baseUrl: string;
-  /** The configured callback URL of the auth provider */
-  callbackUrl: string;
-  /** The origin URL of the app */
-  appOrigin: string;
-}) => {
-  domain: string;
-  path: string;
-  secure: boolean;
-  sameSite?: 'none' | 'lax' | 'strict';
-};
+export type CookieConfigurer = _CookieConfigurer;
 
-/** @public */
-export type AuthProviderConfig = {
-  /**
-   * The protocol://domain[:port] where the app is hosted. This is used to construct the
-   * callbackURL to redirect to once the user signs in to the auth provider.
-   */
-  baseUrl: string;
-
-  /**
-   * The base URL of the app as provided by app.baseUrl
-   */
-  appUrl: string;
-
-  /**
-   * A function that is called to check whether an origin is allowed to receive the authentication result.
-   */
-  isOriginAllowed: (origin: string) => boolean;
-
-  /**
-   * The function used to resolve cookie configuration based on the auth provider options.
-   */
-  cookieConfigurer?: CookieConfigurer;
-};
-
-/** @public */
+/**
+ * @public
+ * @deprecated Use `createOAuthAuthenticator` from `@backstage/plugin-auth-node` instead
+ */
 export type OAuthStartResponse = {
   /**
    * URL to redirect to
@@ -146,138 +62,53 @@ export type OAuthStartResponse = {
 };
 
 /**
- * Any Auth provider needs to implement this interface which handles the routes in the
- * auth backend. Any auth API requests from the frontend reaches these methods.
- *
- * The routes in the auth backend API are tied to these methods like below
- *
- * `/auth/[provider]/start -> start`
- * `/auth/[provider]/handler/frame -> frameHandler`
- * `/auth/[provider]/refresh -> refresh`
- * `/auth/[provider]/logout -> logout`
- *
  * @public
+ * @deprecated import from `@backstage/plugin-auth-node` instead
  */
-export interface AuthProviderRouteHandlers {
-  /**
-   * Handles the start route of the API. This initiates a sign in request with an auth provider.
-   *
-   * Request
-   * - scopes for the auth request (Optional)
-   * Response
-   * - redirect to the auth provider for the user to sign in or consent.
-   * - sets a nonce cookie and also pass the nonce as 'state' query parameter in the redirect request
-   */
-  start(req: express.Request, res: express.Response): Promise<void>;
-
-  /**
-   * Once the user signs in or consents in the OAuth screen, the auth provider redirects to the
-   * callbackURL which is handled by this method.
-   *
-   * Request
-   * - to contain a nonce cookie and a 'state' query parameter
-   * Response
-   * - postMessage to the window with a payload that contains accessToken, expiryInSeconds?, idToken? and scope.
-   * - sets a refresh token cookie if the auth provider supports refresh tokens
-   */
-  frameHandler(req: express.Request, res: express.Response): Promise<void>;
-
-  /**
-   * (Optional) If the auth provider supports refresh tokens then this method handles
-   * requests to get a new access token.
-   *
-   * Request
-   * - to contain a refresh token cookie and scope (Optional) query parameter.
-   * Response
-   * - payload with accessToken, expiryInSeconds?, idToken?, scope and user profile information.
-   */
-  refresh?(req: express.Request, res: express.Response): Promise<void>;
-
-  /**
-   * (Optional) Handles sign out requests
-   *
-   * Response
-   * - removes the refresh token cookie
-   */
-  logout?(req: express.Request, res: express.Response): Promise<void>;
-}
-
-/** @public */
-export type AuthProviderFactory = (options: {
-  providerId: string;
-  globalConfig: AuthProviderConfig;
-  config: Config;
-  logger: Logger;
-  resolverContext: AuthResolverContext;
-}) => AuthProviderRouteHandlers;
-
-/** @public */
-export type AuthResponse<ProviderInfo> = {
-  providerInfo: ProviderInfo;
-  profile: ProfileInfo;
-  backstageIdentity?: BackstageIdentityResponse;
-};
+export type AuthProviderConfig = _AuthProviderConfig;
 
 /**
- * Used to display login information to user, i.e. sidebar popup.
- *
- * It is also temporarily used as the profile of the signed-in user's Backstage
- * identity, but we want to replace that with data from identity and/org catalog
- * service
- *
  * @public
+ * @deprecated import from `@backstage/plugin-auth-node` instead
  */
-export type ProfileInfo = {
-  /**
-   * Email ID of the signed in user.
-   */
-  email?: string;
-  /**
-   * Display name that can be presented to the signed in user.
-   */
-  displayName?: string;
-  /**
-   * URL to an image that can be used as the display image or avatar of the
-   * signed in user.
-   */
-  picture?: string;
-};
+export type AuthProviderRouteHandlers = _AuthProviderRouteHandlers;
 
 /**
- * Type of sign in information context. Includes the profile information and
- * authentication result which contains auth related information.
- *
  * @public
+ * @deprecated import from `@backstage/plugin-auth-node` instead
  */
-export type SignInInfo<TAuthResult> = {
-  /**
-   * The simple profile passed down for use in the frontend.
-   */
-  profile: ProfileInfo;
-
-  /**
-   * The authentication result that was received from the authentication
-   * provider.
-   */
-  result: TAuthResult;
-};
+export type AuthProviderFactory = _AuthProviderFactory;
 
 /**
- * Describes the function which handles the result of a successful
- * authentication. Must return a valid {@link @backstage/plugin-auth-node#BackstageSignInResult}.
- *
  * @public
+ * @deprecated import `ClientAuthResponse` from `@backstage/plugin-auth-node` instead
  */
-export type SignInResolver<TAuthResult> = (
-  info: SignInInfo<TAuthResult>,
-  context: AuthResolverContext,
-) => Promise<BackstageSignInResult>;
+export type AuthResponse<TProviderInfo> = _ClientAuthResponse<TProviderInfo>;
+
+/**
+ * @public
+ * @deprecated import from `@backstage/plugin-auth-node` instead
+ */
+export type ProfileInfo = _ProfileInfo;
+
+/**
+ * @public
+ * @deprecated import from `@backstage/plugin-auth-node` instead
+ */
+export type SignInInfo<TAuthResult> = _SignInInfo<TAuthResult>;
+
+/**
+ * @public
+ * @deprecated import from `@backstage/plugin-auth-node` instead
+ */
+export type SignInResolver<TAuthResult> = _SignInResolver<TAuthResult>;
 
 /**
  * The return type of an authentication handler. Must contain valid profile
  * information.
  *
  * @public
+ * @deprecated Use `createOAuthRouteHandlers` from `@backstage/plugin-auth-node` instead
  */
 export type AuthHandlerResult = { profile: ProfileInfo };
 
@@ -293,13 +124,17 @@ export type AuthHandlerResult = { profile: ProfileInfo };
  * group of users.
  *
  * @public
+ * @deprecated Use `createOAuthRouteHandlers` from `@backstage/plugin-auth-node` instead
  */
 export type AuthHandler<TAuthResult> = (
   input: TAuthResult,
   context: AuthResolverContext,
 ) => Promise<AuthHandlerResult>;
 
-/** @public */
+/**
+ * @public
+ * @deprecated Use `createOAuthRouteHandlers` from `@backstage/plugin-auth-node` instead
+ */
 export type StateEncoder = (
   req: OAuthStartRequest,
 ) => Promise<{ encodedState: string }>;
diff --git a/plugins/auth-backend/src/service/router.ts b/plugins/auth-backend/src/service/router.ts
index fa8dd95727..e3bfc1c3f2 100644
--- a/plugins/auth-backend/src/service/router.ts
+++ b/plugins/auth-backend/src/service/router.ts
@@ -17,7 +17,7 @@
 import express from 'express';
 import Router from 'express-promise-router';
 import cookieParser from 'cookie-parser';
-import { Logger } from 'winston';
+import { LoggerService } from '@backstage/backend-plugin-api';
 import {
   defaultAuthProviderFactories,
   AuthProviderFactory,
@@ -44,13 +44,14 @@ export type ProviderFactories = { [s: string]: AuthProviderFactory };
 
 /** @public */
 export interface RouterOptions {
-  logger: Logger;
+  logger: LoggerService;
   database: PluginDatabaseManager;
   config: Config;
   discovery: PluginEndpointDiscovery;
   tokenManager: TokenManager;
   tokenFactoryAlgorithm?: string;
   providerFactories?: ProviderFactories;
+  disableDefaultProviderFactories?: boolean;
   catalogApi?: CatalogApi;
 }
 
@@ -65,7 +66,7 @@ export async function createRouter(
     database,
     tokenManager,
     tokenFactoryAlgorithm,
-    providerFactories,
+    providerFactories = {},
     catalogApi,
   } = options;
   const router = Router();
@@ -85,7 +86,9 @@ export async function createRouter(
     keyStore,
     keyDurationSeconds,
     logger: logger.child({ component: 'token-factory' }),
-    algorithm: tokenFactoryAlgorithm,
+    algorithm:
+      tokenFactoryAlgorithm ??
+      config.getOptionalString('auth.identityTokenAlgorithm'),
   });
 
   const secret = config.getOptionalString('auth.session.secret');
@@ -113,23 +116,28 @@ export async function createRouter(
   router.use(express.urlencoded({ extended: false }));
   router.use(express.json());
 
-  const allProviderFactories = {
-    ...defaultAuthProviderFactories,
-    ...providerFactories,
-  };
-  const providersConfig = config.getConfig('auth.providers');
-  const configuredProviders = providersConfig.keys();
+  const allProviderFactories = options.disableDefaultProviderFactories
+    ? providerFactories
+    : {
+        ...defaultAuthProviderFactories,
+        ...providerFactories,
+      };
+
+  const providersConfig = config.getOptionalConfig('auth.providers');
 
   const isOriginAllowed = createOriginFilter(config);
 
   for (const [providerId, providerFactory] of Object.entries(
     allProviderFactories,
   )) {
-    if (configuredProviders.includes(providerId)) {
+    if (providersConfig?.has(providerId)) {
       logger.info(`Configuring auth provider: ${providerId}`);
       try {
         const provider = providerFactory({
           providerId,
+          appUrl,
+          baseUrl: authUrl,
+          isOriginAllowed,
           globalConfig: {
             baseUrl: authUrl,
             appUrl,
diff --git a/plugins/auth-backend/src/service/standaloneServer.ts b/plugins/auth-backend/src/service/standaloneServer.ts
index 16ebbc9345..abda3a341c 100644
--- a/plugins/auth-backend/src/service/standaloneServer.ts
+++ b/plugins/auth-backend/src/service/standaloneServer.ts
@@ -23,11 +23,11 @@ import {
 } from '@backstage/backend-common';
 import { Server } from 'http';
 import Knex from 'knex';
-import { Logger } from 'winston';
+import { LoggerService } from '@backstage/backend-plugin-api';
 import { createRouter } from './router';
 
 export interface ServerOptions {
-  logger: Logger;
+  logger: LoggerService;
 }
 
 export async function startStandaloneServer(
diff --git a/plugins/auth-node/CHANGELOG.md b/plugins/auth-node/CHANGELOG.md
index f19e99feab..f0b0c5d962 100644
--- a/plugins/auth-node/CHANGELOG.md
+++ b/plugins/auth-node/CHANGELOG.md
@@ -1,5 +1,89 @@
 # @backstage/plugin-auth-node
 
+## 0.3.0-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config@1.1.0-next.1
+  - @backstage/backend-common@0.19.5-next.2
+  - @backstage/backend-plugin-api@0.6.3-next.2
+  - @backstage/catalog-model@1.4.2-next.1
+  - @backstage/catalog-client@1.4.4-next.1
+  - @backstage/errors@1.2.1
+  - @backstage/types@1.1.0
+
+## 0.3.0-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config@1.1.0-next.0
+  - @backstage/backend-common@0.19.5-next.1
+  - @backstage/backend-plugin-api@0.6.3-next.1
+  - @backstage/catalog-model@1.4.2-next.0
+  - @backstage/catalog-client@1.4.4-next.0
+  - @backstage/errors@1.2.1
+  - @backstage/types@1.1.0
+
+## 0.3.0-next.0
+
+### Minor Changes
+
+- 8513cd7d00e3: Introduced a new system for building auth providers for `@backstage/plugin-auth-backend`, which both increases the amount of code re-use across providers, and also works better with the new backend system.
+
+  Many existing types have been moved from `@backstage/plugin-auth-backend` in order to avoid a direct dependency on the plugin from modules.
+
+  Auth provider integrations are now primarily implemented through a pattern of creating "authenticators", which are in turn specific to each kind of integrations. Initially there are two types: `createOAuthAuthenticator` and `createProxyAuthenticator`. These come paired with functions that let you create the corresponding route handlers, `createOAuthRouteHandlers` and `createProxyAuthRouteHandlers`, as well as provider factories, `createOAuthProviderFactory` and `createProxyAuthProviderFactory`. This new authenticator pattern allows the sign-in logic to be separated from the auth integration logic, allowing it to be completely re-used across all providers of the same kind.
+
+  The new provider factories also implement a new declarative way to configure sign-in resolvers, rather than configuration through code. Sign-in resolvers can now be configured through the `resolvers` configuration key, where the first resolver that provides an identity will be used, for example:
+
+  ```yaml
+  auth:
+    providers:
+      google:
+        development:
+          clientId: ...
+          clientSecret: ...
+          signIn:
+            resolvers:
+              - resolver: emailMatchingUserEntityAnnotation
+              - resolver: emailLocalPartMatchingUserEntityName
+  ```
+
+  These configurable resolvers are created with a new `createSignInResolverFactory` function, which creates a sign-in resolver factory, optionally with an options schema that will be used both when configuring the sign-in resolver through configuration and code.
+
+  The internal helpers from `@backstage/plugin-auth-backend` that were used to implement auth providers using passport strategies have now also been made available as public API, through `PassportHelpers` and `PassportOAuthAuthenticatorHelper`.
+
+### Patch Changes
+
+- 18619f793c94: The `BackstageIdentityResponse` interface now has an optional `expiresInSeconds` field that can be used to signal session expiration. The `prepareBackstageIdentityResponse` utility will now also read the expiration from the provided token, and include it in the response.
+- Updated dependencies
+  - @backstage/backend-common@0.19.4-next.0
+  - @backstage/backend-plugin-api@0.6.2-next.0
+  - @backstage/catalog-client@1.4.3
+  - @backstage/catalog-model@1.4.1
+  - @backstage/config@1.0.8
+  - @backstage/errors@1.2.1
+  - @backstage/types@1.1.0
+
+## 0.2.17
+
+### Patch Changes
+
+- 12a8c94eda8d: Add package repository and homepage metadata
+- Updated dependencies
+  - @backstage/backend-common@0.19.2
+  - @backstage/config@1.0.8
+  - @backstage/errors@1.2.1
+
+## 0.2.17-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.19.2-next.2
+
 ## 0.2.17-next.1
 
 ### Patch Changes
diff --git a/plugins/auth-node/api-report.md b/plugins/auth-node/api-report.md
index bc9e392929..a782847d7a 100644
--- a/plugins/auth-node/api-report.md
+++ b/plugins/auth-node/api-report.md
@@ -3,11 +3,104 @@
 > Do not edit this file. It is a report generated by [API Extractor](https://api-extractor.com/).
 
 ```ts
+import { BackstageIdentityResponse as BackstageIdentityResponse_2 } from '@backstage/plugin-auth-node';
+import { BackstageSignInResult as BackstageSignInResult_2 } from '@backstage/plugin-auth-node';
+import { Config } from '@backstage/config';
+import { Entity } from '@backstage/catalog-model';
+import { EntityFilterQuery } from '@backstage/catalog-client';
+import express from 'express';
+import { ExtensionPoint } from '@backstage/backend-plugin-api';
+import { JsonObject } from '@backstage/types';
+import { JsonValue } from '@backstage/types';
+import { LoggerService } from '@backstage/backend-plugin-api';
 import { PluginEndpointDiscovery } from '@backstage/backend-common';
+import { Profile } from 'passport';
 import { Request as Request_2 } from 'express';
+import { Response as Response_2 } from 'express';
+import { Strategy } from 'passport';
+import { ZodSchema } from 'zod';
+import { ZodTypeDef } from 'zod';
+
+// @public @deprecated (undocumented)
+export type AuthProviderConfig = {
+  baseUrl: string;
+  appUrl: string;
+  isOriginAllowed: (origin: string) => boolean;
+  cookieConfigurer?: CookieConfigurer;
+};
+
+// @public (undocumented)
+export type AuthProviderFactory = (options: {
+  providerId: string;
+  globalConfig: AuthProviderConfig;
+  config: Config;
+  logger: LoggerService;
+  resolverContext: AuthResolverContext;
+  baseUrl: string;
+  appUrl: string;
+  isOriginAllowed: (origin: string) => boolean;
+  cookieConfigurer?: CookieConfigurer;
+}) => AuthProviderRouteHandlers;
+
+// @public (undocumented)
+export interface AuthProviderRegistrationOptions {
+  // (undocumented)
+  factory: AuthProviderFactory;
+  // (undocumented)
+  providerId: string;
+}
+
+// @public
+export interface AuthProviderRouteHandlers {
+  frameHandler(req: Request_2, res: Response_2): Promise<void>;
+  logout?(req: Request_2, res: Response_2): Promise<void>;
+  refresh?(req: Request_2, res: Response_2): Promise<void>;
+  start(req: Request_2, res: Response_2): Promise<void>;
+}
+
+// @public (undocumented)
+export interface AuthProvidersExtensionPoint {
+  // (undocumented)
+  registerProvider(options: AuthProviderRegistrationOptions): void;
+}
+
+// @public (undocumented)
+export const authProvidersExtensionPoint: ExtensionPoint<AuthProvidersExtensionPoint>;
+
+// @public
+export type AuthResolverCatalogUserQuery =
+  | {
+      entityRef:
+        | string
+        | {
+            kind?: string;
+            namespace?: string;
+            name: string;
+          };
+    }
+  | {
+      annotations: Record<string, string>;
+    }
+  | {
+      filter: EntityFilterQuery;
+    };
+
+// @public
+export type AuthResolverContext = {
+  issueToken(params: TokenParams): Promise<{
+    token: string;
+  }>;
+  findCatalogUser(query: AuthResolverCatalogUserQuery): Promise<{
+    entity: Entity;
+  }>;
+  signInWithCatalogUser(
+    query: AuthResolverCatalogUserQuery,
+  ): Promise<BackstageSignInResult>;
+};
 
 // @public
 export interface BackstageIdentityResponse extends BackstageSignInResult {
+  expiresInSeconds?: number;
   identity: BackstageUserIdentity;
 }
 
@@ -23,6 +116,99 @@ export type BackstageUserIdentity = {
   ownershipEntityRefs: string[];
 };
 
+// @public (undocumented)
+export type ClientAuthResponse<TProviderInfo> = {
+  providerInfo: TProviderInfo;
+  profile: ProfileInfo;
+  backstageIdentity?: BackstageIdentityResponse;
+};
+
+// @public
+export namespace commonSignInResolvers {
+  const emailMatchingUserEntityProfileEmail: SignInResolverFactory<
+    unknown,
+    unknown
+  >;
+  const emailLocalPartMatchingUserEntityName: SignInResolverFactory<
+    unknown,
+    unknown
+  >;
+}
+
+// @public
+export type CookieConfigurer = (ctx: {
+  providerId: string;
+  baseUrl: string;
+  callbackUrl: string;
+  appOrigin: string;
+}) => {
+  domain: string;
+  path: string;
+  secure: boolean;
+  sameSite?: 'none' | 'lax' | 'strict';
+};
+
+// @public (undocumented)
+export function createOAuthAuthenticator<TContext, TProfile>(
+  authenticator: OAuthAuthenticator<TContext, TProfile>,
+): OAuthAuthenticator<TContext, TProfile>;
+
+// @public (undocumented)
+export function createOAuthProviderFactory<TProfile>(options: {
+  authenticator: OAuthAuthenticator<unknown, TProfile>;
+  stateTransform?: OAuthStateTransform;
+  profileTransform?: ProfileTransform<OAuthAuthenticatorResult<TProfile>>;
+  signInResolver?: SignInResolver<OAuthAuthenticatorResult<TProfile>>;
+  signInResolverFactories?: {
+    [name in string]: SignInResolverFactory<
+      OAuthAuthenticatorResult<TProfile>,
+      unknown
+    >;
+  };
+}): AuthProviderFactory;
+
+// @public (undocumented)
+export function createOAuthRouteHandlers<TProfile>(
+  options: OAuthRouteHandlersOptions<TProfile>,
+): AuthProviderRouteHandlers;
+
+// @public (undocumented)
+export function createProxyAuthenticator<TContext, TResult>(
+  authenticator: ProxyAuthenticator<TContext, TResult>,
+): ProxyAuthenticator<TContext, TResult>;
+
+// @public (undocumented)
+export function createProxyAuthProviderFactory<TResult>(options: {
+  authenticator: ProxyAuthenticator<unknown, TResult>;
+  profileTransform?: ProfileTransform<TResult>;
+  signInResolver?: SignInResolver<TResult>;
+  signInResolverFactories?: Record<
+    string,
+    SignInResolverFactory<TResult, unknown>
+  >;
+}): AuthProviderFactory;
+
+// @public (undocumented)
+export function createProxyAuthRouteHandlers<TResult>(
+  options: ProxyAuthRouteHandlersOptions<TResult>,
+): AuthProviderRouteHandlers;
+
+// @public (undocumented)
+export function createSignInResolverFactory<
+  TAuthResult,
+  TOptionsOutput,
+  TOptionsInput,
+>(
+  options: SignInResolverFactoryOptions<
+    TAuthResult,
+    TOptionsOutput,
+    TOptionsInput
+  >,
+): SignInResolverFactory<TAuthResult, TOptionsInput>;
+
+// @public (undocumented)
+export function decodeOAuthState(encodedState: string): OAuthState;
+
 // @public
 export class DefaultIdentityClient implements IdentityApi {
   // @deprecated
@@ -34,6 +220,9 @@ export class DefaultIdentityClient implements IdentityApi {
   ): Promise<BackstageIdentityResponse | undefined>;
 }
 
+// @public (undocumented)
+export function encodeOAuthState(state: OAuthState): string;
+
 // @public
 export function getBearerTokenFromAuthorizationHeader(
   authorizationHeader: unknown,
@@ -65,4 +254,393 @@ export type IdentityClientOptions = {
   issuer?: string;
   algorithms?: string[];
 };
+
+// @public (undocumented)
+export interface OAuthAuthenticator<TContext, TProfile> {
+  // (undocumented)
+  authenticate(
+    input: OAuthAuthenticatorAuthenticateInput,
+    ctx: TContext,
+  ): Promise<OAuthAuthenticatorResult<TProfile>>;
+  // (undocumented)
+  defaultProfileTransform: ProfileTransform<OAuthAuthenticatorResult<TProfile>>;
+  // (undocumented)
+  initialize(ctx: { callbackUrl: string; config: Config }): TContext;
+  // (undocumented)
+  logout?(input: OAuthAuthenticatorLogoutInput, ctx: TContext): Promise<void>;
+  // (undocumented)
+  refresh(
+    input: OAuthAuthenticatorRefreshInput,
+    ctx: TContext,
+  ): Promise<OAuthAuthenticatorResult<TProfile>>;
+  // (undocumented)
+  shouldPersistScopes?: boolean;
+  // (undocumented)
+  start(
+    input: OAuthAuthenticatorStartInput,
+    ctx: TContext,
+  ): Promise<{
+    url: string;
+    status?: number;
+  }>;
+}
+
+// @public (undocumented)
+export interface OAuthAuthenticatorAuthenticateInput {
+  // (undocumented)
+  req: Request_2;
+}
+
+// @public (undocumented)
+export interface OAuthAuthenticatorLogoutInput {
+  // (undocumented)
+  accessToken?: string;
+  // (undocumented)
+  refreshToken?: string;
+  // (undocumented)
+  req: Request_2;
+}
+
+// @public (undocumented)
+export interface OAuthAuthenticatorRefreshInput {
+  // (undocumented)
+  refreshToken: string;
+  // (undocumented)
+  req: Request_2;
+  // (undocumented)
+  scope: string;
+}
+
+// @public (undocumented)
+export interface OAuthAuthenticatorResult<TProfile> {
+  // (undocumented)
+  fullProfile: TProfile;
+  // (undocumented)
+  session: OAuthSession;
+}
+
+// @public (undocumented)
+export interface OAuthAuthenticatorStartInput {
+  // (undocumented)
+  req: Request_2;
+  // (undocumented)
+  scope: string;
+  // (undocumented)
+  state: string;
+}
+
+// @public (undocumented)
+export class OAuthEnvironmentHandler implements AuthProviderRouteHandlers {
+  constructor(handlers: Map<string, AuthProviderRouteHandlers>);
+  // (undocumented)
+  frameHandler(req: express.Request, res: express.Response): Promise<void>;
+  // (undocumented)
+  logout(req: express.Request, res: express.Response): Promise<void>;
+  // (undocumented)
+  static mapConfig(
+    config: Config,
+    factoryFunc: (envConfig: Config) => AuthProviderRouteHandlers,
+  ): OAuthEnvironmentHandler;
+  // (undocumented)
+  refresh(req: express.Request, res: express.Response): Promise<void>;
+  // (undocumented)
+  start(req: express.Request, res: express.Response): Promise<void>;
+}
+
+// @public (undocumented)
+export interface OAuthRouteHandlersOptions<TProfile> {
+  // (undocumented)
+  appUrl: string;
+  // (undocumented)
+  authenticator: OAuthAuthenticator<any, TProfile>;
+  // (undocumented)
+  baseUrl: string;
+  // (undocumented)
+  config: Config;
+  // (undocumented)
+  cookieConfigurer?: CookieConfigurer;
+  // (undocumented)
+  isOriginAllowed: (origin: string) => boolean;
+  // (undocumented)
+  profileTransform?: ProfileTransform<OAuthAuthenticatorResult<TProfile>>;
+  // (undocumented)
+  providerId: string;
+  // (undocumented)
+  resolverContext: AuthResolverContext;
+  // (undocumented)
+  signInResolver?: SignInResolver<OAuthAuthenticatorResult<TProfile>>;
+  // (undocumented)
+  stateTransform?: OAuthStateTransform;
+}
+
+// @public (undocumented)
+export interface OAuthSession {
+  // (undocumented)
+  accessToken: string;
+  // (undocumented)
+  expiresInSeconds?: number;
+  // (undocumented)
+  idToken?: string;
+  // (undocumented)
+  refreshToken?: string;
+  // (undocumented)
+  refreshTokenExpiresInSeconds?: number;
+  // (undocumented)
+  scope: string;
+  // (undocumented)
+  tokenType: string;
+}
+
+// @public
+export type OAuthState = {
+  nonce: string;
+  env: string;
+  origin?: string;
+  scope?: string;
+  redirectUrl?: string;
+  flow?: string;
+};
+
+// @public (undocumented)
+export type OAuthStateTransform = (
+  state: OAuthState,
+  context: {
+    req: Request_2;
+  },
+) => Promise<{
+  state: OAuthState;
+}>;
+
+// @public (undocumented)
+export type PassportDoneCallback<TResult, TPrivateInfo = never> = (
+  err?: Error,
+  result?: TResult,
+  privateInfo?: TPrivateInfo,
+) => void;
+
+// @public (undocumented)
+export class PassportHelpers {
+  // (undocumented)
+  static executeFetchUserProfileStrategy(
+    providerStrategy: Strategy,
+    accessToken: string,
+  ): Promise<PassportProfile>;
+  // (undocumented)
+  static executeFrameHandlerStrategy<TResult, TPrivateInfo = never>(
+    req: Request_2,
+    providerStrategy: Strategy,
+    options?: Record<string, string>,
+  ): Promise<{
+    result: TResult;
+    privateInfo: TPrivateInfo;
+  }>;
+  // (undocumented)
+  static executeRedirectStrategy(
+    req: Request_2,
+    providerStrategy: Strategy,
+    options: Record<string, string>,
+  ): Promise<{
+    url: string;
+    status?: number;
+  }>;
+  // (undocumented)
+  static executeRefreshTokenStrategy(
+    providerStrategy: Strategy,
+    refreshToken: string,
+    scope: string,
+  ): Promise<{
+    accessToken: string;
+    refreshToken?: string;
+    params: any;
+  }>;
+  // (undocumented)
+  static transformProfile: (
+    profile: PassportProfile,
+    idToken?: string,
+  ) => ProfileInfo;
+}
+
+// @public (undocumented)
+export class PassportOAuthAuthenticatorHelper {
+  // (undocumented)
+  authenticate(
+    input: OAuthAuthenticatorAuthenticateInput,
+  ): Promise<OAuthAuthenticatorResult<PassportProfile>>;
+  // (undocumented)
+  static defaultProfileTransform: ProfileTransform<
+    OAuthAuthenticatorResult<PassportProfile>
+  >;
+  // (undocumented)
+  fetchProfile(accessToken: string): Promise<PassportProfile>;
+  // (undocumented)
+  static from(strategy: Strategy): PassportOAuthAuthenticatorHelper;
+  // (undocumented)
+  refresh(
+    input: OAuthAuthenticatorRefreshInput,
+  ): Promise<OAuthAuthenticatorResult<PassportProfile>>;
+  // (undocumented)
+  start(
+    input: OAuthAuthenticatorStartInput,
+    options: Record<string, string>,
+  ): Promise<{
+    url: string;
+    status?: number;
+  }>;
+}
+
+// @public (undocumented)
+export type PassportOAuthDoneCallback = PassportDoneCallback<
+  PassportOAuthResult,
+  PassportOAuthPrivateInfo
+>;
+
+// @public (undocumented)
+export type PassportOAuthPrivateInfo = {
+  refreshToken?: string;
+};
+
+// @public (undocumented)
+export type PassportOAuthResult = {
+  fullProfile: PassportProfile;
+  params: {
+    id_token?: string;
+    scope: string;
+    token_type?: string;
+    expires_in: number;
+  };
+  accessToken: string;
+};
+
+// @public (undocumented)
+export type PassportProfile = Profile & {
+  avatarUrl?: string;
+};
+
+// @public
+export function prepareBackstageIdentityResponse(
+  result: BackstageSignInResult_2,
+): BackstageIdentityResponse_2;
+
+// @public
+export type ProfileInfo = {
+  email?: string;
+  displayName?: string;
+  picture?: string;
+};
+
+// @public
+export type ProfileTransform<TResult> = (
+  result: TResult,
+  context: AuthResolverContext,
+) => Promise<{
+  profile: ProfileInfo;
+}>;
+
+// @public (undocumented)
+export interface ProxyAuthenticator<TContext, TResult> {
+  // (undocumented)
+  authenticate(
+    options: {
+      req: Request_2;
+    },
+    ctx: TContext,
+  ): Promise<{
+    result: TResult;
+  }>;
+  // (undocumented)
+  defaultProfileTransform: ProfileTransform<TResult>;
+  // (undocumented)
+  initialize(ctx: { config: Config }): Promise<TContext>;
+}
+
+// @public (undocumented)
+export interface ProxyAuthRouteHandlersOptions<TResult> {
+  // (undocumented)
+  authenticator: ProxyAuthenticator<any, TResult>;
+  // (undocumented)
+  config: Config;
+  // (undocumented)
+  profileTransform?: ProfileTransform<TResult>;
+  // (undocumented)
+  resolverContext: AuthResolverContext;
+  // (undocumented)
+  signInResolver: SignInResolver<TResult>;
+}
+
+// @public (undocumented)
+export function readDeclarativeSignInResolver<TAuthResult>(
+  options: ReadDeclarativeSignInResolverOptions<TAuthResult>,
+): SignInResolver<TAuthResult> | undefined;
+
+// @public (undocumented)
+export interface ReadDeclarativeSignInResolverOptions<TAuthResult> {
+  // (undocumented)
+  config: Config;
+  // (undocumented)
+  signInResolverFactories: {
+    [name in string]: SignInResolverFactory<TAuthResult, unknown>;
+  };
+}
+
+// @public (undocumented)
+export function sendWebMessageResponse(
+  res: Response_2,
+  appOrigin: string,
+  response: WebMessageResponse,
+): void;
+
+// @public
+export type SignInInfo<TAuthResult> = {
+  profile: ProfileInfo;
+  result: TAuthResult;
+};
+
+// @public
+export type SignInResolver<TAuthResult> = (
+  info: SignInInfo<TAuthResult>,
+  context: AuthResolverContext,
+) => Promise<BackstageSignInResult>;
+
+// @public (undocumented)
+export interface SignInResolverFactory<TAuthResult, TOptions> {
+  // (undocumented)
+  (
+    ...options: undefined extends TOptions
+      ? [options?: TOptions]
+      : [options: TOptions]
+  ): SignInResolver<TAuthResult>;
+  // (undocumented)
+  optionsJsonSchema?: JsonObject;
+}
+
+// @public (undocumented)
+export interface SignInResolverFactoryOptions<
+  TAuthResult,
+  TOptionsOutput,
+  TOptionsInput,
+> {
+  // (undocumented)
+  create(options: TOptionsOutput): SignInResolver<TAuthResult>;
+  // (undocumented)
+  optionsSchema?: ZodSchema<TOptionsOutput, ZodTypeDef, TOptionsInput>;
+}
+
+// @public
+export type TokenParams = {
+  claims: {
+    sub: string;
+    ent?: string[];
+  } & Record<string, JsonValue>;
+};
+
+// @public
+export type WebMessageResponse =
+  | {
+      type: 'authorization_response';
+      response: ClientAuthResponse<unknown>;
+    }
+  | {
+      type: 'authorization_response';
+      error: Error;
+    };
 ```
diff --git a/plugins/auth-node/catalog-info.yaml b/plugins/auth-node/catalog-info.yaml
new file mode 100644
index 0000000000..4b23642810
--- /dev/null
+++ b/plugins/auth-node/catalog-info.yaml
@@ -0,0 +1,9 @@
+apiVersion: backstage.io/v1alpha1
+kind: Component
+metadata:
+  name: backstage-plugin-auth-node
+  title: '@backstage/plugin-auth-node'
+spec:
+  lifecycle: experimental
+  type: backstage-node-library
+  owner: maintainers
diff --git a/plugins/auth-node/package.json b/plugins/auth-node/package.json
index ab98ce1e7f..728b4a8ea8 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.17-next.1",
+  "version": "0.3.0-next.2",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
@@ -29,19 +29,31 @@
   },
   "dependencies": {
     "@backstage/backend-common": "workspace:^",
+    "@backstage/backend-plugin-api": "workspace:^",
+    "@backstage/catalog-client": "workspace:^",
+    "@backstage/catalog-model": "workspace:^",
     "@backstage/config": "workspace:^",
     "@backstage/errors": "workspace:^",
+    "@backstage/types": "workspace:^",
     "@types/express": "*",
+    "@types/passport": "^1.0.3",
     "express": "^4.17.1",
     "jose": "^4.6.0",
+    "lodash": "^4.17.21",
     "node-fetch": "^2.6.7",
-    "winston": "^3.2.1"
+    "passport": "^0.6.0",
+    "winston": "^3.2.1",
+    "zod": "^3.21.4",
+    "zod-to-json-schema": "^3.21.4"
   },
   "devDependencies": {
     "@backstage/backend-test-utils": "workspace:^",
     "@backstage/cli": "workspace:^",
+    "cookie-parser": "^1.4.6",
+    "express-promise-router": "^4.1.1",
     "lodash": "^4.17.21",
     "msw": "^1.0.0",
+    "supertest": "^6.1.3",
     "uuid": "^8.0.0"
   },
   "files": [
diff --git a/plugins/auth-node/src/extensions/AuthProvidersExtensionPoint.ts b/plugins/auth-node/src/extensions/AuthProvidersExtensionPoint.ts
new file mode 100644
index 0000000000..b67d5be017
--- /dev/null
+++ b/plugins/auth-node/src/extensions/AuthProvidersExtensionPoint.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 { createExtensionPoint } from '@backstage/backend-plugin-api';
+import { AuthProviderFactory } from '../types';
+
+/** @public */
+export interface AuthProviderRegistrationOptions {
+  providerId: string;
+  factory: AuthProviderFactory;
+}
+
+/** @public */
+export interface AuthProvidersExtensionPoint {
+  registerProvider(options: AuthProviderRegistrationOptions): void;
+}
+
+/** @public */
+export const authProvidersExtensionPoint =
+  createExtensionPoint<AuthProvidersExtensionPoint>({
+    id: 'auth.providers',
+  });
diff --git a/plugins/auth-node/src/extensions/index.ts b/plugins/auth-node/src/extensions/index.ts
new file mode 100644
index 0000000000..43e1751685
--- /dev/null
+++ b/plugins/auth-node/src/extensions/index.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 {
+  authProvidersExtensionPoint,
+  type AuthProviderRegistrationOptions,
+  type AuthProvidersExtensionPoint,
+} from './AuthProvidersExtensionPoint';
diff --git a/plugins/auth-node/src/flow/__testUtils__/parseWebMessageResponse.ts b/plugins/auth-node/src/flow/__testUtils__/parseWebMessageResponse.ts
new file mode 100644
index 0000000000..eda8469ac6
--- /dev/null
+++ b/plugins/auth-node/src/flow/__testUtils__/parseWebMessageResponse.ts
@@ -0,0 +1,28 @@
+/*
+ * 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 { WebMessageResponse } from '../sendWebMessageResponse';
+
+export function parseWebMessageResponse(text: string): {
+  response: WebMessageResponse;
+  origin: string;
+} {
+  const [response, origin] = text.matchAll(/decodeURIComponent\('(.+?)'\)/g);
+  return {
+    response: JSON.parse(decodeURIComponent(response[1])),
+    origin: decodeURIComponent(origin[1]),
+  };
+}
diff --git a/plugins/auth-node/src/flow/index.ts b/plugins/auth-node/src/flow/index.ts
new file mode 100644
index 0000000000..51d91e5d58
--- /dev/null
+++ b/plugins/auth-node/src/flow/index.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.
+ */
+
+export {
+  sendWebMessageResponse,
+  type WebMessageResponse,
+} from './sendWebMessageResponse';
diff --git a/plugins/auth-node/src/flow/sendWebMessageResponse.test.ts b/plugins/auth-node/src/flow/sendWebMessageResponse.test.ts
new file mode 100644
index 0000000000..cc192638f2
--- /dev/null
+++ b/plugins/auth-node/src/flow/sendWebMessageResponse.test.ts
@@ -0,0 +1,194 @@
+/*
+ * 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 express from 'express';
+import {
+  safelyEncodeURIComponent,
+  sendWebMessageResponse,
+  type WebMessageResponse,
+} from './sendWebMessageResponse';
+import { parseWebMessageResponse } from './__testUtils__/parseWebMessageResponse';
+
+describe('oauth helpers', () => {
+  describe('safelyEncodeURIComponent', () => {
+    it('encodes all occurrences of single quotes', () => {
+      expect(safelyEncodeURIComponent("a'ö'b")).toBe('a%27%C3%B6%27b');
+    });
+  });
+
+  describe('sendWebMessageResponse', () => {
+    const appOrigin = 'http://localhost:3000';
+    it('should post a message back with payload success', () => {
+      const mockResponse = {
+        end: jest.fn().mockReturnThis(),
+        setHeader: jest.fn().mockReturnThis(),
+      } as unknown as express.Response;
+
+      const data: WebMessageResponse = {
+        type: 'authorization_response',
+        response: {
+          providerInfo: {
+            accessToken: 'ACCESS_TOKEN',
+            idToken: 'ID_TOKEN',
+            expiresInSeconds: 10,
+            scope: 'email',
+          },
+          profile: {
+            email: 'foo@bar.com',
+          },
+          backstageIdentity: {
+            token: 'a.b.c',
+            identity: {
+              type: 'user',
+              ownershipEntityRefs: [],
+              userEntityRef: 'a',
+            },
+          },
+        },
+      };
+      const encoded = safelyEncodeURIComponent(JSON.stringify(data));
+
+      sendWebMessageResponse(mockResponse, appOrigin, data);
+      expect(mockResponse.setHeader).toHaveBeenCalledTimes(3);
+      expect(mockResponse.end).toHaveBeenCalledTimes(1);
+      expect(mockResponse.end).toHaveBeenCalledWith(
+        expect.stringContaining(encoded),
+      );
+    });
+
+    it('should post a message back with payload error', () => {
+      const mockResponse = {
+        end: jest.fn().mockReturnThis(),
+        setHeader: jest.fn().mockReturnThis(),
+      } as unknown as express.Response;
+
+      const data: WebMessageResponse = {
+        type: 'authorization_response',
+        error: new Error('Unknown error occurred'),
+      };
+      const encoded = safelyEncodeURIComponent(
+        JSON.stringify({
+          type: 'authorization_response',
+          error: { name: 'Error', message: 'Unknown error occurred' },
+        }),
+      );
+
+      sendWebMessageResponse(mockResponse, appOrigin, data);
+      expect(mockResponse.setHeader).toHaveBeenCalledTimes(3);
+      expect(mockResponse.end).toHaveBeenCalledTimes(1);
+      expect(mockResponse.end).toHaveBeenCalledWith(
+        expect.stringContaining(encoded),
+      );
+    });
+
+    it('should call postMessage twice but only one of them with target *', () => {
+      let responseBody = '';
+
+      const mockResponse = {
+        end: jest.fn(body => {
+          responseBody = body;
+          return this;
+        }),
+        setHeader: jest.fn().mockReturnThis(),
+      } as unknown as express.Response;
+
+      const data: WebMessageResponse = {
+        type: 'authorization_response',
+        response: {
+          providerInfo: {
+            accessToken: 'ACCESS_TOKEN',
+            idToken: 'ID_TOKEN',
+            expiresInSeconds: 10,
+            scope: 'email',
+          },
+          profile: {
+            email: 'foo@bar.com',
+          },
+          backstageIdentity: {
+            token: 'a.b.c',
+            identity: {
+              type: 'user',
+              ownershipEntityRefs: [],
+              userEntityRef: 'a',
+            },
+          },
+        },
+      };
+      sendWebMessageResponse(mockResponse, appOrigin, data);
+      expect(parseWebMessageResponse(responseBody).response).toEqual({
+        type: 'authorization_response',
+        response: {
+          providerInfo: expect.any(Object),
+          profile: {
+            email: 'foo@bar.com',
+          },
+          backstageIdentity: expect.any(Object),
+        },
+      });
+
+      const errData: WebMessageResponse = {
+        type: 'authorization_response',
+        error: new Error('Unknown error occurred'),
+      };
+      sendWebMessageResponse(mockResponse, appOrigin, errData);
+      expect(parseWebMessageResponse(responseBody).response).toEqual({
+        type: 'authorization_response',
+        error: {
+          name: 'Error',
+          message: 'Unknown error occurred',
+        },
+      });
+    });
+
+    it('handles single quotes and unicode chars safely', () => {
+      const mockResponse = {
+        end: jest.fn().mockReturnThis(),
+        setHeader: jest.fn().mockReturnThis(),
+      } as unknown as express.Response;
+
+      const data: WebMessageResponse = {
+        type: 'authorization_response',
+        response: {
+          providerInfo: {
+            accessToken: 'ACCESS_TOKEN',
+            idToken: 'ID_TOKEN',
+            expiresInSeconds: 10,
+            scope: 'email',
+          },
+          profile: {
+            email: 'foo@bar.com',
+            displayName: "Adam l'Hôpital",
+          },
+          backstageIdentity: {
+            token: 'a.b.c',
+            identity: {
+              type: 'user',
+              ownershipEntityRefs: [],
+              userEntityRef: 'a',
+            },
+          },
+        },
+      };
+
+      sendWebMessageResponse(mockResponse, appOrigin, data);
+      expect(mockResponse.setHeader).toHaveBeenCalledTimes(3);
+      expect(mockResponse.end).toHaveBeenCalledTimes(1);
+      expect(mockResponse.end).toHaveBeenCalledWith(
+        expect.stringContaining('Adam%20l%27H%C3%B4pital'),
+      );
+    });
+  });
+});
diff --git a/plugins/auth-node/src/flow/sendWebMessageResponse.ts b/plugins/auth-node/src/flow/sendWebMessageResponse.ts
new file mode 100644
index 0000000000..4c7a85854d
--- /dev/null
+++ b/plugins/auth-node/src/flow/sendWebMessageResponse.ts
@@ -0,0 +1,93 @@
+/*
+ * 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 { Response } from 'express';
+import crypto from 'crypto';
+import { ClientAuthResponse } from '../types';
+import { serializeError } from '@backstage/errors';
+
+/**
+ * Payload sent as a post message after the auth request is complete.
+ * If successful then has a valid payload with Auth information else contains an error.
+ *
+ * @public
+ */
+export type WebMessageResponse =
+  | {
+      type: 'authorization_response';
+      response: ClientAuthResponse<unknown>;
+    }
+  | {
+      type: 'authorization_response';
+      error: Error;
+    };
+
+/** @internal */
+export function safelyEncodeURIComponent(value: string): string {
+  // Note the g at the end of the regex; all occurrences of single quotes must
+  // be replaced, which encodeURIComponent does not do itself by default
+  return encodeURIComponent(value).replace(/'/g, '%27');
+}
+
+/** @public */
+export function sendWebMessageResponse(
+  res: Response,
+  appOrigin: string,
+  response: WebMessageResponse,
+): void {
+  const jsonData = JSON.stringify(response, (_, value) => {
+    if (value instanceof Error) {
+      return serializeError(value);
+    }
+    return value;
+  });
+  const base64Data = safelyEncodeURIComponent(jsonData);
+  const base64Origin = safelyEncodeURIComponent(appOrigin);
+
+  // NOTE: It is absolutely imperative that we use the safe encoder above, to
+  // be sure that the js code below does not allow the injection of malicious
+  // data.
+
+  // TODO: Make target app origin configurable globally
+
+  //
+  // postMessage fails silently if the targetOrigin is disallowed.
+  // So 2 postMessages are sent from the popup to the parent window.
+  // First, the origin being used to post the actual authorization response is
+  // shared with the parent window with a postMessage with targetOrigin '*'.
+  // Second, the actual authorization response is sent with the app origin
+  // as the targetOrigin.
+  // If the first message was received but the actual auth response was
+  // never received, the event listener can conclude that targetOrigin
+  // was disallowed, indicating potential misconfiguration.
+  //
+  const script = `
+    var authResponse = decodeURIComponent('${base64Data}');
+    var origin = decodeURIComponent('${base64Origin}');
+    var originInfo = {'type': 'config_info', 'targetOrigin': origin};
+    (window.opener || window.parent).postMessage(originInfo, '*');
+    (window.opener || window.parent).postMessage(JSON.parse(authResponse), origin);
+    setTimeout(() => {
+      window.close();
+    }, 100); // same as the interval of the core-app-api lib/loginPopup.ts (to address race conditions)
+  `;
+  const hash = crypto.createHash('sha256').update(script).digest('base64');
+
+  res.setHeader('Content-Type', 'text/html');
+  res.setHeader('X-Frame-Options', 'sameorigin');
+  res.setHeader('Content-Security-Policy', `script-src 'sha256-${hash}'`);
+  res.end(`<html><body><script>${script}</script></body></html>`);
+}
diff --git a/plugins/auth-node/src/DefaultIdentityClient.test.ts b/plugins/auth-node/src/identity/DefaultIdentityClient.test.ts
similarity index 99%
rename from plugins/auth-node/src/DefaultIdentityClient.test.ts
rename to plugins/auth-node/src/identity/DefaultIdentityClient.test.ts
index 13d9c5a17b..b9bf3cabd2 100644
--- a/plugins/auth-node/src/DefaultIdentityClient.test.ts
+++ b/plugins/auth-node/src/identity/DefaultIdentityClient.test.ts
@@ -26,7 +26,7 @@ import { setupServer } from 'msw/node';
 import { v4 as uuid } from 'uuid';
 
 import { DefaultIdentityClient } from './DefaultIdentityClient';
-import { IdentityApiGetIdentityRequest } from './types';
+import { IdentityApiGetIdentityRequest } from './IdentityApi';
 
 interface AnyJWK extends Record<string, string> {
   use: 'sig';
diff --git a/plugins/auth-node/src/DefaultIdentityClient.ts b/plugins/auth-node/src/identity/DefaultIdentityClient.ts
similarity index 97%
rename from plugins/auth-node/src/DefaultIdentityClient.ts
rename to plugins/auth-node/src/identity/DefaultIdentityClient.ts
index 8af8bf09e1..1095609dec 100644
--- a/plugins/auth-node/src/DefaultIdentityClient.ts
+++ b/plugins/auth-node/src/identity/DefaultIdentityClient.ts
@@ -25,12 +25,9 @@ import {
   jwtVerify,
 } from 'jose';
 import { GetKeyFunction } from 'jose/dist/types/types';
-import {
-  BackstageIdentityResponse,
-  IdentityApiGetIdentityRequest,
-} from './types';
 import { getBearerTokenFromAuthorizationHeader } from './getBearerTokenFromAuthorizationHeader';
-import { IdentityApi } from './IdentityApi';
+import { IdentityApi, IdentityApiGetIdentityRequest } from './IdentityApi';
+import { BackstageIdentityResponse } from '../types';
 
 const CLOCK_MARGIN_S = 10;
 
diff --git a/plugins/auth-node/src/IdentityApi.ts b/plugins/auth-node/src/identity/IdentityApi.ts
similarity index 80%
rename from plugins/auth-node/src/IdentityApi.ts
rename to plugins/auth-node/src/identity/IdentityApi.ts
index 86171fa3ab..8322b9f827 100644
--- a/plugins/auth-node/src/IdentityApi.ts
+++ b/plugins/auth-node/src/identity/IdentityApi.ts
@@ -13,10 +13,18 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import {
-  BackstageIdentityResponse,
-  IdentityApiGetIdentityRequest,
-} from './types';
+
+import { Request } from 'express';
+import { BackstageIdentityResponse } from '../types';
+
+/**
+ * Options to request the identity from a Backstage backend request
+ *
+ * @public
+ */
+export type IdentityApiGetIdentityRequest = {
+  request: Request<unknown>;
+};
 
 /**
  * An identity client api to authenticate Backstage
diff --git a/plugins/auth-node/src/IdentityClient.test.ts b/plugins/auth-node/src/identity/IdentityClient.test.ts
similarity index 100%
rename from plugins/auth-node/src/IdentityClient.test.ts
rename to plugins/auth-node/src/identity/IdentityClient.test.ts
diff --git a/plugins/auth-node/src/IdentityClient.ts b/plugins/auth-node/src/identity/IdentityClient.ts
similarity index 97%
rename from plugins/auth-node/src/IdentityClient.ts
rename to plugins/auth-node/src/identity/IdentityClient.ts
index 8252a61f81..fd6580dbb2 100644
--- a/plugins/auth-node/src/IdentityClient.ts
+++ b/plugins/auth-node/src/identity/IdentityClient.ts
@@ -18,7 +18,7 @@ import {
   DefaultIdentityClient,
   IdentityClientOptions,
 } from './DefaultIdentityClient';
-import { BackstageIdentityResponse } from './types';
+import { BackstageIdentityResponse } from '../types';
 
 /**
  * An identity client to interact with auth-backend and authenticate Backstage
diff --git a/plugins/auth-node/src/getBearerTokenFromAuthorizationHeader.test.ts b/plugins/auth-node/src/identity/getBearerTokenFromAuthorizationHeader.test.ts
similarity index 100%
rename from plugins/auth-node/src/getBearerTokenFromAuthorizationHeader.test.ts
rename to plugins/auth-node/src/identity/getBearerTokenFromAuthorizationHeader.test.ts
diff --git a/plugins/auth-node/src/getBearerTokenFromAuthorizationHeader.ts b/plugins/auth-node/src/identity/getBearerTokenFromAuthorizationHeader.ts
similarity index 100%
rename from plugins/auth-node/src/getBearerTokenFromAuthorizationHeader.ts
rename to plugins/auth-node/src/identity/getBearerTokenFromAuthorizationHeader.ts
diff --git a/plugins/auth-node/src/identity/index.ts b/plugins/auth-node/src/identity/index.ts
new file mode 100644
index 0000000000..24e2dcb691
--- /dev/null
+++ b/plugins/auth-node/src/identity/index.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.
+ */
+
+export { prepareBackstageIdentityResponse } from './prepareBackstageIdentityResponse';
+export { getBearerTokenFromAuthorizationHeader } from './getBearerTokenFromAuthorizationHeader';
+export {
+  DefaultIdentityClient,
+  type IdentityClientOptions,
+} from './DefaultIdentityClient';
+export { IdentityClient } from './IdentityClient';
+export type { IdentityApi, IdentityApiGetIdentityRequest } from './IdentityApi';
diff --git a/plugins/auth-backend/src/providers/prepareBackstageIdentityResponse.test.ts b/plugins/auth-node/src/identity/prepareBackstageIdentityResponse.test.ts
similarity index 53%
rename from plugins/auth-backend/src/providers/prepareBackstageIdentityResponse.test.ts
rename to plugins/auth-node/src/identity/prepareBackstageIdentityResponse.test.ts
index dac06f964e..d37224a11d 100644
--- a/plugins/auth-backend/src/providers/prepareBackstageIdentityResponse.test.ts
+++ b/plugins/auth-node/src/identity/prepareBackstageIdentityResponse.test.ts
@@ -23,7 +23,37 @@ function mkToken(payload: unknown) {
 }
 
 describe('prepareBackstageIdentityResponse', () => {
+  afterEach(jest.resetAllMocks);
+
   it('parses a complete token to determine the identity', () => {
+    jest.spyOn(Date, 'now').mockReturnValue(5000);
+
+    const token = mkToken({ sub: 'k:ns/n', ent: ['k:ns/o'], exp: 1005 });
+    expect(
+      prepareBackstageIdentityResponse({
+        token,
+      }),
+    ).toEqual({
+      token,
+      expiresInSeconds: 1000,
+      identity: {
+        type: 'user',
+        userEntityRef: 'k:ns/n',
+        ownershipEntityRefs: ['k:ns/o'],
+      },
+    });
+  });
+
+  it('should reject tokens without subject', () => {
+    const token = mkToken({});
+    expect(() =>
+      prepareBackstageIdentityResponse({
+        token,
+      }),
+    ).toThrow('Identity response must return a token with subject claim');
+  });
+
+  it('should treat expiration as optional', () => {
     const token = mkToken({ sub: 'k:ns/n', ent: ['k:ns/o'] });
     expect(
       prepareBackstageIdentityResponse({
@@ -38,4 +68,15 @@ describe('prepareBackstageIdentityResponse', () => {
       },
     });
   });
+
+  it('should reject tokens with negative expiration', () => {
+    jest.spyOn(Date, 'now').mockReturnValue(5000);
+
+    const token = mkToken({ sub: 'k:ns/n', ent: ['k:ns/o'], exp: 1 });
+    expect(() =>
+      prepareBackstageIdentityResponse({
+        token,
+      }),
+    ).toThrow('Identity response must not return an expired token');
+  });
 });
diff --git a/plugins/auth-node/src/identity/prepareBackstageIdentityResponse.ts b/plugins/auth-node/src/identity/prepareBackstageIdentityResponse.ts
new file mode 100644
index 0000000000..33e9bafd0d
--- /dev/null
+++ b/plugins/auth-node/src/identity/prepareBackstageIdentityResponse.ts
@@ -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 { InputError } from '@backstage/errors';
+import {
+  BackstageIdentityResponse,
+  BackstageSignInResult,
+} from '@backstage/plugin-auth-node';
+
+function parseJwtPayload(token: string) {
+  const [_header, payload, _signature] = token.split('.');
+  return JSON.parse(Buffer.from(payload, 'base64').toString());
+}
+
+/**
+ * Parses a Backstage-issued token and decorates the
+ * {@link @backstage/plugin-auth-node#BackstageIdentityResponse} with identity information sourced from the
+ * token.
+ *
+ * @public
+ */
+export function prepareBackstageIdentityResponse(
+  result: BackstageSignInResult,
+): BackstageIdentityResponse {
+  if (!result.token) {
+    throw new InputError(`Identity response must return a token`);
+  }
+
+  const { sub, ent = [], exp: expStr } = parseJwtPayload(result.token);
+  if (!sub) {
+    throw new InputError(
+      `Identity response must return a token with subject claim`,
+    );
+  }
+
+  const expAt = Number(expStr);
+
+  // Default to 1 hour if no expiration is set, in particular to make testing simpler
+  const exp = expAt ? Math.round(expAt - Date.now() / 1000) : undefined;
+  if (exp && exp < 0) {
+    throw new InputError(`Identity response must not return an expired token`);
+  }
+
+  return {
+    ...result,
+    expiresInSeconds: exp,
+    identity: {
+      type: 'user',
+      userEntityRef: sub,
+      ownershipEntityRefs: ent,
+    },
+  };
+}
diff --git a/plugins/auth-node/src/index.ts b/plugins/auth-node/src/index.ts
index a70f667adf..e7b0b628b8 100644
--- a/plugins/auth-node/src/index.ts
+++ b/plugins/auth-node/src/index.ts
@@ -20,14 +20,27 @@
  * @packageDocumentation
  */
 
-export { getBearerTokenFromAuthorizationHeader } from './getBearerTokenFromAuthorizationHeader';
-export { DefaultIdentityClient } from './DefaultIdentityClient';
-export { IdentityClient } from './IdentityClient';
-export type { IdentityApi } from './IdentityApi';
-export type { IdentityClientOptions } from './DefaultIdentityClient';
+export * from './extensions';
+export * from './flow';
+export * from './identity';
+export * from './oauth';
+export * from './passport';
+export * from './proxy';
+export * from './sign-in';
 export type {
+  AuthProviderConfig,
+  AuthProviderRouteHandlers,
+  AuthProviderFactory,
+  AuthResolverCatalogUserQuery,
+  AuthResolverContext,
   BackstageIdentityResponse,
   BackstageSignInResult,
   BackstageUserIdentity,
-  IdentityApiGetIdentityRequest,
+  ClientAuthResponse,
+  CookieConfigurer,
+  ProfileInfo,
+  ProfileTransform,
+  SignInInfo,
+  SignInResolver,
+  TokenParams,
 } from './types';
diff --git a/plugins/auth-node/src/oauth/OAuthCookieManager.ts b/plugins/auth-node/src/oauth/OAuthCookieManager.ts
new file mode 100644
index 0000000000..5fe2304610
--- /dev/null
+++ b/plugins/auth-node/src/oauth/OAuthCookieManager.ts
@@ -0,0 +1,127 @@
+/*
+ * 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 { Request, Response } from 'express';
+import { CookieConfigurer } from '../types';
+
+const THOUSAND_DAYS_MS = 1000 * 24 * 60 * 60 * 1000;
+const TEN_MINUTES_MS = 600 * 1000;
+
+const defaultCookieConfigurer: CookieConfigurer = ({
+  callbackUrl,
+  providerId,
+  appOrigin,
+}) => {
+  const { hostname: domain, pathname, protocol } = new URL(callbackUrl);
+  const secure = protocol === 'https:';
+
+  // For situations where the auth-backend is running on a
+  // different domain than the app, we set the SameSite attribute
+  // to 'none' to allow third-party access to the cookie, but
+  // only if it's in a secure context (https).
+  let sameSite: ReturnType<CookieConfigurer>['sameSite'] = 'lax';
+  if (new URL(appOrigin).hostname !== domain && secure) {
+    sameSite = 'none';
+  }
+
+  // If the provider supports callbackUrls, the pathname will
+  // contain the complete path to the frame handler so we need
+  // to slice off the trailing part of the path.
+  const path = pathname.endsWith(`${providerId}/handler/frame`)
+    ? pathname.slice(0, -'/handler/frame'.length)
+    : `${pathname}/${providerId}`;
+
+  return { domain, path, secure, sameSite };
+};
+
+/** @internal */
+export class OAuthCookieManager {
+  private readonly cookieConfigurer: CookieConfigurer;
+  private readonly nonceCookie: string;
+  private readonly refreshTokenCookie: string;
+  private readonly grantedScopeCookie: string;
+
+  constructor(
+    private readonly options: {
+      providerId: string;
+      defaultAppOrigin: string;
+      baseUrl: string;
+      callbackUrl: string;
+      cookieConfigurer?: CookieConfigurer;
+    },
+  ) {
+    this.cookieConfigurer = options.cookieConfigurer ?? defaultCookieConfigurer;
+
+    this.nonceCookie = `${options.providerId}-nonce`;
+    this.refreshTokenCookie = `${options.providerId}-refresh-token`;
+    this.grantedScopeCookie = `${options.providerId}-granted-scope`;
+  }
+
+  private getConfig(origin?: string, pathSuffix: string = '') {
+    const cookieConfig = this.cookieConfigurer({
+      providerId: this.options.providerId,
+      baseUrl: this.options.baseUrl,
+      callbackUrl: this.options.callbackUrl,
+      appOrigin: origin ?? this.options.defaultAppOrigin,
+    });
+    return {
+      httpOnly: true,
+      sameSite: 'lax' as const,
+      ...cookieConfig,
+      path: cookieConfig.path + pathSuffix,
+    };
+  }
+
+  setNonce(res: Response, nonce: string, origin?: string) {
+    res.cookie(this.nonceCookie, nonce, {
+      maxAge: TEN_MINUTES_MS,
+      ...this.getConfig(origin, '/handler'),
+    });
+  }
+
+  setRefreshToken(res: Response, refreshToken: string, origin?: string) {
+    res.cookie(this.refreshTokenCookie, refreshToken, {
+      maxAge: THOUSAND_DAYS_MS,
+      ...this.getConfig(origin),
+    });
+  }
+
+  removeRefreshToken(res: Response, origin?: string) {
+    res.cookie(this.refreshTokenCookie, '', {
+      maxAge: 0,
+      ...this.getConfig(origin),
+    });
+  }
+
+  setGrantedScopes(res: Response, scope: string, origin?: string) {
+    res.cookie(this.grantedScopeCookie, scope, {
+      maxAge: THOUSAND_DAYS_MS,
+      ...this.getConfig(origin),
+    });
+  }
+
+  getNonce(req: Request) {
+    return req.cookies[this.nonceCookie];
+  }
+
+  getRefreshToken(req: Request) {
+    return req.cookies[this.refreshTokenCookie];
+  }
+
+  getGrantedScopes(req: Request) {
+    return req.cookies[this.grantedScopeCookie];
+  }
+}
diff --git a/plugins/auth-node/src/oauth/OAuthEnvironmentHandler.ts b/plugins/auth-node/src/oauth/OAuthEnvironmentHandler.ts
new file mode 100644
index 0000000000..3a5ee00f8b
--- /dev/null
+++ b/plugins/auth-node/src/oauth/OAuthEnvironmentHandler.ts
@@ -0,0 +1,97 @@
+/*
+ * 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 express from 'express';
+import { Config } from '@backstage/config';
+import { InputError, NotFoundError } from '@backstage/errors';
+import { AuthProviderRouteHandlers } from '../types';
+import { decodeOAuthState } from './state';
+
+/** @public */
+export class OAuthEnvironmentHandler implements AuthProviderRouteHandlers {
+  static mapConfig(
+    config: Config,
+    factoryFunc: (envConfig: Config) => AuthProviderRouteHandlers,
+  ) {
+    const envs = config.keys();
+    const handlers = new Map<string, AuthProviderRouteHandlers>();
+
+    for (const env of envs) {
+      const envConfig = config.getConfig(env);
+      const handler = factoryFunc(envConfig);
+      handlers.set(env, handler);
+    }
+
+    return new OAuthEnvironmentHandler(handlers);
+  }
+
+  constructor(
+    private readonly handlers: Map<string, AuthProviderRouteHandlers>,
+  ) {}
+
+  async start(req: express.Request, res: express.Response): Promise<void> {
+    const provider = this.getProviderForEnv(req);
+    await provider.start(req, res);
+  }
+
+  async frameHandler(
+    req: express.Request,
+    res: express.Response,
+  ): Promise<void> {
+    const provider = this.getProviderForEnv(req);
+    await provider.frameHandler(req, res);
+  }
+
+  async refresh(req: express.Request, res: express.Response): Promise<void> {
+    const provider = this.getProviderForEnv(req);
+    await provider.refresh?.(req, res);
+  }
+
+  async logout(req: express.Request, res: express.Response): Promise<void> {
+    const provider = this.getProviderForEnv(req);
+    await provider.logout?.(req, res);
+  }
+
+  private getEnvFromRequest(req: express.Request): string | undefined {
+    const reqEnv = req.query.env?.toString();
+    if (reqEnv) {
+      return reqEnv;
+    }
+    const stateParams = req.query.state?.toString();
+    if (!stateParams) {
+      return undefined;
+    }
+    const { env } = decodeOAuthState(stateParams);
+    return env;
+  }
+
+  private getProviderForEnv(req: express.Request): AuthProviderRouteHandlers {
+    const env: string | undefined = this.getEnvFromRequest(req);
+
+    if (!env) {
+      throw new InputError(`Must specify 'env' query to select environment`);
+    }
+
+    const handler = this.handlers.get(env);
+    if (!handler) {
+      throw new NotFoundError(
+        `No configuration available for the '${env}' environment of this provider.`,
+      );
+    }
+
+    return handler;
+  }
+}
diff --git a/plugins/auth-node/src/oauth/PassportOAuthAuthenticatorHelper.ts b/plugins/auth-node/src/oauth/PassportOAuthAuthenticatorHelper.ts
new file mode 100644
index 0000000000..420a661da5
--- /dev/null
+++ b/plugins/auth-node/src/oauth/PassportOAuthAuthenticatorHelper.ts
@@ -0,0 +1,137 @@
+/*
+ * 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 { Strategy } from 'passport';
+import {
+  PassportDoneCallback,
+  PassportHelpers,
+  PassportProfile,
+} from '../passport';
+import { ProfileTransform } from '../types';
+import {
+  OAuthAuthenticatorAuthenticateInput,
+  OAuthAuthenticatorRefreshInput,
+  OAuthAuthenticatorResult,
+  OAuthAuthenticatorStartInput,
+} from './types';
+
+/** @public */
+export type PassportOAuthResult = {
+  fullProfile: PassportProfile;
+  params: {
+    id_token?: string;
+    scope: string;
+    token_type?: string;
+    expires_in: number;
+  };
+  accessToken: string;
+};
+
+/** @public */
+export type PassportOAuthPrivateInfo = {
+  refreshToken?: string;
+};
+
+/** @public */
+export type PassportOAuthDoneCallback = PassportDoneCallback<
+  PassportOAuthResult,
+  PassportOAuthPrivateInfo
+>;
+
+/** @public */
+export class PassportOAuthAuthenticatorHelper {
+  static defaultProfileTransform: ProfileTransform<
+    OAuthAuthenticatorResult<PassportProfile>
+  > = async input => ({
+    profile: PassportHelpers.transformProfile(
+      input.fullProfile,
+      input.session.idToken,
+    ),
+  });
+
+  static from(strategy: Strategy) {
+    return new PassportOAuthAuthenticatorHelper(strategy);
+  }
+
+  readonly #strategy: Strategy;
+
+  private constructor(strategy: Strategy) {
+    this.#strategy = strategy;
+  }
+
+  async start(
+    input: OAuthAuthenticatorStartInput,
+    options: Record<string, string>,
+  ): Promise<{ url: string; status?: number }> {
+    return PassportHelpers.executeRedirectStrategy(input.req, this.#strategy, {
+      scope: input.scope,
+      state: input.state,
+      ...options,
+    });
+  }
+
+  async authenticate(
+    input: OAuthAuthenticatorAuthenticateInput,
+  ): Promise<OAuthAuthenticatorResult<PassportProfile>> {
+    const { result, privateInfo } =
+      await PassportHelpers.executeFrameHandlerStrategy<
+        PassportOAuthResult,
+        PassportOAuthPrivateInfo
+      >(input.req, this.#strategy);
+
+    return {
+      fullProfile: result.fullProfile as PassportProfile,
+      session: {
+        accessToken: result.accessToken,
+        tokenType: result.params.token_type ?? 'bearer',
+        scope: result.params.scope,
+        expiresInSeconds: result.params.expires_in,
+        idToken: result.params.id_token,
+        refreshToken: privateInfo.refreshToken,
+      },
+    };
+  }
+
+  async refresh(
+    input: OAuthAuthenticatorRefreshInput,
+  ): Promise<OAuthAuthenticatorResult<PassportProfile>> {
+    const result = await PassportHelpers.executeRefreshTokenStrategy(
+      this.#strategy,
+      input.refreshToken,
+      input.scope,
+    );
+    const fullProfile = await this.fetchProfile(result.accessToken);
+    return {
+      fullProfile,
+      session: {
+        accessToken: result.accessToken,
+        tokenType: result.params.token_type ?? 'bearer',
+        scope: result.params.scope,
+        expiresInSeconds: result.params.expires_in,
+        idToken: result.params.id_token,
+        refreshToken: result.refreshToken,
+      },
+    };
+  }
+
+  async fetchProfile(accessToken: string): Promise<PassportProfile> {
+    const profile = await PassportHelpers.executeFetchUserProfileStrategy(
+      this.#strategy,
+      accessToken,
+    );
+    return profile;
+  }
+}
diff --git a/plugins/auth-node/src/oauth/createOAuthProviderFactory.ts b/plugins/auth-node/src/oauth/createOAuthProviderFactory.ts
new file mode 100644
index 0000000000..87fde6a1a2
--- /dev/null
+++ b/plugins/auth-node/src/oauth/createOAuthProviderFactory.ts
@@ -0,0 +1,66 @@
+/*
+ * 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 { readDeclarativeSignInResolver } from '../sign-in';
+import {
+  AuthProviderFactory,
+  ProfileTransform,
+  SignInResolver,
+} from '../types';
+import { OAuthEnvironmentHandler } from './OAuthEnvironmentHandler';
+import { createOAuthRouteHandlers } from './createOAuthRouteHandlers';
+import { OAuthStateTransform } from './state';
+import { OAuthAuthenticator, OAuthAuthenticatorResult } from './types';
+import { SignInResolverFactory } from '../sign-in/createSignInResolverFactory';
+
+/** @public */
+export function createOAuthProviderFactory<TProfile>(options: {
+  authenticator: OAuthAuthenticator<unknown, TProfile>;
+  stateTransform?: OAuthStateTransform;
+  profileTransform?: ProfileTransform<OAuthAuthenticatorResult<TProfile>>;
+  signInResolver?: SignInResolver<OAuthAuthenticatorResult<TProfile>>;
+  signInResolverFactories?: {
+    [name in string]: SignInResolverFactory<
+      OAuthAuthenticatorResult<TProfile>,
+      unknown
+    >;
+  };
+}): AuthProviderFactory {
+  return ctx => {
+    return OAuthEnvironmentHandler.mapConfig(ctx.config, envConfig => {
+      const signInResolver =
+        options.signInResolver ??
+        readDeclarativeSignInResolver({
+          config: envConfig,
+          signInResolverFactories: options.signInResolverFactories ?? {},
+        });
+
+      return createOAuthRouteHandlers<TProfile>({
+        authenticator: options.authenticator,
+        appUrl: ctx.appUrl,
+        baseUrl: ctx.baseUrl,
+        config: envConfig,
+        isOriginAllowed: ctx.isOriginAllowed,
+        cookieConfigurer: ctx.cookieConfigurer,
+        providerId: ctx.providerId,
+        resolverContext: ctx.resolverContext,
+        stateTransform: options.stateTransform,
+        profileTransform: options.profileTransform,
+        signInResolver,
+      });
+    });
+  };
+}
diff --git a/plugins/auth-node/src/oauth/createOAuthRouteHandlers.test.ts b/plugins/auth-node/src/oauth/createOAuthRouteHandlers.test.ts
new file mode 100644
index 0000000000..2573d95ea1
--- /dev/null
+++ b/plugins/auth-node/src/oauth/createOAuthRouteHandlers.test.ts
@@ -0,0 +1,742 @@
+/*
+ * 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 { ConfigReader } from '@backstage/config';
+import express from 'express';
+import request, { SuperAgentTest } from 'supertest';
+import cookieParser from 'cookie-parser';
+import PromiseRouter from 'express-promise-router';
+import { AuthProviderRouteHandlers, AuthResolverContext } from '../types';
+import { createOAuthRouteHandlers } from './createOAuthRouteHandlers';
+import { OAuthAuthenticator } from './types';
+import { errorHandler } from '@backstage/backend-common';
+import { encodeOAuthState, OAuthState } from './state';
+import { PassportProfile } from '../passport';
+import { parseWebMessageResponse } from '../flow/__testUtils__/parseWebMessageResponse';
+
+const mockAuthenticator: jest.Mocked<OAuthAuthenticator<unknown, unknown>> = {
+  initialize: jest.fn(_r => ({ ctx: 'authenticator' })),
+  start: jest.fn(),
+  authenticate: jest.fn(),
+  refresh: jest.fn(),
+  logout: jest.fn(),
+  defaultProfileTransform: jest.fn(async (_r, _c) => ({ profile: {} })),
+};
+
+const mockBackstageToken = `a.${btoa(
+  JSON.stringify({ sub: 'user:default/mock', ent: [] }),
+)}.c`;
+
+const mockSession = {
+  accessToken: 'access-token',
+  expiresInSeconds: 3,
+  scope: 'my-scope',
+  tokenType: 'bear',
+  idToken: 'id-token',
+  refreshToken: 'refresh-token',
+};
+
+const baseConfig = {
+  authenticator: mockAuthenticator,
+  appUrl: 'http://127.0.0.1',
+  baseUrl: 'http://127.0.0.1:7007',
+  isOriginAllowed: () => true,
+  providerId: 'my-provider',
+  config: new ConfigReader({}),
+  resolverContext: { ctx: 'resolver' } as unknown as AuthResolverContext,
+};
+
+function wrapInApp(handlers: AuthProviderRouteHandlers) {
+  const app = express();
+
+  const router = PromiseRouter();
+
+  router.use(cookieParser());
+  app.use('/my-provider', router);
+  app.use(errorHandler());
+
+  router.get('/start', handlers.start.bind(handlers));
+  router.get('/handler/frame', handlers.frameHandler.bind(handlers));
+  router.post('/handler/frame', handlers.frameHandler.bind(handlers));
+  if (handlers.logout) {
+    router.post('/logout', handlers.logout.bind(handlers));
+  }
+  if (handlers.refresh) {
+    router.get('/refresh', handlers.refresh.bind(handlers));
+    router.post('/refresh', handlers.refresh.bind(handlers));
+  }
+
+  return app;
+}
+
+function getNonceCookie(test: SuperAgentTest) {
+  return test.jar.getCookie('my-provider-nonce', {
+    domain: '127.0.0.1',
+    path: '/my-provider/handler',
+    script: false,
+    secure: false,
+  });
+}
+
+function getRefreshTokenCookie(test: SuperAgentTest) {
+  return test.jar.getCookie('my-provider-refresh-token', {
+    domain: '127.0.0.1',
+    path: '/my-provider',
+    script: false,
+    secure: false,
+  });
+}
+
+function getGrantedScopesCookie(test: SuperAgentTest) {
+  return test.jar.getCookie('my-provider-granted-scope', {
+    domain: '127.0.0.1',
+    path: '/my-provider',
+    script: false,
+    secure: false,
+  });
+}
+
+describe('createOAuthRouteHandlers', () => {
+  afterEach(() => jest.clearAllMocks());
+
+  it('should be created', () => {
+    const handlers = createOAuthRouteHandlers(baseConfig);
+    expect(handlers).toEqual({
+      start: expect.any(Function),
+      frameHandler: expect.any(Function),
+      refresh: expect.any(Function),
+      logout: expect.any(Function),
+    });
+  });
+
+  describe('start', () => {
+    it('should require an env query', async () => {
+      const app = wrapInApp(createOAuthRouteHandlers(baseConfig));
+      const res = await request(app).get('/my-provider/start');
+
+      expect(res.status).toBe(400);
+      expect(res.body).toMatchObject({
+        error: {
+          name: 'InputError',
+          message: 'No env provided in request query parameters',
+        },
+      });
+    });
+
+    it('should start', async () => {
+      const agent = request.agent(
+        wrapInApp(createOAuthRouteHandlers(baseConfig)),
+      );
+
+      mockAuthenticator.start.mockResolvedValue({
+        url: 'https://example.com/redirect',
+      });
+
+      const res = await agent.get(
+        '/my-provider/start?env=development&scope=my-scope',
+      );
+
+      const { value: nonce } = getNonceCookie(agent);
+
+      expect(res.text).toBe('');
+      expect(res.status).toBe(302);
+      expect(res.get('Location')).toBe('https://example.com/redirect');
+      expect(res.get('Content-Length')).toBe('0');
+
+      expect(mockAuthenticator.start).toHaveBeenCalledWith(
+        {
+          req: expect.anything(),
+          scope: 'my-scope',
+          state: encodeOAuthState({
+            nonce: decodeURIComponent(nonce),
+            env: 'development',
+          }),
+        },
+        { ctx: 'authenticator' },
+      );
+    });
+
+    it('should start with additional parameters, transform state, and persist scopes', async () => {
+      const agent = request.agent(
+        wrapInApp(
+          createOAuthRouteHandlers({
+            ...baseConfig,
+            authenticator: {
+              ...mockAuthenticator,
+              shouldPersistScopes: true,
+            },
+            stateTransform: async state => ({
+              state: { ...state, nonce: '123' },
+            }),
+          }),
+        ),
+      );
+
+      mockAuthenticator.start.mockResolvedValue({
+        url: 'https://example.com/redirect',
+      });
+
+      const res = await agent.get('/my-provider/start').query({
+        env: 'development',
+        scope: 'my-scope',
+        origin: 'https://remotehost',
+        redirectUrl: 'https://remotehost/redirect',
+        flow: 'redirect',
+      });
+
+      expect(res.text).toBe('');
+      expect(res.status).toBe(302);
+      expect(res.get('Location')).toBe('https://example.com/redirect');
+      expect(res.get('Content-Length')).toBe('0');
+
+      expect(mockAuthenticator.start).toHaveBeenCalledWith(
+        {
+          req: expect.anything(),
+          scope: 'my-scope',
+          state: encodeOAuthState({
+            nonce: '123',
+            env: 'development',
+            origin: 'https://remotehost',
+            redirectUrl: 'https://remotehost/redirect',
+            flow: 'redirect',
+            scope: 'my-scope',
+          }),
+        },
+        { ctx: 'authenticator' },
+      );
+    });
+  });
+
+  describe('frameHandler', () => {
+    it('should authenticate', async () => {
+      const agent = request.agent(
+        wrapInApp(createOAuthRouteHandlers(baseConfig)),
+      );
+
+      agent.jar.setCookie(
+        'my-provider-nonce=123',
+        '127.0.0.1',
+        '/my-provider/handler',
+      );
+
+      mockAuthenticator.authenticate.mockResolvedValue({
+        fullProfile: { id: 'id' } as PassportProfile,
+        session: mockSession,
+      });
+
+      const res = await agent.get('/my-provider/handler/frame').query({
+        state: encodeOAuthState({
+          env: 'development',
+          nonce: '123',
+        } as OAuthState),
+      });
+
+      expect(mockAuthenticator.authenticate).toHaveBeenCalledWith(
+        { req: expect.anything() },
+        { ctx: 'authenticator' },
+      );
+
+      expect(res.status).toBe(200);
+      expect(parseWebMessageResponse(res.text).response).toEqual({
+        type: 'authorization_response',
+        response: {
+          profile: {},
+          providerInfo: {
+            accessToken: 'access-token',
+            expiresInSeconds: 3,
+            idToken: 'id-token',
+            scope: 'my-scope',
+          },
+        },
+      });
+
+      expect(getRefreshTokenCookie(agent).value).toBe('refresh-token');
+      expect(getGrantedScopesCookie(agent)).toBeUndefined();
+    });
+
+    it('should authenticate with sign-in, profile transform, and persisted scopes', async () => {
+      const agent = request.agent(
+        wrapInApp(
+          createOAuthRouteHandlers({
+            ...baseConfig,
+            authenticator: {
+              ...mockAuthenticator,
+              shouldPersistScopes: true,
+            },
+            profileTransform: async () => ({ profile: { email: 'em@i.l' } }),
+            signInResolver: async () => ({ token: mockBackstageToken }),
+          }),
+        ),
+      );
+
+      agent.jar.setCookie(
+        'my-provider-nonce=123',
+        '127.0.0.1',
+        '/my-provider/handler',
+      );
+
+      mockAuthenticator.authenticate.mockResolvedValue({
+        fullProfile: { id: 'id' } as PassportProfile,
+        session: mockSession,
+      });
+
+      const res = await agent.get('/my-provider/handler/frame').query({
+        state: encodeOAuthState({
+          env: 'development',
+          nonce: '123',
+          scope: 'my-scope',
+        } as OAuthState),
+      });
+
+      expect(res.status).toBe(200);
+      expect(parseWebMessageResponse(res.text).response).toEqual({
+        type: 'authorization_response',
+        response: {
+          profile: { email: 'em@i.l' },
+          providerInfo: {
+            accessToken: 'access-token',
+            expiresInSeconds: 3,
+            idToken: 'id-token',
+            scope: 'my-scope',
+          },
+          backstageIdentity: {
+            identity: {
+              type: 'user',
+              ownershipEntityRefs: [],
+              userEntityRef: 'user:default/mock',
+            },
+            token: mockBackstageToken,
+          },
+        },
+      });
+
+      expect(getRefreshTokenCookie(agent).value).toBe('refresh-token');
+      expect(getGrantedScopesCookie(agent).value).toBe('my-scope');
+    });
+
+    it('should redirect with persisted scope', async () => {
+      const agent = request.agent(
+        wrapInApp(
+          createOAuthRouteHandlers({
+            ...baseConfig,
+            authenticator: {
+              ...mockAuthenticator,
+              shouldPersistScopes: true,
+            },
+            profileTransform: async () => ({ profile: { email: 'em@i.l' } }),
+            signInResolver: async () => ({ token: mockBackstageToken }),
+          }),
+        ),
+      );
+
+      agent.jar.setCookie(
+        'my-provider-nonce=123',
+        '127.0.0.1',
+        '/my-provider/handler',
+      );
+
+      mockAuthenticator.authenticate.mockResolvedValue({
+        fullProfile: { id: 'id' } as PassportProfile,
+        session: mockSession,
+      });
+
+      const res = await agent.get('/my-provider/handler/frame').query({
+        state: encodeOAuthState({
+          env: 'development',
+          nonce: '123',
+          scope: 'my-scope',
+          flow: 'redirect',
+          redirectUrl: 'https://127.0.0.1:3000/redirect',
+        } as OAuthState),
+      });
+
+      expect(res.status).toBe(302);
+      expect(res.get('Location')).toBe('https://127.0.0.1:3000/redirect');
+
+      expect(getRefreshTokenCookie(agent).value).toBe('refresh-token');
+      expect(getGrantedScopesCookie(agent).value).toBe('my-scope');
+    });
+
+    it('should require a valid origin', async () => {
+      const app = wrapInApp(createOAuthRouteHandlers(baseConfig));
+      const res = await request(app)
+        .get('/my-provider/handler/frame')
+        .query({
+          state: encodeOAuthState({
+            env: 'development',
+            nonce: '123',
+            origin: 'invalid-origin',
+          }),
+        });
+
+      expect(res.status).toBe(200);
+      expect(parseWebMessageResponse(res.text).response).toEqual({
+        type: 'authorization_response',
+        error: {
+          name: 'NotAllowedError',
+          message: 'App origin is invalid, failed to parse',
+        },
+      });
+    });
+
+    it('should reject origins that are not allowed', async () => {
+      const app = wrapInApp(
+        createOAuthRouteHandlers({
+          ...baseConfig,
+          isOriginAllowed: () => false,
+        }),
+      );
+      const res = await request(app)
+        .get('/my-provider/handler/frame')
+        .query({
+          state: encodeOAuthState({
+            env: 'development',
+            nonce: '123',
+            origin: 'http://localhost:3000',
+          }),
+        });
+
+      expect(res.status).toBe(200);
+      expect(parseWebMessageResponse(res.text).response).toEqual({
+        type: 'authorization_response',
+        error: {
+          name: 'NotAllowedError',
+          message: "Origin 'http://localhost:3000' is not allowed",
+        },
+      });
+    });
+
+    it('should reject missing state env', async () => {
+      const app = wrapInApp(createOAuthRouteHandlers(baseConfig));
+      const res = await request(app)
+        .get('/my-provider/handler/frame')
+        .query({
+          state: encodeOAuthState({
+            nonce: '123',
+          } as OAuthState),
+        });
+
+      expect(res.status).toBe(200);
+      expect(parseWebMessageResponse(res.text).response).toEqual({
+        type: 'authorization_response',
+        error: {
+          name: 'NotAllowedError',
+          message: 'OAuth state is invalid, missing env',
+        },
+      });
+    });
+
+    it('should reject missing cookie nonce', async () => {
+      const app = wrapInApp(createOAuthRouteHandlers(baseConfig));
+      const res = await request(app)
+        .get('/my-provider/handler/frame')
+        .query({
+          state: encodeOAuthState({
+            env: 'development',
+            nonce: '123',
+          }),
+        });
+
+      expect(res.status).toBe(200);
+      expect(parseWebMessageResponse(res.text).response).toEqual({
+        type: 'authorization_response',
+        error: {
+          name: 'NotAllowedError',
+          message: 'Auth response is missing cookie nonce',
+        },
+      });
+    });
+
+    it('should reject missing state nonce', async () => {
+      const app = wrapInApp(createOAuthRouteHandlers(baseConfig));
+      const res = await request(app)
+        .get('/my-provider/handler/frame')
+        .query({
+          state: encodeOAuthState({
+            env: 'development',
+          } as OAuthState),
+        });
+
+      expect(res.status).toBe(200);
+      expect(parseWebMessageResponse(res.text).response).toEqual({
+        type: 'authorization_response',
+        error: {
+          name: 'NotAllowedError',
+          message: 'OAuth state is invalid, missing nonce',
+        },
+      });
+    });
+
+    it('should reject mismatched nonce', async () => {
+      const agent = request.agent(
+        wrapInApp(createOAuthRouteHandlers(baseConfig)),
+      );
+
+      agent.jar.setCookie(
+        'my-provider-nonce=456',
+        '127.0.0.1',
+        '/my-provider/handler',
+      );
+
+      const res = await agent.get('/my-provider/handler/frame').query({
+        state: encodeOAuthState({
+          env: 'development',
+          nonce: '123',
+        } as OAuthState),
+      });
+
+      expect(res.status).toBe(200);
+      expect(parseWebMessageResponse(res.text).response).toEqual({
+        type: 'authorization_response',
+        error: {
+          name: 'NotAllowedError',
+          message: 'Invalid nonce',
+        },
+      });
+    });
+  });
+
+  describe('refresh', () => {
+    it('should refresh', async () => {
+      const agent = request.agent(
+        wrapInApp(createOAuthRouteHandlers(baseConfig)),
+      );
+
+      agent.jar.setCookie(
+        'my-provider-refresh-token=refresh-token',
+        '127.0.0.1',
+        '/my-provider',
+      );
+
+      mockAuthenticator.refresh.mockImplementation(async ({ scope }) => ({
+        fullProfile: { id: 'id' } as PassportProfile,
+        session: { ...mockSession, scope },
+      }));
+
+      const res = await agent
+        .post('/my-provider/refresh')
+        .set('X-Requested-With', 'XMLHttpRequest')
+        .query({ scope: 'my-scope' });
+
+      expect(mockAuthenticator.refresh).toHaveBeenCalledWith(
+        {
+          req: expect.anything(),
+          refreshToken: 'refresh-token',
+          scope: 'my-scope',
+        },
+        { ctx: 'authenticator' },
+      );
+
+      expect(res.status).toBe(200);
+      expect(res.body).toEqual({
+        profile: {},
+        providerInfo: {
+          accessToken: 'access-token',
+          expiresInSeconds: 3,
+          idToken: 'id-token',
+          scope: 'my-scope',
+        },
+      });
+    });
+
+    it('should refresh with sign-in, profile transform, and persisted scopes', async () => {
+      const agent = request.agent(
+        wrapInApp(
+          createOAuthRouteHandlers({
+            ...baseConfig,
+            authenticator: {
+              ...mockAuthenticator,
+              shouldPersistScopes: true,
+            },
+            profileTransform: async () => ({ profile: { email: 'em@i.l' } }),
+            signInResolver: async () => ({ token: mockBackstageToken }),
+          }),
+        ),
+      );
+
+      agent.jar.setCookie(
+        'my-provider-refresh-token=refresh-token',
+        '127.0.0.1',
+        '/my-provider',
+      );
+      agent.jar.setCookie(
+        'my-provider-granted-scope=persisted-scope',
+        '127.0.0.1',
+        '/my-provider',
+      );
+
+      mockAuthenticator.refresh.mockImplementation(async ({ scope }) => ({
+        fullProfile: { id: 'id' } as PassportProfile,
+        session: { ...mockSession, scope, refreshToken: 'new-refresh-token' },
+      }));
+
+      const res = await agent
+        .post('/my-provider/refresh')
+        .set('X-Requested-With', 'XMLHttpRequest');
+
+      expect(mockAuthenticator.refresh).toHaveBeenCalledWith(
+        {
+          req: expect.anything(),
+          refreshToken: 'refresh-token',
+          scope: 'persisted-scope',
+        },
+        { ctx: 'authenticator' },
+      );
+
+      expect(res.status).toBe(200);
+      expect(res.body).toEqual({
+        profile: { email: 'em@i.l' },
+        providerInfo: {
+          accessToken: 'access-token',
+          expiresInSeconds: 3,
+          idToken: 'id-token',
+          scope: 'persisted-scope',
+        },
+        backstageIdentity: {
+          identity: {
+            type: 'user',
+            ownershipEntityRefs: [],
+            userEntityRef: 'user:default/mock',
+          },
+          token: mockBackstageToken,
+        },
+      });
+      expect(getRefreshTokenCookie(agent).value).toBe('new-refresh-token');
+    });
+
+    it('should forward errors', async () => {
+      const agent = request.agent(
+        wrapInApp(createOAuthRouteHandlers(baseConfig)),
+      );
+
+      agent.jar.setCookie(
+        'my-provider-refresh-token=refresh-token',
+        '127.0.0.1',
+        '/my-provider',
+      );
+
+      mockAuthenticator.refresh.mockRejectedValue(new Error('NOPE'));
+
+      const res = await agent
+        .post('/my-provider/refresh')
+        .set('X-Requested-With', 'XMLHttpRequest');
+
+      expect(res.status).toBe(401);
+      expect(res.body).toMatchObject({
+        error: {
+          name: 'AuthenticationError',
+          message: 'Refresh failed; caused by Error: NOPE',
+        },
+      });
+    });
+
+    it('should require refresh cookie', async () => {
+      const res = await request(wrapInApp(createOAuthRouteHandlers(baseConfig)))
+        .post('/my-provider/refresh')
+        .set('X-Requested-With', 'XMLHttpRequest');
+
+      expect(res.status).toBe(401);
+      expect(res.body).toMatchObject({
+        error: {
+          name: 'AuthenticationError',
+          message:
+            'Refresh failed; caused by InputError: Missing session cookie',
+        },
+      });
+    });
+
+    it('should reject requests without CSRF header', async () => {
+      const res = await request(
+        wrapInApp(createOAuthRouteHandlers(baseConfig)),
+      ).post('/my-provider/refresh');
+
+      expect(res.status).toBe(401);
+      expect(res.body).toMatchObject({
+        error: {
+          name: 'AuthenticationError',
+          message: 'Invalid X-Requested-With header',
+        },
+      });
+    });
+
+    it('should reject requests with invalid CSRF header', async () => {
+      const res = await request(wrapInApp(createOAuthRouteHandlers(baseConfig)))
+        .post('/my-provider/refresh')
+        .set('X-Requested-With', 'invalid');
+
+      expect(res.status).toBe(401);
+      expect(res.body).toMatchObject({
+        error: {
+          name: 'AuthenticationError',
+          message: 'Invalid X-Requested-With header',
+        },
+      });
+    });
+  });
+
+  describe('logout', () => {
+    it('should log out', async () => {
+      const agent = request.agent(
+        wrapInApp(createOAuthRouteHandlers(baseConfig)),
+      );
+
+      agent.jar.setCookie(
+        'my-provider-refresh-token=my-refresh-token',
+        '127.0.0.1',
+        '/my-provider',
+      );
+
+      expect(getRefreshTokenCookie(agent).value).toBe('my-refresh-token');
+
+      const res = await agent
+        .post('/my-provider/logout')
+        .set('X-Requested-With', 'XMLHttpRequest');
+
+      expect(res.status).toBe(200);
+      expect(res.body).toEqual({});
+
+      expect(getRefreshTokenCookie(agent)).toBeUndefined();
+    });
+
+    it('should reject requests without CSRF header', async () => {
+      const app = wrapInApp(createOAuthRouteHandlers(baseConfig));
+
+      const res = await request(app).post('/my-provider/logout');
+      expect(res.status).toBe(401);
+      expect(res.body).toMatchObject({
+        error: {
+          name: 'AuthenticationError',
+          message: 'Invalid X-Requested-With header',
+        },
+      });
+    });
+
+    it('should reject requests with invalid CSRF header', async () => {
+      const app = wrapInApp(createOAuthRouteHandlers(baseConfig));
+
+      const res = await request(app)
+        .post('/my-provider/logout')
+        .set('X-Requested-With', 'wrong-value');
+      expect(res.status).toBe(401);
+      expect(res.body).toMatchObject({
+        error: {
+          name: 'AuthenticationError',
+          message: 'Invalid X-Requested-With header',
+        },
+      });
+    });
+  });
+});
diff --git a/plugins/auth-node/src/oauth/createOAuthRouteHandlers.ts b/plugins/auth-node/src/oauth/createOAuthRouteHandlers.ts
new file mode 100644
index 0000000000..011b3fc0f0
--- /dev/null
+++ b/plugins/auth-node/src/oauth/createOAuthRouteHandlers.ts
@@ -0,0 +1,343 @@
+/*
+ * 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 express from 'express';
+import crypto from 'crypto';
+import { URL } from 'url';
+import {
+  AuthenticationError,
+  InputError,
+  isError,
+  NotAllowedError,
+} from '@backstage/errors';
+import {
+  encodeOAuthState,
+  decodeOAuthState,
+  OAuthStateTransform,
+  OAuthState,
+} from './state';
+import { sendWebMessageResponse } from '../flow';
+import { prepareBackstageIdentityResponse } from '../identity';
+import { OAuthCookieManager } from './OAuthCookieManager';
+import {
+  AuthProviderRouteHandlers,
+  AuthResolverContext,
+  ClientAuthResponse,
+  CookieConfigurer,
+  ProfileTransform,
+  SignInResolver,
+} from '../types';
+import { OAuthAuthenticator, OAuthAuthenticatorResult } from './types';
+import { Config } from '@backstage/config';
+
+/** @public */
+export interface OAuthRouteHandlersOptions<TProfile> {
+  authenticator: OAuthAuthenticator<any, TProfile>;
+  appUrl: string;
+  baseUrl: string;
+  isOriginAllowed: (origin: string) => boolean;
+  providerId: string;
+  config: Config;
+  resolverContext: AuthResolverContext;
+  stateTransform?: OAuthStateTransform;
+  profileTransform?: ProfileTransform<OAuthAuthenticatorResult<TProfile>>;
+  cookieConfigurer?: CookieConfigurer;
+  signInResolver?: SignInResolver<OAuthAuthenticatorResult<TProfile>>;
+}
+
+/** @internal */
+type ClientOAuthResponse = ClientAuthResponse<{
+  /**
+   * An access token issued for the signed in user.
+   */
+  accessToken: string;
+  /**
+   * (Optional) Id token issued for the signed in user.
+   */
+  idToken?: string;
+  /**
+   * Expiry of the access token in seconds.
+   */
+  expiresInSeconds?: number;
+  /**
+   * Scopes granted for the access token.
+   */
+  scope: string;
+}>;
+
+/** @public */
+export function createOAuthRouteHandlers<TProfile>(
+  options: OAuthRouteHandlersOptions<TProfile>,
+): AuthProviderRouteHandlers {
+  const {
+    authenticator,
+    config,
+    baseUrl,
+    appUrl,
+    providerId,
+    isOriginAllowed,
+    cookieConfigurer,
+    resolverContext,
+    signInResolver,
+  } = options;
+
+  const defaultAppOrigin = new URL(appUrl).origin;
+  const callbackUrl =
+    config.getOptionalString('callbackUrl') ??
+    `${baseUrl}/${providerId}/handler/frame`;
+
+  const stateTransform = options.stateTransform ?? (state => ({ state }));
+  const profileTransform =
+    options.profileTransform ?? authenticator.defaultProfileTransform;
+  const authenticatorCtx = authenticator.initialize({ config, callbackUrl });
+  const cookieManager = new OAuthCookieManager({
+    baseUrl,
+    callbackUrl,
+    defaultAppOrigin,
+    providerId,
+    cookieConfigurer,
+  });
+
+  return {
+    async start(
+      this: never,
+      req: express.Request,
+      res: express.Response,
+    ): Promise<void> {
+      // retrieve scopes from request
+      const scope = req.query.scope?.toString() ?? '';
+      const env = req.query.env?.toString();
+      const origin = req.query.origin?.toString();
+      const redirectUrl = req.query.redirectUrl?.toString();
+      const flow = req.query.flow?.toString();
+
+      if (!env) {
+        throw new InputError('No env provided in request query parameters');
+      }
+
+      const nonce = crypto.randomBytes(16).toString('base64');
+      // set a nonce cookie before redirecting to oauth provider
+      cookieManager.setNonce(res, nonce, origin);
+
+      const state: OAuthState = { nonce, env, origin, redirectUrl, flow };
+
+      // If scopes are persisted then we pass them through the state so that we
+      // can set the cookie on successful auth
+      if (authenticator.shouldPersistScopes) {
+        state.scope = scope;
+      }
+
+      const { state: transformedState } = await stateTransform(state, { req });
+      const encodedState = encodeOAuthState(transformedState);
+
+      const { url, status } = await options.authenticator.start(
+        { req, scope, state: encodedState },
+        authenticatorCtx,
+      );
+
+      res.statusCode = status || 302;
+      res.setHeader('Location', url);
+      res.setHeader('Content-Length', '0');
+      res.end();
+    },
+
+    async frameHandler(
+      this: never,
+      req: express.Request,
+      res: express.Response,
+    ): Promise<void> {
+      let appOrigin = defaultAppOrigin;
+
+      try {
+        const state = decodeOAuthState(req.query.state?.toString() ?? '');
+
+        if (state.origin) {
+          try {
+            appOrigin = new URL(state.origin).origin;
+          } catch {
+            throw new NotAllowedError('App origin is invalid, failed to parse');
+          }
+          if (!isOriginAllowed(appOrigin)) {
+            throw new NotAllowedError(`Origin '${appOrigin}' is not allowed`);
+          }
+        }
+
+        // The same nonce is passed through cookie and state, and they must match
+        const cookieNonce = cookieManager.getNonce(req);
+        const stateNonce = state.nonce;
+        if (!cookieNonce) {
+          throw new NotAllowedError('Auth response is missing cookie nonce');
+        }
+        if (cookieNonce !== stateNonce) {
+          throw new NotAllowedError('Invalid nonce');
+        }
+
+        const result = await authenticator.authenticate(
+          { req },
+          authenticatorCtx,
+        );
+        const { profile } = await profileTransform(result, resolverContext);
+
+        const response: ClientOAuthResponse = {
+          profile,
+          providerInfo: {
+            idToken: result.session.idToken,
+            accessToken: result.session.accessToken,
+            scope: result.session.scope,
+            expiresInSeconds: result.session.expiresInSeconds,
+          },
+        };
+
+        if (signInResolver) {
+          const identity = await signInResolver(
+            { profile, result },
+            resolverContext,
+          );
+          response.backstageIdentity =
+            prepareBackstageIdentityResponse(identity);
+        }
+
+        // Store the scope that we have been granted for this session. This is useful if
+        // the provider does not return granted scopes on refresh or if they are normalized.
+        if (authenticator.shouldPersistScopes && state.scope) {
+          cookieManager.setGrantedScopes(res, state.scope, appOrigin);
+          result.session.scope = state.scope;
+        }
+
+        if (result.session.refreshToken) {
+          // set new refresh token
+          cookieManager.setRefreshToken(
+            res,
+            result.session.refreshToken,
+            appOrigin,
+          );
+        }
+
+        // When using the redirect flow we rely on refresh token we just
+        // acquired to get a new session once we're back in the app.
+        if (state.flow === 'redirect') {
+          if (!state.redirectUrl) {
+            throw new InputError(
+              'No redirectUrl provided in request query parameters',
+            );
+          }
+          res.redirect(state.redirectUrl);
+          return;
+        }
+
+        // post message back to popup if successful
+        sendWebMessageResponse(res, appOrigin, {
+          type: 'authorization_response',
+          response,
+        });
+      } catch (error) {
+        const { name, message } = isError(error)
+          ? error
+          : new Error('Encountered invalid error'); // Being a bit safe and not forwarding the bad value
+        // post error message back to popup if failure
+        sendWebMessageResponse(res, appOrigin, {
+          type: 'authorization_response',
+          error: { name, message },
+        });
+      }
+    },
+
+    async logout(
+      this: never,
+      req: express.Request,
+      res: express.Response,
+    ): Promise<void> {
+      // We use this as a lightweight CSRF protection
+      if (req.header('X-Requested-With') !== 'XMLHttpRequest') {
+        throw new AuthenticationError('Invalid X-Requested-With header');
+      }
+
+      if (authenticator.logout) {
+        const refreshToken = cookieManager.getRefreshToken(req);
+        await authenticator.logout({ req, refreshToken }, authenticatorCtx);
+      }
+
+      // remove refresh token cookie if it is set
+      cookieManager.removeRefreshToken(res, req.get('origin'));
+
+      res.status(200).end();
+    },
+
+    async refresh(
+      this: never,
+      req: express.Request,
+      res: express.Response,
+    ): Promise<void> {
+      // We use this as a lightweight CSRF protection
+      if (req.header('X-Requested-With') !== 'XMLHttpRequest') {
+        throw new AuthenticationError('Invalid X-Requested-With header');
+      }
+
+      try {
+        const refreshToken = cookieManager.getRefreshToken(req);
+
+        // throw error if refresh token is missing in the request
+        if (!refreshToken) {
+          throw new InputError('Missing session cookie');
+        }
+
+        let scope = req.query.scope?.toString() ?? '';
+        if (authenticator.shouldPersistScopes) {
+          scope = cookieManager.getGrantedScopes(req);
+        }
+
+        const result = await authenticator.refresh(
+          { req, scope, refreshToken },
+          authenticatorCtx,
+        );
+
+        const { profile } = await profileTransform(result, resolverContext);
+
+        const newRefreshToken = result.session.refreshToken;
+        if (newRefreshToken && newRefreshToken !== refreshToken) {
+          cookieManager.setRefreshToken(
+            res,
+            newRefreshToken,
+            req.get('origin'),
+          );
+        }
+
+        const response: ClientOAuthResponse = {
+          profile,
+          providerInfo: {
+            idToken: result.session.idToken,
+            accessToken: result.session.accessToken,
+            scope: result.session.scope,
+            expiresInSeconds: result.session.expiresInSeconds,
+          },
+        };
+
+        if (signInResolver) {
+          const identity = await signInResolver(
+            { profile, result },
+            resolverContext,
+          );
+          response.backstageIdentity =
+            prepareBackstageIdentityResponse(identity);
+        }
+
+        res.status(200).json(response);
+      } catch (error) {
+        throw new AuthenticationError('Refresh failed', error);
+      }
+    },
+  };
+}
diff --git a/plugins/auth-node/src/oauth/index.ts b/plugins/auth-node/src/oauth/index.ts
new file mode 100644
index 0000000000..25213dd2f0
--- /dev/null
+++ b/plugins/auth-node/src/oauth/index.ts
@@ -0,0 +1,44 @@
+/*
+ * 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 {
+  createOAuthRouteHandlers,
+  type OAuthRouteHandlersOptions,
+} from './createOAuthRouteHandlers';
+export {
+  PassportOAuthAuthenticatorHelper,
+  type PassportOAuthDoneCallback,
+  type PassportOAuthPrivateInfo,
+  type PassportOAuthResult,
+} from './PassportOAuthAuthenticatorHelper';
+export { OAuthEnvironmentHandler } from './OAuthEnvironmentHandler';
+export { createOAuthProviderFactory } from './createOAuthProviderFactory';
+export {
+  encodeOAuthState,
+  decodeOAuthState,
+  type OAuthState,
+  type OAuthStateTransform,
+} from './state';
+export {
+  createOAuthAuthenticator,
+  type OAuthAuthenticator,
+  type OAuthAuthenticatorAuthenticateInput,
+  type OAuthAuthenticatorLogoutInput,
+  type OAuthAuthenticatorRefreshInput,
+  type OAuthAuthenticatorResult,
+  type OAuthAuthenticatorStartInput,
+  type OAuthSession,
+} from './types';
diff --git a/plugins/auth-node/src/oauth/state.ts b/plugins/auth-node/src/oauth/state.ts
new file mode 100644
index 0000000000..fc747d08a5
--- /dev/null
+++ b/plugins/auth-node/src/oauth/state.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 pickBy from 'lodash/pickBy';
+import { Request } from 'express';
+import { NotAllowedError } from '@backstage/errors';
+
+/**
+ * A type for the serialized value in the `state` parameter of the OAuth authorization flow
+ * @public
+ */
+export type OAuthState = {
+  nonce: string;
+  env: string;
+  origin?: string;
+  scope?: string;
+  redirectUrl?: string;
+  flow?: string;
+};
+
+/** @public */
+export type OAuthStateTransform = (
+  state: OAuthState,
+  context: { req: Request },
+) => Promise<{ state: OAuthState }>;
+
+/** @public */
+export function encodeOAuthState(state: OAuthState): string {
+  const stateString = new URLSearchParams(
+    pickBy<string>(state, value => value !== undefined),
+  ).toString();
+
+  return Buffer.from(stateString, 'utf-8').toString('hex');
+}
+
+/** @public */
+export function decodeOAuthState(encodedState: string): OAuthState {
+  const state = Object.fromEntries(
+    new URLSearchParams(Buffer.from(encodedState, 'hex').toString('utf-8')),
+  );
+  if (!state.env || state.env?.length === 0) {
+    throw new NotAllowedError('OAuth state is invalid, missing env');
+  }
+  if (!state.nonce || state.nonce?.length === 0) {
+    throw new NotAllowedError('OAuth state is invalid, missing nonce');
+  }
+
+  return state as OAuthState;
+}
diff --git a/plugins/auth-node/src/oauth/types.ts b/plugins/auth-node/src/oauth/types.ts
new file mode 100644
index 0000000000..4bd7bd3f3f
--- /dev/null
+++ b/plugins/auth-node/src/oauth/types.ts
@@ -0,0 +1,89 @@
+/*
+ * 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 { Request } from 'express';
+import { ProfileTransform } from '../types';
+
+/** @public */
+export interface OAuthSession {
+  accessToken: string;
+  tokenType: string;
+  idToken?: string;
+  scope: string;
+  expiresInSeconds?: number;
+  refreshToken?: string;
+  refreshTokenExpiresInSeconds?: number;
+}
+
+/** @public */
+export interface OAuthAuthenticatorStartInput {
+  scope: string;
+  state: string;
+  req: Request;
+}
+
+/** @public */
+export interface OAuthAuthenticatorAuthenticateInput {
+  req: Request;
+}
+
+/** @public */
+export interface OAuthAuthenticatorRefreshInput {
+  scope: string;
+  refreshToken: string;
+  req: Request;
+}
+
+/** @public */
+export interface OAuthAuthenticatorLogoutInput {
+  accessToken?: string;
+  refreshToken?: string;
+  req: Request;
+}
+
+/** @public */
+export interface OAuthAuthenticatorResult<TProfile> {
+  fullProfile: TProfile;
+  session: OAuthSession;
+}
+
+/** @public */
+export interface OAuthAuthenticator<TContext, TProfile> {
+  defaultProfileTransform: ProfileTransform<OAuthAuthenticatorResult<TProfile>>;
+  shouldPersistScopes?: boolean;
+  initialize(ctx: { callbackUrl: string; config: Config }): TContext;
+  start(
+    input: OAuthAuthenticatorStartInput,
+    ctx: TContext,
+  ): Promise<{ url: string; status?: number }>;
+  authenticate(
+    input: OAuthAuthenticatorAuthenticateInput,
+    ctx: TContext,
+  ): Promise<OAuthAuthenticatorResult<TProfile>>;
+  refresh(
+    input: OAuthAuthenticatorRefreshInput,
+    ctx: TContext,
+  ): Promise<OAuthAuthenticatorResult<TProfile>>;
+  logout?(input: OAuthAuthenticatorLogoutInput, ctx: TContext): Promise<void>;
+}
+
+/** @public */
+export function createOAuthAuthenticator<TContext, TProfile>(
+  authenticator: OAuthAuthenticator<TContext, TProfile>,
+): OAuthAuthenticator<TContext, TProfile> {
+  return authenticator;
+}
diff --git a/plugins/auth-node/src/passport/PassportHelpers.ts b/plugins/auth-node/src/passport/PassportHelpers.ts
new file mode 100644
index 0000000000..6c13523811
--- /dev/null
+++ b/plugins/auth-node/src/passport/PassportHelpers.ts
@@ -0,0 +1,249 @@
+/*
+ * 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 { Request } from 'express';
+import { Strategy } from 'passport';
+import { PassportProfile } from './types';
+import { ProfileInfo } from '../types';
+
+// Re-declared here to avoid direct dependency on passport-oauth2
+/** @internal */
+interface InternalOAuthError extends Error {
+  oauthError?: {
+    data?: string;
+  };
+}
+
+/** @internal */
+function decodeJwtPayload(token: string): Record<string, string> {
+  const payloadStr = token.split('.')[1];
+  if (!payloadStr) {
+    throw new Error('Invalid JWT token');
+  }
+
+  let payload: unknown;
+  try {
+    payload = JSON.parse(
+      Buffer.from(
+        payloadStr.replace(/-/g, '+').replace(/_/g, '/'),
+        'base64',
+      ).toString('utf8'),
+    );
+  } catch (e) {
+    throw new Error('Invalid JWT token');
+  }
+  if (!payload || typeof payload !== 'object' || Array.isArray(payload)) {
+    throw new Error('Invalid JWT token');
+  }
+  return payload as Record<string, string>;
+}
+
+/** @public */
+export class PassportHelpers {
+  private constructor() {}
+
+  static transformProfile = (
+    profile: PassportProfile,
+    idToken?: string,
+  ): ProfileInfo => {
+    let email: string | undefined = undefined;
+    if (profile.emails && profile.emails.length > 0) {
+      const [firstEmail] = profile.emails;
+      email = firstEmail.value;
+    }
+
+    let picture: string | undefined = undefined;
+    if (profile.avatarUrl) {
+      picture = profile.avatarUrl;
+    } else if (profile.photos && profile.photos.length > 0) {
+      const [firstPhoto] = profile.photos;
+      picture = firstPhoto.value;
+    }
+
+    let displayName: string | undefined =
+      profile.displayName ?? profile.username ?? profile.id;
+
+    if ((!email || !picture || !displayName) && idToken) {
+      try {
+        const decoded: Record<string, string> = decodeJwtPayload(idToken);
+        if (!email && decoded.email) {
+          email = decoded.email;
+        }
+        if (!picture && decoded.picture) {
+          picture = decoded.picture;
+        }
+        if (!displayName && decoded.name) {
+          displayName = decoded.name;
+        }
+      } catch (e) {
+        throw new Error(`Failed to parse id token and get profile info, ${e}`);
+      }
+    }
+
+    return {
+      email,
+      picture,
+      displayName,
+    };
+  };
+
+  static async executeRedirectStrategy(
+    req: Request,
+    providerStrategy: Strategy,
+    options: Record<string, string>,
+  ): Promise<{
+    /**
+     * URL to redirect to
+     */
+    url: string;
+    /**
+     * Status code to use for the redirect
+     */
+    status?: number;
+  }> {
+    return new Promise(resolve => {
+      const strategy = Object.create(providerStrategy);
+      strategy.redirect = (url: string, status?: number) => {
+        resolve({ url, status: status ?? undefined });
+      };
+
+      strategy.authenticate(req, { ...options });
+    });
+  }
+
+  static async executeFrameHandlerStrategy<TResult, TPrivateInfo = never>(
+    req: Request,
+    providerStrategy: Strategy,
+    options?: Record<string, string>,
+  ): Promise<{ result: TResult; privateInfo: TPrivateInfo }> {
+    return new Promise((resolve, reject) => {
+      const strategy = Object.create(providerStrategy);
+      strategy.success = (result: any, privateInfo: any) => {
+        resolve({ result, privateInfo });
+      };
+      strategy.fail = (
+        info: { type: 'success' | 'error'; message?: string },
+        // _status: number,
+      ) => {
+        reject(new Error(`Authentication rejected, ${info.message ?? ''}`));
+      };
+      strategy.error = (error: InternalOAuthError) => {
+        let message = `Authentication failed, ${error.message}`;
+
+        if (error.oauthError?.data) {
+          try {
+            const errorData = JSON.parse(error.oauthError.data);
+
+            if (errorData.message) {
+              message += ` - ${errorData.message}`;
+            }
+          } catch (parseError) {
+            message += ` - ${error.oauthError}`;
+          }
+        }
+
+        reject(new Error(message));
+      };
+      strategy.redirect = () => {
+        reject(new Error('Unexpected redirect'));
+      };
+      strategy.authenticate(req, { ...(options ?? {}) });
+    });
+  }
+
+  static async executeRefreshTokenStrategy(
+    providerStrategy: Strategy,
+    refreshToken: string,
+    scope: string,
+  ): Promise<{
+    /**
+     * An access token issued for the signed in user.
+     */
+    accessToken: string;
+    /**
+     * Optionally, the server can issue a new Refresh Token for the user
+     */
+    refreshToken?: string;
+    params: any;
+  }> {
+    return new Promise((resolve, reject) => {
+      const anyStrategy = providerStrategy as any;
+      const OAuth2 = anyStrategy._oauth2.constructor;
+      const oauth2 = new OAuth2(
+        anyStrategy._oauth2._clientId,
+        anyStrategy._oauth2._clientSecret,
+        anyStrategy._oauth2._baseSite,
+        anyStrategy._oauth2._authorizeUrl,
+        anyStrategy._refreshURL || anyStrategy._oauth2._accessTokenUrl,
+        anyStrategy._oauth2._customHeaders,
+      );
+
+      oauth2.getOAuthAccessToken(
+        refreshToken,
+        {
+          scope,
+          grant_type: 'refresh_token',
+        },
+        (
+          err: Error | null,
+          accessToken: string,
+          newRefreshToken: string,
+          params: any,
+        ) => {
+          if (err) {
+            reject(
+              new Error(`Failed to refresh access token ${err.toString()}`),
+            );
+          }
+          if (!accessToken) {
+            reject(
+              new Error(
+                `Failed to refresh access token, no access token received`,
+              ),
+            );
+          }
+
+          resolve({
+            accessToken,
+            refreshToken: newRefreshToken,
+            params,
+          });
+        },
+      );
+    });
+  }
+
+  static async executeFetchUserProfileStrategy(
+    providerStrategy: Strategy,
+    accessToken: string,
+  ): Promise<PassportProfile> {
+    return new Promise((resolve, reject) => {
+      const anyStrategy = providerStrategy as unknown as {
+        userProfile(accessToken: string, callback: Function): void;
+      };
+      anyStrategy.userProfile(
+        accessToken,
+        (error: Error, rawProfile: PassportProfile) => {
+          if (error) {
+            reject(error);
+          } else {
+            resolve(rawProfile);
+          }
+        },
+      );
+    });
+  }
+}
diff --git a/plugins/auth-node/src/passport/index.ts b/plugins/auth-node/src/passport/index.ts
new file mode 100644
index 0000000000..f70c0af921
--- /dev/null
+++ b/plugins/auth-node/src/passport/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 { PassportHelpers } from './PassportHelpers';
+export type { PassportDoneCallback, PassportProfile } from './types';
diff --git a/plugins/auth-node/src/passport/types.ts b/plugins/auth-node/src/passport/types.ts
new file mode 100644
index 0000000000..4a3f41b6b2
--- /dev/null
+++ b/plugins/auth-node/src/passport/types.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 { Profile } from 'passport';
+
+/** @public */
+export type PassportProfile = Profile & {
+  avatarUrl?: string;
+};
+
+/** @public */
+export type PassportDoneCallback<TResult, TPrivateInfo = never> = (
+  err?: Error,
+  result?: TResult,
+  privateInfo?: TPrivateInfo,
+) => void;
diff --git a/plugins/auth-node/src/proxy/createProxyAuthProviderFactory.ts b/plugins/auth-node/src/proxy/createProxyAuthProviderFactory.ts
new file mode 100644
index 0000000000..8626c40b33
--- /dev/null
+++ b/plugins/auth-node/src/proxy/createProxyAuthProviderFactory.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 {
+  readDeclarativeSignInResolver,
+  SignInResolverFactory,
+} from '../sign-in';
+import {
+  AuthProviderFactory,
+  ProfileTransform,
+  SignInResolver,
+} from '../types';
+import { createProxyAuthRouteHandlers } from './createProxyRouteHandlers';
+import { ProxyAuthenticator } from './types';
+
+/** @public */
+export function createProxyAuthProviderFactory<TResult>(options: {
+  authenticator: ProxyAuthenticator<unknown, TResult>;
+  profileTransform?: ProfileTransform<TResult>;
+  signInResolver?: SignInResolver<TResult>;
+  signInResolverFactories?: Record<
+    string,
+    SignInResolverFactory<TResult, unknown>
+  >;
+}): AuthProviderFactory {
+  return ctx => {
+    const signInResolver =
+      options.signInResolver ??
+      readDeclarativeSignInResolver({
+        config: ctx.config,
+        signInResolverFactories: options.signInResolverFactories ?? {},
+      });
+
+    if (!signInResolver) {
+      throw new Error(
+        `No sign-in resolver configured for proxy auth provider '${ctx.providerId}'`,
+      );
+    }
+
+    return createProxyAuthRouteHandlers<TResult>({
+      signInResolver,
+      config: ctx.config,
+      authenticator: options.authenticator,
+      resolverContext: ctx.resolverContext,
+      profileTransform: options.profileTransform,
+    });
+  };
+}
diff --git a/plugins/auth-node/src/proxy/createProxyRouteHandlers.ts b/plugins/auth-node/src/proxy/createProxyRouteHandlers.ts
new file mode 100644
index 0000000000..521fe39288
--- /dev/null
+++ b/plugins/auth-node/src/proxy/createProxyRouteHandlers.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 { Request, Response } from 'express';
+import { Config } from '@backstage/config';
+import {
+  AuthProviderRouteHandlers,
+  AuthResolverContext,
+  ClientAuthResponse,
+  ProfileTransform,
+  SignInResolver,
+} from '../types';
+import { ProxyAuthenticator } from './types';
+import { prepareBackstageIdentityResponse } from '../identity';
+import { NotImplementedError } from '@backstage/errors';
+
+/** @public */
+export interface ProxyAuthRouteHandlersOptions<TResult> {
+  authenticator: ProxyAuthenticator<any, TResult>;
+  config: Config;
+  resolverContext: AuthResolverContext;
+  signInResolver: SignInResolver<TResult>;
+  profileTransform?: ProfileTransform<TResult>;
+}
+
+/** @public */
+export function createProxyAuthRouteHandlers<TResult>(
+  options: ProxyAuthRouteHandlersOptions<TResult>,
+): AuthProviderRouteHandlers {
+  const { authenticator, config, resolverContext, signInResolver } = options;
+
+  const profileTransform =
+    options.profileTransform ?? authenticator.defaultProfileTransform;
+  const authenticatorCtx = authenticator.initialize({ config });
+
+  return {
+    async start(): Promise<void> {
+      throw new NotImplementedError('Not implemented');
+    },
+
+    async frameHandler(): Promise<void> {
+      throw new NotImplementedError('Not implemented');
+    },
+
+    async refresh(this: never, req: Request, res: Response): Promise<void> {
+      const { result } = await authenticator.authenticate(
+        { req },
+        authenticatorCtx,
+      );
+
+      const { profile } = await profileTransform(result, resolverContext);
+
+      const identity = await signInResolver(
+        { profile, result },
+        resolverContext,
+      );
+
+      const response: ClientAuthResponse<{}> = {
+        profile,
+        providerInfo: {},
+        backstageIdentity: prepareBackstageIdentityResponse(identity),
+      };
+
+      res.status(200).json(response);
+    },
+  };
+}
diff --git a/plugins/auth-node/src/proxy/index.ts b/plugins/auth-node/src/proxy/index.ts
new file mode 100644
index 0000000000..907f8829e5
--- /dev/null
+++ b/plugins/auth-node/src/proxy/index.ts
@@ -0,0 +1,22 @@
+/*
+ * 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 { createProxyAuthenticator, type ProxyAuthenticator } from './types';
+export { createProxyAuthProviderFactory } from './createProxyAuthProviderFactory';
+export {
+  createProxyAuthRouteHandlers,
+  type ProxyAuthRouteHandlersOptions,
+} from './createProxyRouteHandlers';
diff --git a/plugins/auth-node/src/proxy/types.ts b/plugins/auth-node/src/proxy/types.ts
new file mode 100644
index 0000000000..969b022abb
--- /dev/null
+++ b/plugins/auth-node/src/proxy/types.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 { Config } from '@backstage/config';
+import { Request } from 'express';
+import { ProfileTransform } from '../types';
+
+/** @public */
+export interface ProxyAuthenticator<TContext, TResult> {
+  defaultProfileTransform: ProfileTransform<TResult>;
+  initialize(ctx: { config: Config }): Promise<TContext>;
+  authenticate(
+    options: { req: Request },
+    ctx: TContext,
+  ): Promise<{ result: TResult }>;
+}
+
+/** @public */
+export function createProxyAuthenticator<TContext, TResult>(
+  authenticator: ProxyAuthenticator<TContext, TResult>,
+): ProxyAuthenticator<TContext, TResult> {
+  return authenticator;
+}
diff --git a/plugins/auth-node/src/sign-in/commonSignInResolvers.ts b/plugins/auth-node/src/sign-in/commonSignInResolvers.ts
new file mode 100644
index 0000000000..5b5da07c73
--- /dev/null
+++ b/plugins/auth-node/src/sign-in/commonSignInResolvers.ts
@@ -0,0 +1,73 @@
+/*
+ * 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 { createSignInResolverFactory } from './createSignInResolverFactory';
+
+/**
+ * A collection of common sign-in resolvers that work with any auth provider.
+ *
+ * @public
+ */
+export namespace commonSignInResolvers {
+  /**
+   * A common sign-in resolver that looks up the user using their email address
+   * as email of the entity.
+   */
+  export const emailMatchingUserEntityProfileEmail =
+    createSignInResolverFactory({
+      create() {
+        return async (info, ctx) => {
+          const { profile } = info;
+
+          if (!profile.email) {
+            throw new Error(
+              'Login failed, user profile does not contain an email',
+            );
+          }
+
+          return ctx.signInWithCatalogUser({
+            filter: {
+              'spec.profile.email': profile.email,
+            },
+          });
+        };
+      },
+    });
+
+  /**
+   * A common sign-in resolver that looks up the user using the local part of
+   * their email address as the entity name.
+   */
+  export const emailLocalPartMatchingUserEntityName =
+    createSignInResolverFactory({
+      create() {
+        return async (info, ctx) => {
+          const { profile } = info;
+
+          if (!profile.email) {
+            throw new Error(
+              'Login failed, user profile does not contain an email',
+            );
+          }
+          const [localPart] = profile.email.split('@');
+
+          return ctx.signInWithCatalogUser({
+            entityRef: { name: localPart },
+          });
+        };
+      },
+    });
+}
diff --git a/plugins/auth-node/src/sign-in/createSignInResolverFactory.ts b/plugins/auth-node/src/sign-in/createSignInResolverFactory.ts
new file mode 100644
index 0000000000..0632b704c3
--- /dev/null
+++ b/plugins/auth-node/src/sign-in/createSignInResolverFactory.ts
@@ -0,0 +1,75 @@
+/*
+ * 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 { ZodSchema, ZodTypeDef } from 'zod';
+import { SignInResolver } from '../types';
+import zodToJsonSchema from 'zod-to-json-schema';
+import { JsonObject } from '@backstage/types';
+import { InputError } from '@backstage/errors';
+
+/** @public */
+export interface SignInResolverFactory<TAuthResult, TOptions> {
+  (
+    ...options: undefined extends TOptions
+      ? [options?: TOptions]
+      : [options: TOptions]
+  ): SignInResolver<TAuthResult>;
+  optionsJsonSchema?: JsonObject;
+}
+
+/** @public */
+export interface SignInResolverFactoryOptions<
+  TAuthResult,
+  TOptionsOutput,
+  TOptionsInput,
+> {
+  optionsSchema?: ZodSchema<TOptionsOutput, ZodTypeDef, TOptionsInput>;
+  create(options: TOptionsOutput): SignInResolver<TAuthResult>;
+}
+
+/** @public */
+export function createSignInResolverFactory<
+  TAuthResult,
+  TOptionsOutput,
+  TOptionsInput,
+>(
+  options: SignInResolverFactoryOptions<
+    TAuthResult,
+    TOptionsOutput,
+    TOptionsInput
+  >,
+): SignInResolverFactory<TAuthResult, TOptionsInput> {
+  const { optionsSchema } = options;
+  if (!optionsSchema) {
+    return (resolverOptions?: TOptionsInput) => {
+      if (resolverOptions) {
+        throw new InputError('sign-in resolver does not accept options');
+      }
+      return options.create(undefined as TOptionsOutput);
+    };
+  }
+  const factory = (
+    ...[resolverOptions]: undefined extends TOptionsInput
+      ? [options?: TOptionsInput]
+      : [options: TOptionsInput]
+  ) => {
+    const parsedOptions = optionsSchema.parse(resolverOptions);
+    return options.create(parsedOptions);
+  };
+
+  factory.optionsJsonSchema = zodToJsonSchema(optionsSchema) as JsonObject;
+  return factory;
+}
diff --git a/plugins/auth-node/src/sign-in/index.ts b/plugins/auth-node/src/sign-in/index.ts
new file mode 100644
index 0000000000..736393a762
--- /dev/null
+++ b/plugins/auth-node/src/sign-in/index.ts
@@ -0,0 +1,26 @@
+/*
+ * 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 {
+  createSignInResolverFactory,
+  type SignInResolverFactory,
+  type SignInResolverFactoryOptions,
+} from './createSignInResolverFactory';
+export {
+  readDeclarativeSignInResolver,
+  type ReadDeclarativeSignInResolverOptions,
+} from './readDeclarativeSignInResolver';
+export { commonSignInResolvers } from './commonSignInResolvers';
diff --git a/plugins/auth-node/src/sign-in/readDeclarativeSignInResolver.ts b/plugins/auth-node/src/sign-in/readDeclarativeSignInResolver.ts
new file mode 100644
index 0000000000..82b4918326
--- /dev/null
+++ b/plugins/auth-node/src/sign-in/readDeclarativeSignInResolver.ts
@@ -0,0 +1,71 @@
+/*
+ * 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 { JsonObject } from '@backstage/types';
+import { SignInResolver } from '../types';
+import { SignInResolverFactory } from './createSignInResolverFactory';
+
+/** @public */
+export interface ReadDeclarativeSignInResolverOptions<TAuthResult> {
+  config: Config;
+  signInResolverFactories: {
+    [name in string]: SignInResolverFactory<TAuthResult, unknown>;
+  };
+}
+
+/** @public */
+export function readDeclarativeSignInResolver<TAuthResult>(
+  options: ReadDeclarativeSignInResolverOptions<TAuthResult>,
+): SignInResolver<TAuthResult> | undefined {
+  const resolvers =
+    options.config
+      .getOptionalConfigArray('signIn.resolvers')
+      ?.map(resolverConfig => {
+        const resolverName = resolverConfig.getString('resolver');
+        if (!Object.hasOwn(options.signInResolverFactories, resolverName)) {
+          throw new Error(
+            `Sign-in resolver '${resolverName}' is not available`,
+          );
+        }
+        const resolver = options.signInResolverFactories[resolverName];
+        const { resolver: _ignored, ...resolverOptions } =
+          resolverConfig.get<JsonObject>();
+
+        return resolver(
+          Object.keys(resolverOptions).length > 0 ? resolverOptions : undefined,
+        );
+      }) ?? [];
+
+  if (resolvers.length === 0) {
+    return undefined;
+  }
+
+  return async (profile, context) => {
+    for (const resolver of resolvers) {
+      try {
+        return await resolver(profile, context);
+      } catch (error) {
+        if (error?.name === 'NotFoundError') {
+          continue;
+        }
+        throw error;
+      }
+    }
+
+    throw new Error('Failed to sign-in, unable to resolve user identity');
+  };
+}
diff --git a/plugins/auth-node/src/types.ts b/plugins/auth-node/src/types.ts
index 9aec98a372..d4cb0ac48e 100644
--- a/plugins/auth-node/src/types.ts
+++ b/plugins/auth-node/src/types.ts
@@ -14,7 +14,12 @@
  * limitations under the License.
  */
 
-import { Request } from 'express';
+import { LoggerService } from '@backstage/backend-plugin-api';
+import { EntityFilterQuery } from '@backstage/catalog-client';
+import { Entity } from '@backstage/catalog-model';
+import { Config } from '@backstage/config';
+import { JsonValue } from '@backstage/types';
+import { Request, Response } from 'express';
 
 /**
  * A representation of a successful Backstage sign-in.
@@ -31,15 +36,6 @@ export interface BackstageSignInResult {
   token: string;
 }
 
-/**
- * Options to request the identity from a Backstage backend request
- *
- * @public
- */
-export type IdentityApiGetIdentityRequest = {
-  request: Request<unknown>;
-};
-
 /**
  * Response object containing the {@link BackstageUserIdentity} and the token
  * from the authentication provider.
@@ -47,6 +43,11 @@ export type IdentityApiGetIdentityRequest = {
  * @public
  */
 export interface BackstageIdentityResponse extends BackstageSignInResult {
+  /**
+   * The number of seconds until the token expires. If not set, it can be assumed that the token does not expire.
+   */
+  expiresInSeconds?: number;
+
   /**
    * A plaintext description of the identity that is encapsulated within the token.
    */
@@ -76,3 +77,301 @@ export type BackstageUserIdentity = {
    */
   ownershipEntityRefs: string[];
 };
+
+/**
+ * A query for a single user in the catalog.
+ *
+ * If `entityRef` is used, the default kind is `'User'`.
+ *
+ * If `annotations` are used, all annotations must be present and
+ * match the provided value exactly. Only entities of kind `'User'` will be considered.
+ *
+ * If `filter` are used they are passed on as they are to the `CatalogApi`.
+ *
+ * Regardless of the query method, the query must match exactly one entity
+ * in the catalog, or an error will be thrown.
+ *
+ * @public
+ */
+export type AuthResolverCatalogUserQuery =
+  | {
+      entityRef:
+        | string
+        | {
+            kind?: string;
+            namespace?: string;
+            name: string;
+          };
+    }
+  | {
+      annotations: Record<string, string>;
+    }
+  | {
+      filter: EntityFilterQuery;
+    };
+
+/**
+ * Parameters used to issue new Backstage Tokens
+ *
+ * @public
+ */
+export type TokenParams = {
+  /**
+   * The claims that will be embedded within the token. At a minimum, this should include
+   * the subject claim, `sub`. It is common to also list entity ownership relations in the
+   * `ent` list. Additional claims may also be added at the developer's discretion except
+   * for the following list, which will be overwritten by the TokenIssuer: `iss`, `aud`,
+   * `iat`, and `exp`. The Backstage team also maintains the right add new claims in the future
+   * without listing the change as a "breaking change".
+   */
+  claims: {
+    /** The token subject, i.e. User ID */
+    sub: string;
+    /** A list of entity references that the user claims ownership through */
+    ent?: string[];
+  } & Record<string, JsonValue>;
+};
+
+/**
+ * The context that is used for auth processing.
+ *
+ * @public
+ */
+export type AuthResolverContext = {
+  /**
+   * Issues a Backstage token using the provided parameters.
+   */
+  issueToken(params: TokenParams): Promise<{ token: string }>;
+
+  /**
+   * Finds a single user in the catalog using the provided query.
+   *
+   * See {@link AuthResolverCatalogUserQuery} for details.
+   */
+  findCatalogUser(
+    query: AuthResolverCatalogUserQuery,
+  ): Promise<{ entity: Entity }>;
+
+  /**
+   * Finds a single user in the catalog using the provided query, and then
+   * issues an identity for that user using default ownership resolution.
+   *
+   * See {@link AuthResolverCatalogUserQuery} for details.
+   */
+  signInWithCatalogUser(
+    query: AuthResolverCatalogUserQuery,
+  ): Promise<BackstageSignInResult>;
+};
+
+/**
+ * Any Auth provider needs to implement this interface which handles the routes in the
+ * auth backend. Any auth API requests from the frontend reaches these methods.
+ *
+ * The routes in the auth backend API are tied to these methods like below
+ *
+ * `/auth/[provider]/start -> start`
+ * `/auth/[provider]/handler/frame -> frameHandler`
+ * `/auth/[provider]/refresh -> refresh`
+ * `/auth/[provider]/logout -> logout`
+ *
+ * @public
+ */
+export interface AuthProviderRouteHandlers {
+  /**
+   * Handles the start route of the API. This initiates a sign in request with an auth provider.
+   *
+   * Request
+   * - scopes for the auth request (Optional)
+   * Response
+   * - redirect to the auth provider for the user to sign in or consent.
+   * - sets a nonce cookie and also pass the nonce as 'state' query parameter in the redirect request
+   */
+  start(req: Request, res: Response): Promise<void>;
+
+  /**
+   * Once the user signs in or consents in the OAuth screen, the auth provider redirects to the
+   * callbackURL which is handled by this method.
+   *
+   * Request
+   * - to contain a nonce cookie and a 'state' query parameter
+   * Response
+   * - postMessage to the window with a payload that contains accessToken, expiryInSeconds?, idToken? and scope.
+   * - sets a refresh token cookie if the auth provider supports refresh tokens
+   */
+  frameHandler(req: Request, res: Response): Promise<void>;
+
+  /**
+   * (Optional) If the auth provider supports refresh tokens then this method handles
+   * requests to get a new access token.
+   *
+   * Other types of providers may also use this method to implement its own logic to create new sessions
+   * upon request. For example, this can be used to create a new session for a provider that handles requests
+   * from an authenticating proxy.
+   *
+   * Request
+   * - to contain a refresh token cookie and scope (Optional) query parameter.
+   * Response
+   * - payload with accessToken, expiryInSeconds?, idToken?, scope and user profile information.
+   */
+  refresh?(req: Request, res: Response): Promise<void>;
+
+  /**
+   * (Optional) Handles sign out requests
+   *
+   * Response
+   * - removes the refresh token cookie
+   */
+  logout?(req: Request, res: Response): Promise<void>;
+}
+
+/**
+ * @public
+ * @deprecated Use top-level properties passed to `AuthProviderFactory` instead
+ */
+export type AuthProviderConfig = {
+  /**
+   * The protocol://domain[:port] where the app is hosted. This is used to construct the
+   * callbackURL to redirect to once the user signs in to the auth provider.
+   */
+  baseUrl: string;
+
+  /**
+   * The base URL of the app as provided by app.baseUrl
+   */
+  appUrl: string;
+
+  /**
+   * A function that is called to check whether an origin is allowed to receive the authentication result.
+   */
+  isOriginAllowed: (origin: string) => boolean;
+
+  /**
+   * The function used to resolve cookie configuration based on the auth provider options.
+   */
+  cookieConfigurer?: CookieConfigurer;
+};
+
+/** @public */
+export type AuthProviderFactory = (options: {
+  providerId: string;
+  /** @deprecated Use top-level properties instead */
+  globalConfig: AuthProviderConfig;
+  config: Config;
+  logger: LoggerService;
+  resolverContext: AuthResolverContext;
+  /**
+   * The protocol://domain[:port] where the app is hosted. This is used to construct the
+   * callbackURL to redirect to once the user signs in to the auth provider.
+   */
+  baseUrl: string;
+
+  /**
+   * The base URL of the app as provided by app.baseUrl
+   */
+  appUrl: string;
+
+  /**
+   * A function that is called to check whether an origin is allowed to receive the authentication result.
+   */
+  isOriginAllowed: (origin: string) => boolean;
+
+  /**
+   * The function used to resolve cookie configuration based on the auth provider options.
+   */
+  cookieConfigurer?: CookieConfigurer;
+}) => AuthProviderRouteHandlers;
+
+/** @public */
+export type ClientAuthResponse<TProviderInfo> = {
+  providerInfo: TProviderInfo;
+  profile: ProfileInfo;
+  backstageIdentity?: BackstageIdentityResponse;
+};
+
+/**
+ * Type of sign in information context. Includes the profile information and
+ * authentication result which contains auth related information.
+ *
+ * @public
+ */
+export type SignInInfo<TAuthResult> = {
+  /**
+   * The simple profile passed down for use in the frontend.
+   */
+  profile: ProfileInfo;
+
+  /**
+   * The authentication result that was received from the authentication
+   * provider.
+   */
+  result: TAuthResult;
+};
+
+/**
+ * Describes the function which handles the result of a successful
+ * authentication. Must return a valid {@link @backstage/plugin-auth-node#BackstageSignInResult}.
+ *
+ * @public
+ */
+export type SignInResolver<TAuthResult> = (
+  info: SignInInfo<TAuthResult>,
+  context: AuthResolverContext,
+) => Promise<BackstageSignInResult>;
+
+/**
+ * Describes the function that transforms the result of a successful
+ * authentication into a {@link ProfileInfo} object.
+ *
+ * This function may optionally throw an error in order to reject authentication.
+ *
+ * @public
+ */
+export type ProfileTransform<TResult> = (
+  result: TResult,
+  context: AuthResolverContext,
+) => Promise<{ profile: ProfileInfo }>;
+
+/**
+ * Used to display login information to user, i.e. sidebar popup.
+ *
+ * It is also temporarily used as the profile of the signed-in user's Backstage
+ * identity, but we want to replace that with data from identity and/org catalog
+ * service
+ *
+ * @public
+ */
+export type ProfileInfo = {
+  /**
+   * Email ID of the signed in user.
+   */
+  email?: string;
+  /**
+   * Display name that can be presented to the signed in user.
+   */
+  displayName?: string;
+  /**
+   * URL to an image that can be used as the display image or avatar of the
+   * signed in user.
+   */
+  picture?: string;
+};
+
+/**
+ * The callback used to resolve the cookie configuration for auth providers that use cookies.
+ * @public
+ */
+export type CookieConfigurer = (ctx: {
+  /** ID of the auth provider that this configuration applies to */
+  providerId: string;
+  /** The externally reachable base URL of the auth-backend plugin */
+  baseUrl: string;
+  /** The configured callback URL of the auth provider */
+  callbackUrl: string;
+  /** The origin URL of the app */
+  appOrigin: string;
+}) => {
+  domain: string;
+  path: string;
+  secure: boolean;
+  sameSite?: 'none' | 'lax' | 'strict';
+};
diff --git a/plugins/azure-devops-backend/CHANGELOG.md b/plugins/azure-devops-backend/CHANGELOG.md
index c961856b7b..8f6aa6c4cc 100644
--- a/plugins/azure-devops-backend/CHANGELOG.md
+++ b/plugins/azure-devops-backend/CHANGELOG.md
@@ -1,5 +1,55 @@
 # @backstage/plugin-azure-devops-backend
 
+## 0.3.30-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config@1.1.0-next.1
+  - @backstage/backend-common@0.19.5-next.2
+  - @backstage/backend-plugin-api@0.6.3-next.2
+  - @backstage/plugin-azure-devops-common@0.3.0
+
+## 0.3.30-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config@1.1.0-next.0
+  - @backstage/backend-common@0.19.5-next.1
+  - @backstage/backend-plugin-api@0.6.3-next.1
+  - @backstage/plugin-azure-devops-common@0.3.0
+
+## 0.3.29-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.19.4-next.0
+  - @backstage/backend-plugin-api@0.6.2-next.0
+  - @backstage/config@1.0.8
+  - @backstage/plugin-azure-devops-common@0.3.0
+
+## 0.3.27
+
+### Patch Changes
+
+- 629cbd194a87: Use `coreServices.rootConfig` instead of `coreService.config`
+- 12a8c94eda8d: Add package repository and homepage metadata
+- Updated dependencies
+  - @backstage/backend-common@0.19.2
+  - @backstage/backend-plugin-api@0.6.0
+  - @backstage/config@1.0.8
+  - @backstage/plugin-azure-devops-common@0.3.0
+
+## 0.3.27-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@0.6.0-next.2
+  - @backstage/backend-common@0.19.2-next.2
+
 ## 0.3.27-next.1
 
 ### Patch Changes
diff --git a/plugins/azure-devops-backend/api-report.md b/plugins/azure-devops-backend/api-report.md
index a2a43cd6af..8c916a1495 100644
--- a/plugins/azure-devops-backend/api-report.md
+++ b/plugins/azure-devops-backend/api-report.md
@@ -96,7 +96,8 @@ export class AzureDevOpsApi {
 }
 
 // @public
-export const azureDevOpsPlugin: () => BackendFeature;
+const azureDevOpsPlugin: () => BackendFeature;
+export default azureDevOpsPlugin;
 
 // @public (undocumented)
 export function createRouter(options: RouterOptions): Promise<express.Router>;
diff --git a/plugins/azure-devops-backend/catalog-info.yaml b/plugins/azure-devops-backend/catalog-info.yaml
new file mode 100644
index 0000000000..4f45937842
--- /dev/null
+++ b/plugins/azure-devops-backend/catalog-info.yaml
@@ -0,0 +1,9 @@
+apiVersion: backstage.io/v1alpha1
+kind: Component
+metadata:
+  name: backstage-plugin-azure-devops-backend
+  title: '@backstage/plugin-azure-devops-backend'
+spec:
+  lifecycle: experimental
+  type: backstage-backend-plugin
+  owner: awanlin
diff --git a/plugins/azure-devops-backend/package.json b/plugins/azure-devops-backend/package.json
index 857b1643b3..9be538bff4 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.27-next.1",
+  "version": "0.3.30-next.2",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
diff --git a/plugins/azure-devops-backend/src/index.ts b/plugins/azure-devops-backend/src/index.ts
index c0b1276acf..3c802e7144 100644
--- a/plugins/azure-devops-backend/src/index.ts
+++ b/plugins/azure-devops-backend/src/index.ts
@@ -22,4 +22,4 @@
 
 export { AzureDevOpsApi } from './api';
 export * from './service/router';
-export { azureDevOpsPlugin } from './plugin';
+export { azureDevOpsPlugin as default } from './plugin';
diff --git a/plugins/azure-devops-common/catalog-info.yaml b/plugins/azure-devops-common/catalog-info.yaml
new file mode 100644
index 0000000000..939f6ec031
--- /dev/null
+++ b/plugins/azure-devops-common/catalog-info.yaml
@@ -0,0 +1,9 @@
+apiVersion: backstage.io/v1alpha1
+kind: Component
+metadata:
+  name: backstage-plugin-azure-devops-common
+  title: '@backstage/plugin-azure-devops-common'
+spec:
+  lifecycle: experimental
+  type: backstage-common-library
+  owner: awanlin
diff --git a/plugins/azure-devops-common/package.json b/plugins/azure-devops-common/package.json
index cf0b33275f..d99c411f79 100644
--- a/plugins/azure-devops-common/package.json
+++ b/plugins/azure-devops-common/package.json
@@ -22,6 +22,7 @@
   "keywords": [
     "backstage"
   ],
+  "sideEffects": false,
   "scripts": {
     "build": "backstage-cli package build",
     "lint": "backstage-cli package lint",
diff --git a/plugins/azure-devops/CHANGELOG.md b/plugins/azure-devops/CHANGELOG.md
index 1b405ad870..1a053d40cb 100644
--- a/plugins/azure-devops/CHANGELOG.md
+++ b/plugins/azure-devops/CHANGELOG.md
@@ -1,5 +1,66 @@
 # @backstage/plugin-azure-devops
 
+## 0.3.6-next.2
+
+### Patch Changes
+
+- 8cec7664e146: Removed `@types/node` dependency
+- Updated dependencies
+  - @backstage/core-components@0.13.5-next.2
+  - @backstage/core-plugin-api@1.6.0-next.2
+  - @backstage/plugin-catalog-react@1.8.4-next.2
+  - @backstage/catalog-model@1.4.2-next.1
+  - @backstage/errors@1.2.1
+  - @backstage/theme@0.4.1
+  - @backstage/plugin-azure-devops-common@0.3.0
+
+## 0.3.6-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.8.4-next.1
+  - @backstage/core-components@0.13.5-next.1
+  - @backstage/catalog-model@1.4.2-next.0
+  - @backstage/core-plugin-api@1.6.0-next.1
+  - @backstage/errors@1.2.1
+  - @backstage/theme@0.4.1
+  - @backstage/plugin-azure-devops-common@0.3.0
+
+## 0.3.5-next.0
+
+### Patch Changes
+
+- 482bb5c0bbf8: Moved `@types/react` to be a regular dependency
+- Updated dependencies
+  - @backstage/core-plugin-api@1.6.0-next.0
+  - @backstage/core-components@0.13.5-next.0
+  - @backstage/catalog-model@1.4.1
+  - @backstage/errors@1.2.1
+  - @backstage/theme@0.4.1
+  - @backstage/plugin-azure-devops-common@0.3.0
+  - @backstage/plugin-catalog-react@1.8.3-next.0
+
+## 0.3.3
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.13.4
+  - @backstage/plugin-catalog-react@1.8.1
+  - @backstage/core-plugin-api@1.5.3
+  - @backstage/catalog-model@1.4.1
+  - @backstage/errors@1.2.1
+  - @backstage/theme@0.4.1
+  - @backstage/plugin-azure-devops-common@0.3.0
+
+## 0.3.3-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.8.1-next.1
+
 ## 0.3.3-next.0
 
 ### Patch Changes
diff --git a/plugins/azure-devops/api-report.md b/plugins/azure-devops/api-report.md
index d083d00dba..2c916ec33b 100644
--- a/plugins/azure-devops/api-report.md
+++ b/plugins/azure-devops/api-report.md
@@ -14,8 +14,10 @@ import { DiscoveryApi } from '@backstage/core-plugin-api';
 import { Entity } from '@backstage/catalog-model';
 import { GitTag } from '@backstage/plugin-azure-devops-common';
 import { IdentityApi } from '@backstage/core-plugin-api';
+import { JSX as JSX_2 } from 'react';
 import { PullRequest } from '@backstage/plugin-azure-devops-common';
 import { PullRequestOptions } from '@backstage/plugin-azure-devops-common';
+import { default as React_2 } from 'react';
 import { Readme } from '@backstage/plugin-azure-devops-common';
 import { ReadmeConfig } from '@backstage/plugin-azure-devops-common';
 import { RepoBuild } from '@backstage/plugin-azure-devops-common';
@@ -163,14 +165,16 @@ export class AzureDevOpsClient implements AzureDevOpsApi {
 export const azureDevOpsPlugin: BackstagePlugin<{}, {}, {}>;
 
 // @public (undocumented)
-export const AzurePullRequestsIcon: (props: SvgIconProps) => JSX.Element;
+export const AzurePullRequestsIcon: (
+  props: SvgIconProps,
+) => React_2.JSX.Element;
 
 // @public (undocumented)
 export const AzurePullRequestsPage: (props: {
   projectName?: string | undefined;
   pollingInterval?: number | undefined;
   defaultColumnConfigs?: PullRequestColumnConfig[] | undefined;
-}) => JSX.Element;
+}) => JSX_2.Element;
 
 // @public (undocumented)
 export type BaseFilter = {
@@ -223,22 +227,22 @@ export type CreatedByUserFilter = BaseFilter &
   );
 
 // @public (undocumented)
-export const EntityAzureGitTagsContent: () => JSX.Element;
+export const EntityAzureGitTagsContent: () => JSX_2.Element;
 
 // @public (undocumented)
 export const EntityAzurePipelinesContent: (props: {
   defaultLimit?: number | undefined;
-}) => JSX.Element;
+}) => JSX_2.Element;
 
 // @public (undocumented)
 export const EntityAzurePullRequestsContent: (props: {
   defaultLimit?: number | undefined;
-}) => JSX.Element;
+}) => JSX_2.Element;
 
 // @public (undocumented)
 export const EntityAzureReadmeCard: (props: {
   maxHeight?: number | undefined;
-}) => JSX.Element;
+}) => JSX_2.Element;
 
 // @public (undocumented)
 export type Filter =
diff --git a/plugins/azure-devops/catalog-info.yaml b/plugins/azure-devops/catalog-info.yaml
new file mode 100644
index 0000000000..7f2b9be648
--- /dev/null
+++ b/plugins/azure-devops/catalog-info.yaml
@@ -0,0 +1,9 @@
+apiVersion: backstage.io/v1alpha1
+kind: Component
+metadata:
+  name: backstage-plugin-azure-devops
+  title: '@backstage/plugin-azure-devops'
+spec:
+  lifecycle: experimental
+  type: backstage-frontend-plugin
+  owner: awanlin
diff --git a/plugins/azure-devops/package.json b/plugins/azure-devops/package.json
index daaedae825..c405779a37 100644
--- a/plugins/azure-devops/package.json
+++ b/plugins/azure-devops/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-azure-devops",
-  "version": "0.3.3-next.0",
+  "version": "0.3.6-next.2",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
@@ -18,6 +18,7 @@
     "url": "https://github.com/backstage/backstage",
     "directory": "plugins/azure-devops"
   },
+  "sideEffects": false,
   "scripts": {
     "build": "backstage-cli package build",
     "start": "backstage-cli package start",
@@ -38,6 +39,7 @@
     "@material-ui/core": "^4.12.2",
     "@material-ui/icons": "^4.9.1",
     "@material-ui/lab": "4.0.0-alpha.61",
+    "@types/react": "^16.13.1 || ^17.0.0",
     "humanize-duration": "^3.27.0",
     "luxon": "^3.0.0",
     "react-use": "^17.2.4"
@@ -56,8 +58,6 @@
     "@testing-library/jest-dom": "^5.10.1",
     "@testing-library/react": "^12.1.3",
     "@testing-library/user-event": "^14.0.0",
-    "@types/node": "^16.11.26",
-    "@types/react": "^16.13.1 || ^17.0.0",
     "msw": "^1.0.0"
   },
   "files": [
diff --git a/plugins/azure-sites-backend/CHANGELOG.md b/plugins/azure-sites-backend/CHANGELOG.md
index 4a025ba54e..759e66ef23 100644
--- a/plugins/azure-sites-backend/CHANGELOG.md
+++ b/plugins/azure-sites-backend/CHANGELOG.md
@@ -1,5 +1,48 @@
 # @backstage/plugin-azure-sites-backend
 
+## 0.1.13-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config@1.1.0-next.1
+  - @backstage/backend-common@0.19.5-next.2
+  - @backstage/plugin-azure-sites-common@0.1.0
+
+## 0.1.13-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config@1.1.0-next.0
+  - @backstage/backend-common@0.19.5-next.1
+  - @backstage/plugin-azure-sites-common@0.1.0
+
+## 0.1.12-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.19.4-next.0
+  - @backstage/config@1.0.8
+  - @backstage/plugin-azure-sites-common@0.1.0
+
+## 0.1.10
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.19.2
+  - @backstage/config@1.0.8
+  - @backstage/plugin-azure-sites-common@0.1.0
+
+## 0.1.10-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.19.2-next.2
+
 ## 0.1.10-next.1
 
 ### Patch Changes
diff --git a/plugins/azure-sites-backend/catalog-info.yaml b/plugins/azure-sites-backend/catalog-info.yaml
new file mode 100644
index 0000000000..07ed594da8
--- /dev/null
+++ b/plugins/azure-sites-backend/catalog-info.yaml
@@ -0,0 +1,9 @@
+apiVersion: backstage.io/v1alpha1
+kind: Component
+metadata:
+  name: backstage-plugin-azure-sites-backend
+  title: '@backstage/plugin-azure-sites-backend'
+spec:
+  lifecycle: experimental
+  type: backstage-backend-plugin
+  owner: maintainers
diff --git a/plugins/azure-sites-backend/package.json b/plugins/azure-sites-backend/package.json
index 93cdffe8a5..08c381729b 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.10-next.1",
+  "version": "0.1.13-next.2",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
diff --git a/plugins/azure-sites-common/catalog-info.yaml b/plugins/azure-sites-common/catalog-info.yaml
new file mode 100644
index 0000000000..74d7be8715
--- /dev/null
+++ b/plugins/azure-sites-common/catalog-info.yaml
@@ -0,0 +1,10 @@
+apiVersion: backstage.io/v1alpha1
+kind: Component
+metadata:
+  name: backstage-plugin-azure-sites-common
+  title: '@backstage/plugin-azure-sites-common'
+  description: Common functionalities for the azure plugin
+spec:
+  lifecycle: experimental
+  type: backstage-common-library
+  owner: maintainers
diff --git a/plugins/azure-sites-common/package.json b/plugins/azure-sites-common/package.json
index c1bf28c65b..e264d5cb36 100644
--- a/plugins/azure-sites-common/package.json
+++ b/plugins/azure-sites-common/package.json
@@ -23,6 +23,7 @@
   "keywords": [
     "backstage"
   ],
+  "sideEffects": false,
   "scripts": {
     "build": "backstage-cli package build",
     "lint": "backstage-cli package lint",
diff --git a/plugins/azure-sites/CHANGELOG.md b/plugins/azure-sites/CHANGELOG.md
index 636c69c76a..d65ad0bc0c 100644
--- a/plugins/azure-sites/CHANGELOG.md
+++ b/plugins/azure-sites/CHANGELOG.md
@@ -1,5 +1,62 @@
 # @backstage/plugin-azure-sites
 
+## 0.1.13-next.2
+
+### Patch Changes
+
+- 8cec7664e146: Removed `@types/node` dependency
+- Updated dependencies
+  - @backstage/core-components@0.13.5-next.2
+  - @backstage/core-plugin-api@1.6.0-next.2
+  - @backstage/plugin-catalog-react@1.8.4-next.2
+  - @backstage/catalog-model@1.4.2-next.1
+  - @backstage/theme@0.4.1
+  - @backstage/plugin-azure-sites-common@0.1.0
+
+## 0.1.13-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.8.4-next.1
+  - @backstage/core-components@0.13.5-next.1
+  - @backstage/catalog-model@1.4.2-next.0
+  - @backstage/core-plugin-api@1.6.0-next.1
+  - @backstage/theme@0.4.1
+  - @backstage/plugin-azure-sites-common@0.1.0
+
+## 0.1.12-next.0
+
+### Patch Changes
+
+- 482bb5c0bbf8: Moved `@types/react` to be a regular dependency
+- Updated dependencies
+  - @backstage/core-plugin-api@1.6.0-next.0
+  - @backstage/core-components@0.13.5-next.0
+  - @backstage/catalog-model@1.4.1
+  - @backstage/theme@0.4.1
+  - @backstage/plugin-azure-sites-common@0.1.0
+  - @backstage/plugin-catalog-react@1.8.3-next.0
+
+## 0.1.10
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.13.4
+  - @backstage/plugin-catalog-react@1.8.1
+  - @backstage/core-plugin-api@1.5.3
+  - @backstage/catalog-model@1.4.1
+  - @backstage/theme@0.4.1
+  - @backstage/plugin-azure-sites-common@0.1.0
+
+## 0.1.10-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.8.1-next.1
+
 ## 0.1.10-next.0
 
 ### Patch Changes
diff --git a/plugins/azure-sites/api-report.md b/plugins/azure-sites/api-report.md
index 38ca6a8fe2..bec89e17bc 100644
--- a/plugins/azure-sites/api-report.md
+++ b/plugins/azure-sites/api-report.md
@@ -13,6 +13,8 @@ import { BackstagePlugin } from '@backstage/core-plugin-api';
 import { DiscoveryApi } from '@backstage/core-plugin-api';
 import { Entity } from '@backstage/catalog-model';
 import { IdentityApi } from '@backstage/core-plugin-api';
+import { JSX as JSX_2 } from 'react';
+import { default as React_2 } from 'react';
 import { RouteRef } from '@backstage/core-plugin-api';
 
 // @public (undocumented)
@@ -40,7 +42,7 @@ export class AzureSitesApiBackendClient implements AzureSitesApi {
 }
 
 // @public (undocumented)
-export const AzureSitesOverviewWidget: () => JSX.Element;
+export const AzureSitesOverviewWidget: () => React_2.JSX.Element;
 
 // @public (undocumented)
 export const azureSitesPlugin: BackstagePlugin<
@@ -52,7 +54,7 @@ export const azureSitesPlugin: BackstagePlugin<
 >;
 
 // @public (undocumented)
-export const EntityAzureSitesOverviewWidget: () => JSX.Element;
+export const EntityAzureSitesOverviewWidget: () => JSX_2.Element;
 
 // @public (undocumented)
 export const isAzureWebSiteNameAvailable: (
diff --git a/plugins/azure-sites/catalog-info.yaml b/plugins/azure-sites/catalog-info.yaml
new file mode 100644
index 0000000000..0902759994
--- /dev/null
+++ b/plugins/azure-sites/catalog-info.yaml
@@ -0,0 +1,9 @@
+apiVersion: backstage.io/v1alpha1
+kind: Component
+metadata:
+  name: backstage-plugin-azure-sites
+  title: '@backstage/plugin-azure-sites'
+spec:
+  lifecycle: experimental
+  type: backstage-frontend-plugin
+  owner: maintainers
diff --git a/plugins/azure-sites/package.json b/plugins/azure-sites/package.json
index 82b1bd1041..db391d1a6e 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.10-next.0",
+  "version": "0.1.13-next.2",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
@@ -22,6 +22,7 @@
     "backstage",
     "azure"
   ],
+  "sideEffects": false,
   "scripts": {
     "start": "backstage-cli package start",
     "build": "backstage-cli package build",
@@ -41,6 +42,7 @@
     "@material-ui/core": "^4.12.2",
     "@material-ui/icons": "^4.9.1",
     "@material-ui/lab": "4.0.0-alpha.61",
+    "@types/react": "^16.13.1 || ^17.0.0",
     "luxon": "^3.0.0",
     "react-use": "^17.2.4"
   },
@@ -58,8 +60,6 @@
     "@testing-library/jest-dom": "^5.10.1",
     "@testing-library/react": "^12.1.3",
     "@testing-library/user-event": "^14.0.0",
-    "@types/node": "^16.11.26",
-    "@types/react": "^16.13.1 || ^17.0.0",
     "msw": "^1.0.0"
   },
   "files": [
diff --git a/plugins/badges-backend/CHANGELOG.md b/plugins/badges-backend/CHANGELOG.md
index 4645a45090..7188e68e81 100644
--- a/plugins/badges-backend/CHANGELOG.md
+++ b/plugins/badges-backend/CHANGELOG.md
@@ -1,5 +1,68 @@
 # @backstage/plugin-badges-backend
 
+## 0.2.6-next.2
+
+### Patch Changes
+
+- 8cec7664e146: Removed `@types/node` dependency
+- Updated dependencies
+  - @backstage/config@1.1.0-next.1
+  - @backstage/backend-common@0.19.5-next.2
+  - @backstage/plugin-auth-node@0.3.0-next.2
+  - @backstage/backend-plugin-api@0.6.3-next.2
+  - @backstage/catalog-model@1.4.2-next.1
+  - @backstage/catalog-client@1.4.4-next.1
+  - @backstage/errors@1.2.1
+
+## 0.2.6-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config@1.1.0-next.0
+  - @backstage/backend-common@0.19.5-next.1
+  - @backstage/backend-plugin-api@0.6.3-next.1
+  - @backstage/catalog-model@1.4.2-next.0
+  - @backstage/plugin-auth-node@0.3.0-next.1
+  - @backstage/catalog-client@1.4.4-next.0
+  - @backstage/errors@1.2.1
+
+## 0.2.5-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-auth-node@0.3.0-next.0
+  - @backstage/backend-common@0.19.4-next.0
+  - @backstage/backend-plugin-api@0.6.2-next.0
+  - @backstage/catalog-client@1.4.3
+  - @backstage/catalog-model@1.4.1
+  - @backstage/config@1.0.8
+  - @backstage/errors@1.2.1
+
+## 0.2.3
+
+### Patch Changes
+
+- 629cbd194a87: Use `coreServices.rootConfig` instead of `coreService.config`
+- Updated dependencies
+  - @backstage/backend-common@0.19.2
+  - @backstage/backend-plugin-api@0.6.0
+  - @backstage/plugin-auth-node@0.2.17
+  - @backstage/catalog-client@1.4.3
+  - @backstage/catalog-model@1.4.1
+  - @backstage/config@1.0.8
+  - @backstage/errors@1.2.1
+
+## 0.2.3-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@0.6.0-next.2
+  - @backstage/backend-common@0.19.2-next.2
+  - @backstage/plugin-auth-node@0.2.17-next.2
+
 ## 0.2.3-next.1
 
 ### Patch Changes
diff --git a/plugins/badges-backend/api-report.md b/plugins/badges-backend/api-report.md
index 4594228543..ab5dbd9720 100644
--- a/plugins/badges-backend/api-report.md
+++ b/plugins/badges-backend/api-report.md
@@ -83,7 +83,8 @@ export type BadgeSpec = {
 };
 
 // @public
-export const badgesPlugin: () => BackendFeature;
+const badgesPlugin: () => BackendFeature;
+export default badgesPlugin;
 
 // @public
 export interface BadgesStore {
diff --git a/plugins/badges-backend/catalog-info.yaml b/plugins/badges-backend/catalog-info.yaml
new file mode 100644
index 0000000000..7d4e1e85a1
--- /dev/null
+++ b/plugins/badges-backend/catalog-info.yaml
@@ -0,0 +1,10 @@
+apiVersion: backstage.io/v1alpha1
+kind: Component
+metadata:
+  name: backstage-plugin-badges-backend
+  title: '@backstage/plugin-badges-backend'
+  description: A Backstage backend plugin that generates README badges for your entities
+spec:
+  lifecycle: experimental
+  type: backstage-backend-plugin
+  owner: maintainers
diff --git a/plugins/badges-backend/package.json b/plugins/badges-backend/package.json
index f68854b9f6..263b7e2b60 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.2.3-next.1",
+  "version": "0.2.6-next.2",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
@@ -56,7 +56,6 @@
     "@backstage/backend-test-utils": "workspace:^",
     "@backstage/catalog-client": "workspace:^",
     "@backstage/cli": "workspace:^",
-    "@types/node": "*",
     "cross-fetch": "^3.1.5"
   },
   "files": [
diff --git a/plugins/badges-backend/src/index.ts b/plugins/badges-backend/src/index.ts
index 0c417a7ad6..b114704565 100644
--- a/plugins/badges-backend/src/index.ts
+++ b/plugins/badges-backend/src/index.ts
@@ -25,4 +25,4 @@ export * from './lib';
 export * from './service/router';
 export * from './types';
 export * from './database/badgesStore';
-export { badgesPlugin } from './plugin';
+export { badgesPlugin as default } from './plugin';
diff --git a/plugins/badges/CHANGELOG.md b/plugins/badges/CHANGELOG.md
index 5d7527fba4..6f9a3d5424 100644
--- a/plugins/badges/CHANGELOG.md
+++ b/plugins/badges/CHANGELOG.md
@@ -1,5 +1,62 @@
 # @backstage/plugin-badges
 
+## 0.2.48-next.2
+
+### Patch Changes
+
+- 8cec7664e146: Removed `@types/node` dependency
+- Updated dependencies
+  - @backstage/core-components@0.13.5-next.2
+  - @backstage/core-plugin-api@1.6.0-next.2
+  - @backstage/plugin-catalog-react@1.8.4-next.2
+  - @backstage/catalog-model@1.4.2-next.1
+  - @backstage/errors@1.2.1
+  - @backstage/theme@0.4.1
+
+## 0.2.48-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.8.4-next.1
+  - @backstage/core-components@0.13.5-next.1
+  - @backstage/catalog-model@1.4.2-next.0
+  - @backstage/core-plugin-api@1.6.0-next.1
+  - @backstage/errors@1.2.1
+  - @backstage/theme@0.4.1
+
+## 0.2.47-next.0
+
+### Patch Changes
+
+- 482bb5c0bbf8: Moved `@types/react` to be a regular dependency
+- Updated dependencies
+  - @backstage/core-plugin-api@1.6.0-next.0
+  - @backstage/core-components@0.13.5-next.0
+  - @backstage/catalog-model@1.4.1
+  - @backstage/errors@1.2.1
+  - @backstage/theme@0.4.1
+  - @backstage/plugin-catalog-react@1.8.3-next.0
+
+## 0.2.45
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.13.4
+  - @backstage/plugin-catalog-react@1.8.1
+  - @backstage/core-plugin-api@1.5.3
+  - @backstage/catalog-model@1.4.1
+  - @backstage/errors@1.2.1
+  - @backstage/theme@0.4.1
+
+## 0.2.45-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.8.1-next.1
+
 ## 0.2.45-next.0
 
 ### Patch Changes
diff --git a/plugins/badges/api-report.md b/plugins/badges/api-report.md
index b051bbb452..e73a887316 100644
--- a/plugins/badges/api-report.md
+++ b/plugins/badges/api-report.md
@@ -6,6 +6,7 @@
 /// <reference types="react" />
 
 import { BackstagePlugin } from '@backstage/core-plugin-api';
+import { JSX as JSX_2 } from 'react';
 
 // @public (undocumented)
 export const badgesPlugin: BackstagePlugin<{}, {}, {}>;
@@ -14,5 +15,5 @@ export const badgesPlugin: BackstagePlugin<{}, {}, {}>;
 export const EntityBadgesDialog: (props: {
   open: boolean;
   onClose?: (() => any) | undefined;
-}) => JSX.Element;
+}) => JSX_2.Element;
 ```
diff --git a/plugins/badges/catalog-info.yaml b/plugins/badges/catalog-info.yaml
new file mode 100644
index 0000000000..1e96e514dc
--- /dev/null
+++ b/plugins/badges/catalog-info.yaml
@@ -0,0 +1,10 @@
+apiVersion: backstage.io/v1alpha1
+kind: Component
+metadata:
+  name: backstage-plugin-badges
+  title: '@backstage/plugin-badges'
+  description: A Backstage plugin that generates README badges for your entities
+spec:
+  lifecycle: experimental
+  type: backstage-frontend-plugin
+  owner: maintainers
diff --git a/plugins/badges/package.json b/plugins/badges/package.json
index 79add2944c..0957145fa8 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.45-next.0",
+  "version": "0.2.48-next.2",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
@@ -19,6 +19,7 @@
     "url": "https://github.com/backstage/backstage",
     "directory": "plugins/badges"
   },
+  "sideEffects": false,
   "scripts": {
     "build": "backstage-cli package build",
     "start": "backstage-cli package start",
@@ -38,6 +39,7 @@
     "@material-ui/core": "^4.12.2",
     "@material-ui/icons": "^4.9.1",
     "@material-ui/lab": "4.0.0-alpha.61",
+    "@types/react": "^16.13.1 || ^17.0.0",
     "react-use": "^17.2.4"
   },
   "peerDependencies": {
@@ -50,8 +52,7 @@
     "@backstage/core-app-api": "workspace:^",
     "@backstage/dev-utils": "workspace:^",
     "@backstage/test-utils": "workspace:^",
-    "@testing-library/jest-dom": "^5.16.5",
-    "@types/node": "^16.11.26"
+    "@testing-library/jest-dom": "^5.16.5"
   },
   "files": [
     "dist"
diff --git a/plugins/bazaar-backend/CHANGELOG.md b/plugins/bazaar-backend/CHANGELOG.md
index f505eb9b81..defdc9de0e 100644
--- a/plugins/bazaar-backend/CHANGELOG.md
+++ b/plugins/bazaar-backend/CHANGELOG.md
@@ -1,5 +1,61 @@
 # @backstage/plugin-bazaar-backend
 
+## 0.2.14-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config@1.1.0-next.1
+  - @backstage/backend-common@0.19.5-next.2
+  - @backstage/plugin-auth-node@0.3.0-next.2
+  - @backstage/backend-plugin-api@0.6.3-next.2
+  - @backstage/errors@1.2.1
+
+## 0.2.14-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config@1.1.0-next.0
+  - @backstage/backend-common@0.19.5-next.1
+  - @backstage/backend-plugin-api@0.6.3-next.1
+  - @backstage/plugin-auth-node@0.3.0-next.1
+  - @backstage/errors@1.2.1
+
+## 0.2.13-next.0
+
+### Patch Changes
+
+- cfc3ca6ce060: Changes needed to support MySQL
+- Updated dependencies
+  - @backstage/plugin-auth-node@0.3.0-next.0
+  - @backstage/backend-common@0.19.4-next.0
+  - @backstage/backend-plugin-api@0.6.2-next.0
+  - @backstage/config@1.0.8
+  - @backstage/errors@1.2.1
+
+## 0.2.11
+
+### Patch Changes
+
+- 629cbd194a87: Use `coreServices.rootConfig` instead of `coreService.config`
+- 12a8c94eda8d: Add package repository and homepage metadata
+- Updated dependencies
+  - @backstage/backend-common@0.19.2
+  - @backstage/backend-plugin-api@0.6.0
+  - @backstage/plugin-auth-node@0.2.17
+  - @backstage/config@1.0.8
+  - @backstage/errors@1.2.1
+
+## 0.2.11-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@0.6.0-next.2
+  - @backstage/backend-common@0.19.2-next.2
+  - @backstage/plugin-auth-node@0.2.17-next.2
+
 ## 0.2.11-next.1
 
 ### Patch Changes
diff --git a/plugins/bazaar-backend/api-report.md b/plugins/bazaar-backend/api-report.md
index 6281530851..d9243fd3af 100644
--- a/plugins/bazaar-backend/api-report.md
+++ b/plugins/bazaar-backend/api-report.md
@@ -11,7 +11,8 @@ import { Logger } from 'winston';
 import { PluginDatabaseManager } from '@backstage/backend-common';
 
 // @alpha
-export const bazaarPlugin: () => BackendFeature;
+const bazaarPlugin: () => BackendFeature;
+export default bazaarPlugin;
 
 // @public (undocumented)
 export function createRouter(options: RouterOptions): Promise<express.Router>;
diff --git a/plugins/bazaar-backend/catalog-info.yaml b/plugins/bazaar-backend/catalog-info.yaml
new file mode 100644
index 0000000000..ca9a705b52
--- /dev/null
+++ b/plugins/bazaar-backend/catalog-info.yaml
@@ -0,0 +1,9 @@
+apiVersion: backstage.io/v1alpha1
+kind: Component
+metadata:
+  name: backstage-plugin-bazaar-backend
+  title: '@backstage/plugin-bazaar-backend'
+spec:
+  lifecycle: experimental
+  type: backstage-backend-plugin
+  owner: maintainers
diff --git a/plugins/bazaar-backend/migrations/20211014144054_init.js b/plugins/bazaar-backend/migrations/20211014144054_init.js
index 503812225d..480771acb4 100644
--- a/plugins/bazaar-backend/migrations/20211014144054_init.js
+++ b/plugins/bazaar-backend/migrations/20211014144054_init.js
@@ -23,7 +23,7 @@ exports.up = async function up(knex) {
   await knex.schema.createTable('metadata', table => {
     table.comment('The table of Bazaar metadata');
     table
-      .text('entity_ref')
+      .string('entity_ref')
       .notNullable()
       .unique()
       .comment('The ref of the entity');
@@ -49,7 +49,7 @@ exports.up = async function up(knex) {
   await knex.schema.createTable('members', table => {
     table.comment('The table of Bazaar members');
     table
-      .text('entity_ref')
+      .string('entity_ref')
       .notNullable()
       .references('metadata.entity_ref')
       .onDelete('CASCADE')
diff --git a/plugins/bazaar-backend/migrations/20211117092217_optional_entity_ref.js b/plugins/bazaar-backend/migrations/20211117092217_optional_entity_ref.js
index 0953d5c2b1..ae2618fbef 100644
--- a/plugins/bazaar-backend/migrations/20211117092217_optional_entity_ref.js
+++ b/plugins/bazaar-backend/migrations/20211117092217_optional_entity_ref.js
@@ -89,9 +89,11 @@ exports.up = async function up(knex) {
     await knex.schema.alterTable('members', table => {
       table
         .integer('item_id')
+        .unsigned()
         .references('metadata.id')
         .onDelete('CASCADE')
         .comment('Id of the associated item');
+      table.dropForeign('entity_ref');
       table.dropColumn('entity_ref');
     });
   }
diff --git a/plugins/bazaar-backend/package.json b/plugins/bazaar-backend/package.json
index 6532c6c291..ecc7f409d2 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.11-next.1",
+  "version": "0.2.14-next.2",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
diff --git a/plugins/bazaar-backend/src/index.ts b/plugins/bazaar-backend/src/index.ts
index dd0cdbb750..d6f3df2d04 100644
--- a/plugins/bazaar-backend/src/index.ts
+++ b/plugins/bazaar-backend/src/index.ts
@@ -15,4 +15,4 @@
  */
 
 export * from './service/router';
-export { bazaarPlugin } from './plugin';
+export { bazaarPlugin as default } from './plugin';
diff --git a/plugins/bazaar-backend/src/service/DatabaseHandler.test.ts b/plugins/bazaar-backend/src/service/DatabaseHandler.test.ts
index 0c78dbdd87..4e46581240 100644
--- a/plugins/bazaar-backend/src/service/DatabaseHandler.test.ts
+++ b/plugins/bazaar-backend/src/service/DatabaseHandler.test.ts
@@ -36,7 +36,7 @@ jest.setTimeout(60_000);
 
 describe('DatabaseHandler', () => {
   const databases = TestDatabases.create({
-    ids: ['POSTGRES_13', 'POSTGRES_9', 'SQLITE_3'],
+    ids: ['POSTGRES_13', 'POSTGRES_9', 'SQLITE_3', 'MYSQL_8'],
   });
 
   function createDatabaseManager(
diff --git a/plugins/bazaar/CHANGELOG.md b/plugins/bazaar/CHANGELOG.md
index b9e8e4001e..ae4847fe30 100644
--- a/plugins/bazaar/CHANGELOG.md
+++ b/plugins/bazaar/CHANGELOG.md
@@ -1,5 +1,76 @@
 # @backstage/plugin-bazaar
 
+## 0.2.16-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog@1.13.0-next.2
+  - @backstage/core-components@0.13.5-next.2
+  - @backstage/core-plugin-api@1.6.0-next.2
+  - @backstage/cli@0.22.13-next.2
+  - @backstage/plugin-catalog-react@1.8.4-next.2
+  - @backstage/catalog-model@1.4.2-next.1
+  - @backstage/catalog-client@1.4.4-next.1
+  - @backstage/errors@1.2.1
+  - @backstage/theme@0.4.1
+
+## 0.2.16-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.8.4-next.1
+  - @backstage/core-components@0.13.5-next.1
+  - @backstage/plugin-catalog@1.12.5-next.1
+  - @backstage/cli@0.22.13-next.1
+  - @backstage/catalog-model@1.4.2-next.0
+  - @backstage/core-plugin-api@1.6.0-next.1
+  - @backstage/catalog-client@1.4.4-next.0
+  - @backstage/errors@1.2.1
+  - @backstage/theme@0.4.1
+
+## 0.2.15-next.0
+
+### Patch Changes
+
+- 482bb5c0bbf8: Moved `@types/react` to be a regular dependency
+- Updated dependencies
+  - @backstage/plugin-catalog@1.12.4-next.0
+  - @backstage/cli@0.22.12-next.0
+  - @backstage/core-plugin-api@1.6.0-next.0
+  - @backstage/core-components@0.13.5-next.0
+  - @backstage/catalog-client@1.4.3
+  - @backstage/catalog-model@1.4.1
+  - @backstage/errors@1.2.1
+  - @backstage/theme@0.4.1
+  - @backstage/plugin-catalog-react@1.8.3-next.0
+
+## 0.2.12
+
+### Patch Changes
+
+- 12a8c94eda8d: Add package repository and homepage metadata
+- Updated dependencies
+  - @backstage/cli@0.22.10
+  - @backstage/core-components@0.13.4
+  - @backstage/plugin-catalog@1.12.1
+  - @backstage/plugin-catalog-react@1.8.1
+  - @backstage/core-plugin-api@1.5.3
+  - @backstage/catalog-client@1.4.3
+  - @backstage/catalog-model@1.4.1
+  - @backstage/errors@1.2.1
+  - @backstage/theme@0.4.1
+
+## 0.2.12-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.8.1-next.1
+  - @backstage/plugin-catalog@1.12.1-next.2
+  - @backstage/cli@0.22.10-next.1
+
 ## 0.2.12-next.1
 
 ### Patch Changes
diff --git a/plugins/bazaar/api-report.md b/plugins/bazaar/api-report.md
index 11ce735bf5..282983b378 100644
--- a/plugins/bazaar/api-report.md
+++ b/plugins/bazaar/api-report.md
@@ -8,12 +8,14 @@
 import { ApiHolder } from '@backstage/core-plugin-api';
 import { BackstagePlugin } from '@backstage/core-plugin-api';
 import { Entity } from '@backstage/catalog-model';
+import { JSX as JSX_2 } from 'react';
+import { default as React_2 } from 'react';
 import { RouteRef } from '@backstage/core-plugin-api';
 
 // @public (undocumented)
 export const BazaarOverviewCard: (
   props: BazaarOverviewCardProps,
-) => JSX.Element;
+) => React_2.JSX.Element;
 
 // @public (undocumented)
 export type BazaarOverviewCardProps = {
@@ -24,7 +26,7 @@ export type BazaarOverviewCardProps = {
 };
 
 // @public (undocumented)
-export const BazaarPage: (props: BazaarPageProps) => JSX.Element;
+export const BazaarPage: (props: BazaarPageProps) => JSX_2.Element;
 
 // @public (undocumented)
 export type BazaarPageProps = {
@@ -44,7 +46,7 @@ export const bazaarPlugin: BackstagePlugin<
 >;
 
 // @public (undocumented)
-export const EntityBazaarInfoCard: () => JSX.Element | null;
+export const EntityBazaarInfoCard: () => React_2.JSX.Element | null;
 
 // @public (undocumented)
 export const isBazaarAvailable: (
@@ -55,7 +57,7 @@ export const isBazaarAvailable: (
 ) => Promise<boolean>;
 
 // @public (undocumented)
-export const SortView: (props: SortViewProps) => JSX.Element;
+export const SortView: (props: SortViewProps) => React_2.JSX.Element;
 
 // @public (undocumented)
 export type SortViewProps = {
diff --git a/plugins/bazaar/catalog-info.yaml b/plugins/bazaar/catalog-info.yaml
new file mode 100644
index 0000000000..4fb2562731
--- /dev/null
+++ b/plugins/bazaar/catalog-info.yaml
@@ -0,0 +1,9 @@
+apiVersion: backstage.io/v1alpha1
+kind: Component
+metadata:
+  name: backstage-plugin-bazaar
+  title: '@backstage/plugin-bazaar'
+spec:
+  lifecycle: experimental
+  type: backstage-frontend-plugin
+  owner: maintainers
diff --git a/plugins/bazaar/package.json b/plugins/bazaar/package.json
index d0f26d68f0..17aade25be 100644
--- a/plugins/bazaar/package.json
+++ b/plugins/bazaar/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-bazaar",
-  "version": "0.2.12-next.1",
+  "version": "0.2.16-next.2",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
@@ -18,6 +18,7 @@
     "url": "https://github.com/backstage/backstage",
     "directory": "plugins/bazaar"
   },
+  "sideEffects": false,
   "scripts": {
     "build": "backstage-cli package build",
     "start": "backstage-cli package start",
@@ -43,6 +44,7 @@
     "@material-ui/lab": "4.0.0-alpha.61",
     "@material-ui/pickers": "^3.3.10",
     "@testing-library/jest-dom": "^5.10.1",
+    "@types/react": "^16.13.1 || ^17.0.0",
     "luxon": "^3.0.0",
     "material-ui-search-bar": "^1.0.0",
     "react-hook-form": "^7.13.0",
@@ -56,8 +58,7 @@
   "devDependencies": {
     "@backstage/cli": "workspace:^",
     "@backstage/dev-utils": "workspace:^",
-    "@testing-library/jest-dom": "^5.10.1",
-    "@types/react": "^16.13.1 || ^17.0.0"
+    "@testing-library/jest-dom": "^5.10.1"
   },
   "files": [
     "dist"
diff --git a/plugins/bitbucket-cloud-common/CHANGELOG.md b/plugins/bitbucket-cloud-common/CHANGELOG.md
index 1afd2eb74e..d21ff40a7b 100644
--- a/plugins/bitbucket-cloud-common/CHANGELOG.md
+++ b/plugins/bitbucket-cloud-common/CHANGELOG.md
@@ -1,5 +1,34 @@
 # @backstage/plugin-bitbucket-cloud-common
 
+## 0.2.12-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/integration@1.7.0-next.2
+
+## 0.2.12-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/integration@1.7.0-next.1
+
+## 0.2.11-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/integration@1.7.0-next.0
+
+## 0.2.9
+
+### Patch Changes
+
+- 12a8c94eda8d: Add package repository and homepage metadata
+- Updated dependencies
+  - @backstage/integration@1.6.0
+
 ## 0.2.9-next.0
 
 ### Patch Changes
diff --git a/plugins/bitbucket-cloud-common/catalog-info.yaml b/plugins/bitbucket-cloud-common/catalog-info.yaml
new file mode 100644
index 0000000000..1a931c06cb
--- /dev/null
+++ b/plugins/bitbucket-cloud-common/catalog-info.yaml
@@ -0,0 +1,10 @@
+apiVersion: backstage.io/v1alpha1
+kind: Component
+metadata:
+  name: backstage-plugin-bitbucket-cloud-common
+  title: '@backstage/plugin-bitbucket-cloud-common'
+  description: Common functionalities for bitbucket-cloud plugins
+spec:
+  lifecycle: experimental
+  type: backstage-common-library
+  owner: pjungermann
diff --git a/plugins/bitbucket-cloud-common/package.json b/plugins/bitbucket-cloud-common/package.json
index 7d1ef19b6b..1367eeca4b 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.9-next.0",
+  "version": "0.2.12-next.2",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
@@ -20,6 +20,7 @@
     "url": "https://github.com/backstage/backstage",
     "directory": "plugins/bitbucket-cloud-common"
   },
+  "sideEffects": false,
   "scripts": {
     "build": "backstage-cli package build",
     "lint": "backstage-cli package lint",
diff --git a/plugins/bitrise/CHANGELOG.md b/plugins/bitrise/CHANGELOG.md
index 51a286ff26..47fe1d0703 100644
--- a/plugins/bitrise/CHANGELOG.md
+++ b/plugins/bitrise/CHANGELOG.md
@@ -1,5 +1,59 @@
 # @backstage/plugin-bitrise
 
+## 0.1.51-next.2
+
+### Patch Changes
+
+- 8cec7664e146: Removed `@types/node` dependency
+- Updated dependencies
+  - @backstage/core-components@0.13.5-next.2
+  - @backstage/core-plugin-api@1.6.0-next.2
+  - @backstage/plugin-catalog-react@1.8.4-next.2
+  - @backstage/catalog-model@1.4.2-next.1
+  - @backstage/theme@0.4.1
+
+## 0.1.51-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.8.4-next.1
+  - @backstage/core-components@0.13.5-next.1
+  - @backstage/catalog-model@1.4.2-next.0
+  - @backstage/core-plugin-api@1.6.0-next.1
+  - @backstage/theme@0.4.1
+
+## 0.1.50-next.0
+
+### Patch Changes
+
+- 482bb5c0bbf8: Moved `@types/react` to be a regular dependency
+- Updated dependencies
+  - @backstage/core-plugin-api@1.6.0-next.0
+  - @backstage/core-components@0.13.5-next.0
+  - @backstage/catalog-model@1.4.1
+  - @backstage/theme@0.4.1
+  - @backstage/plugin-catalog-react@1.8.3-next.0
+
+## 0.1.48
+
+### Patch Changes
+
+- 12a8c94eda8d: Add package repository and homepage metadata
+- Updated dependencies
+  - @backstage/core-components@0.13.4
+  - @backstage/plugin-catalog-react@1.8.1
+  - @backstage/core-plugin-api@1.5.3
+  - @backstage/catalog-model@1.4.1
+  - @backstage/theme@0.4.1
+
+## 0.1.48-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.8.1-next.1
+
 ## 0.1.48-next.1
 
 ### Patch Changes
diff --git a/plugins/bitrise/api-report.md b/plugins/bitrise/api-report.md
index 01d10c61cf..7f2e44f04f 100644
--- a/plugins/bitrise/api-report.md
+++ b/plugins/bitrise/api-report.md
@@ -7,6 +7,7 @@
 
 import { BackstagePlugin } from '@backstage/core-plugin-api';
 import { Entity } from '@backstage/catalog-model';
+import { JSX as JSX_2 } from 'react';
 
 // @public (undocumented)
 export const BITRISE_APP_ANNOTATION = 'bitrise.io/app';
@@ -15,7 +16,7 @@ export const BITRISE_APP_ANNOTATION = 'bitrise.io/app';
 export const bitrisePlugin: BackstagePlugin<{}, {}, {}>;
 
 // @public (undocumented)
-export const EntityBitriseContent: () => JSX.Element;
+export const EntityBitriseContent: () => JSX_2.Element;
 
 // @public (undocumented)
 export const isBitriseAvailable: (entity: Entity) => boolean;
diff --git a/plugins/bitrise/catalog-info.yaml b/plugins/bitrise/catalog-info.yaml
new file mode 100644
index 0000000000..19df0a6736
--- /dev/null
+++ b/plugins/bitrise/catalog-info.yaml
@@ -0,0 +1,10 @@
+apiVersion: backstage.io/v1alpha1
+kind: Component
+metadata:
+  name: backstage-plugin-bitrise
+  title: '@backstage/plugin-bitrise'
+  description: A Backstage plugin that integrates towards Bitrise
+spec:
+  lifecycle: experimental
+  type: backstage-frontend-plugin
+  owner: sda-se-reviewers
diff --git a/plugins/bitrise/package.json b/plugins/bitrise/package.json
index 1ee1d7efbe..23352407d6 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.48-next.1",
+  "version": "0.1.51-next.2",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
@@ -19,6 +19,7 @@
     "url": "https://github.com/backstage/backstage",
     "directory": "plugins/bitrise"
   },
+  "sideEffects": false,
   "scripts": {
     "build": "backstage-cli package build",
     "start": "backstage-cli package start",
@@ -37,6 +38,7 @@
     "@material-ui/core": "^4.12.2",
     "@material-ui/icons": "^4.9.1",
     "@material-ui/lab": "4.0.0-alpha.61",
+    "@types/react": "^16.13.1 || ^17.0.0",
     "lodash": "^4.17.21",
     "luxon": "^3.0.0",
     "qs": "^6.9.6",
@@ -57,8 +59,6 @@
     "@testing-library/jest-dom": "^5.10.1",
     "@testing-library/react": "^12.1.3",
     "@testing-library/user-event": "^14.0.0",
-    "@types/node": "^16.11.26",
-    "@types/react": "^16.13.1 || ^17.0.0",
     "@types/recharts": "^1.8.15",
     "msw": "^1.0.0"
   },
diff --git a/plugins/catalog-backend-module-aws/CHANGELOG.md b/plugins/catalog-backend-module-aws/CHANGELOG.md
index 09d7823993..4119519634 100644
--- a/plugins/catalog-backend-module-aws/CHANGELOG.md
+++ b/plugins/catalog-backend-module-aws/CHANGELOG.md
@@ -1,5 +1,90 @@
 # @backstage/plugin-catalog-backend-module-aws
 
+## 0.2.6-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config@1.1.0-next.1
+  - @backstage/backend-tasks@0.5.8-next.2
+  - @backstage/backend-common@0.19.5-next.2
+  - @backstage/plugin-catalog-node@1.4.4-next.2
+  - @backstage/integration@1.7.0-next.2
+  - @backstage/integration-aws-node@0.1.6-next.1
+  - @backstage/backend-plugin-api@0.6.3-next.2
+  - @backstage/catalog-model@1.4.2-next.1
+  - @backstage/errors@1.2.1
+  - @backstage/types@1.1.0
+  - @backstage/plugin-catalog-common@1.0.16-next.1
+  - @backstage/plugin-kubernetes-common@0.6.6-next.1
+
+## 0.2.6-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-kubernetes-common@0.6.6-next.0
+  - @backstage/config@1.1.0-next.0
+  - @backstage/integration@1.7.0-next.1
+  - @backstage/backend-tasks@0.5.8-next.1
+  - @backstage/backend-common@0.19.5-next.1
+  - @backstage/backend-plugin-api@0.6.3-next.1
+  - @backstage/catalog-model@1.4.2-next.0
+  - @backstage/integration-aws-node@0.1.6-next.0
+  - @backstage/plugin-catalog-node@1.4.4-next.1
+  - @backstage/plugin-catalog-common@1.0.16-next.0
+  - @backstage/errors@1.2.1
+  - @backstage/types@1.1.0
+
+## 0.2.5-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.19.4-next.0
+  - @backstage/integration@1.7.0-next.0
+  - @backstage/backend-tasks@0.5.7-next.0
+  - @backstage/backend-plugin-api@0.6.2-next.0
+  - @backstage/catalog-model@1.4.1
+  - @backstage/config@1.0.8
+  - @backstage/errors@1.2.1
+  - @backstage/integration-aws-node@0.1.5
+  - @backstage/types@1.1.0
+  - @backstage/plugin-catalog-common@1.0.15
+  - @backstage/plugin-catalog-node@1.4.3-next.0
+  - @backstage/plugin-kubernetes-common@0.6.5
+
+## 0.2.3
+
+### Patch Changes
+
+- 629cbd194a87: Use `coreServices.rootConfig` instead of `coreService.config`
+- 4b82382ed8c2: Fixed invalid configuration schema. The configuration schema may be more strict as a result.
+- b4222908b0c3: Added option to configure AWS `accountId` in `AwsS3EntityProvider`
+- Updated dependencies
+  - @backstage/backend-common@0.19.2
+  - @backstage/backend-plugin-api@0.6.0
+  - @backstage/plugin-catalog-node@1.4.1
+  - @backstage/integration@1.6.0
+  - @backstage/backend-tasks@0.5.5
+  - @backstage/integration-aws-node@0.1.5
+  - @backstage/catalog-model@1.4.1
+  - @backstage/config@1.0.8
+  - @backstage/errors@1.2.1
+  - @backstage/types@1.1.0
+  - @backstage/plugin-catalog-common@1.0.15
+  - @backstage/plugin-kubernetes-common@0.6.5
+
+## 0.2.3-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@0.6.0-next.2
+  - @backstage/backend-tasks@0.5.5-next.2
+  - @backstage/backend-common@0.19.2-next.2
+  - @backstage/plugin-catalog-node@1.4.1-next.2
+
 ## 0.2.3-next.1
 
 ### Patch Changes
diff --git a/plugins/catalog-backend-module-aws/alpha-api-report.md b/plugins/catalog-backend-module-aws/alpha-api-report.md
index f78f6a802d..218acc7506 100644
--- a/plugins/catalog-backend-module-aws/alpha-api-report.md
+++ b/plugins/catalog-backend-module-aws/alpha-api-report.md
@@ -6,7 +6,8 @@
 import { BackendFeature } from '@backstage/backend-plugin-api';
 
 // @alpha
-export const catalogModuleAwsS3EntityProvider: () => BackendFeature;
+const catalogModuleAwsS3EntityProvider: () => BackendFeature;
+export default catalogModuleAwsS3EntityProvider;
 
 // (No @packageDocumentation comment for this package)
 ```
diff --git a/plugins/catalog-backend-module-aws/catalog-info.yaml b/plugins/catalog-backend-module-aws/catalog-info.yaml
new file mode 100644
index 0000000000..8bff4a9a37
--- /dev/null
+++ b/plugins/catalog-backend-module-aws/catalog-info.yaml
@@ -0,0 +1,10 @@
+apiVersion: backstage.io/v1alpha1
+kind: Component
+metadata:
+  name: backstage-plugin-catalog-backend-module-aws
+  title: '@backstage/plugin-catalog-backend-module-aws'
+  description: A Backstage catalog backend module that helps integrate towards AWS
+spec:
+  lifecycle: experimental
+  type: backstage-backend-plugin-module
+  owner: pjungermann
diff --git a/plugins/catalog-backend-module-aws/package.json b/plugins/catalog-backend-module-aws/package.json
index bd5377fb67..b627437a5f 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.2.3-next.1",
+  "version": "0.2.6-next.2",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
diff --git a/plugins/catalog-backend-module-aws/src/alpha.ts b/plugins/catalog-backend-module-aws/src/alpha.ts
index c277a0a680..01a9b25f7c 100644
--- a/plugins/catalog-backend-module-aws/src/alpha.ts
+++ b/plugins/catalog-backend-module-aws/src/alpha.ts
@@ -15,3 +15,4 @@
  */
 
 export * from './module';
+export { default } from './module';
diff --git a/plugins/catalog-backend-module-aws/src/module/catalogModuleAwsS3EntityProvider.test.ts b/plugins/catalog-backend-module-aws/src/module/catalogModuleAwsS3EntityProvider.test.ts
index 7599f8446f..ad1e94cad6 100644
--- a/plugins/catalog-backend-module-aws/src/module/catalogModuleAwsS3EntityProvider.test.ts
+++ b/plugins/catalog-backend-module-aws/src/module/catalogModuleAwsS3EntityProvider.test.ts
@@ -14,14 +14,8 @@
  * limitations under the License.
  */
 
-import { getVoidLogger } 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 { ConfigReader } from '@backstage/config';
+import { TaskScheduleDefinition } from '@backstage/backend-tasks';
+import { mockServices, startTestBackend } from '@backstage/backend-test-utils';
 import { catalogProcessingExtensionPoint } from '@backstage/plugin-catalog-node/alpha';
 import { Duration } from 'luxon';
 import { catalogModuleAwsS3EntityProvider } from './catalogModuleAwsS3EntityProvider';
@@ -38,14 +32,14 @@ describe('catalogModuleAwsS3EntityProvider', () => {
       },
     };
     const runner = jest.fn();
-    const scheduler = {
-      createScheduledTaskRunner: (schedule: TaskScheduleDefinition) => {
+    const scheduler = mockServices.scheduler.mock({
+      createScheduledTaskRunner(schedule) {
         usedSchedule = schedule;
-        return runner;
+        return { run: runner };
       },
-    } as unknown as PluginTaskScheduler;
+    });
 
-    const config = new ConfigReader({
+    const config = {
       catalog: {
         providers: {
           awsS3: {
@@ -57,16 +51,15 @@ describe('catalogModuleAwsS3EntityProvider', () => {
           },
         },
       },
-    });
+    };
 
     await startTestBackend({
       extensionPoints: [[catalogProcessingExtensionPoint, extensionPoint]],
-      services: [
-        [coreServices.rootConfig, config],
-        [coreServices.logger, getVoidLogger()],
-        [coreServices.scheduler, scheduler],
+      features: [
+        catalogModuleAwsS3EntityProvider(),
+        mockServices.rootConfig.factory({ data: config }),
+        scheduler.factory,
       ],
-      features: [catalogModuleAwsS3EntityProvider()],
     });
 
     expect(usedSchedule?.frequency).toEqual(Duration.fromISO('P1M'));
diff --git a/plugins/catalog-backend-module-aws/src/module/index.ts b/plugins/catalog-backend-module-aws/src/module/index.ts
index 5644c034ea..2734ddafcd 100644
--- a/plugins/catalog-backend-module-aws/src/module/index.ts
+++ b/plugins/catalog-backend-module-aws/src/module/index.ts
@@ -14,4 +14,4 @@
  * limitations under the License.
  */
 
-export { catalogModuleAwsS3EntityProvider } from './catalogModuleAwsS3EntityProvider';
+export { catalogModuleAwsS3EntityProvider as default } from './catalogModuleAwsS3EntityProvider';
diff --git a/plugins/catalog-backend-module-azure/CHANGELOG.md b/plugins/catalog-backend-module-azure/CHANGELOG.md
index bf2ce7bb76..169781835a 100644
--- a/plugins/catalog-backend-module-azure/CHANGELOG.md
+++ b/plugins/catalog-backend-module-azure/CHANGELOG.md
@@ -1,5 +1,84 @@
 # @backstage/plugin-catalog-backend-module-azure
 
+## 0.1.22-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config@1.1.0-next.1
+  - @backstage/backend-tasks@0.5.8-next.2
+  - @backstage/backend-common@0.19.5-next.2
+  - @backstage/plugin-catalog-node@1.4.4-next.2
+  - @backstage/integration@1.7.0-next.2
+  - @backstage/backend-plugin-api@0.6.3-next.2
+  - @backstage/catalog-model@1.4.2-next.1
+  - @backstage/errors@1.2.1
+  - @backstage/types@1.1.0
+  - @backstage/plugin-catalog-common@1.0.16-next.1
+
+## 0.1.22-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config@1.1.0-next.0
+  - @backstage/integration@1.7.0-next.1
+  - @backstage/backend-tasks@0.5.8-next.1
+  - @backstage/backend-common@0.19.5-next.1
+  - @backstage/backend-plugin-api@0.6.3-next.1
+  - @backstage/catalog-model@1.4.2-next.0
+  - @backstage/plugin-catalog-node@1.4.4-next.1
+  - @backstage/plugin-catalog-common@1.0.16-next.0
+  - @backstage/errors@1.2.1
+  - @backstage/types@1.1.0
+
+## 0.1.21-next.0
+
+### Patch Changes
+
+- 94f96508491d: Improve consistency of results from the `AzureDevOpsEntityProvider`.
+- 5f1a92b9f19f: Use `DefaultAzureDevOpsCredentialsProvider` to retrieve credentials for Azure DevOps.
+- 044b4f2fb1e3: Remove duplications from Azure search before committing the new locations to the catalog.
+- Updated dependencies
+  - @backstage/backend-common@0.19.4-next.0
+  - @backstage/integration@1.7.0-next.0
+  - @backstage/backend-tasks@0.5.7-next.0
+  - @backstage/backend-plugin-api@0.6.2-next.0
+  - @backstage/catalog-model@1.4.1
+  - @backstage/config@1.0.8
+  - @backstage/errors@1.2.1
+  - @backstage/types@1.1.0
+  - @backstage/plugin-catalog-common@1.0.15
+  - @backstage/plugin-catalog-node@1.4.3-next.0
+
+## 0.1.19
+
+### Patch Changes
+
+- 629cbd194a87: Use `coreServices.rootConfig` instead of `coreService.config`
+- 4b82382ed8c2: Fixed invalid configuration schema. The configuration schema may be more strict as a result.
+- Updated dependencies
+  - @backstage/backend-common@0.19.2
+  - @backstage/backend-plugin-api@0.6.0
+  - @backstage/plugin-catalog-node@1.4.1
+  - @backstage/integration@1.6.0
+  - @backstage/backend-tasks@0.5.5
+  - @backstage/catalog-model@1.4.1
+  - @backstage/config@1.0.8
+  - @backstage/errors@1.2.1
+  - @backstage/types@1.1.0
+  - @backstage/plugin-catalog-common@1.0.15
+
+## 0.1.19-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@0.6.0-next.2
+  - @backstage/backend-tasks@0.5.5-next.2
+  - @backstage/backend-common@0.19.2-next.2
+  - @backstage/plugin-catalog-node@1.4.1-next.2
+
 ## 0.1.19-next.1
 
 ### Patch Changes
diff --git a/plugins/catalog-backend-module-azure/alpha-api-report.md b/plugins/catalog-backend-module-azure/alpha-api-report.md
index 66551a2856..eeb5a3c621 100644
--- a/plugins/catalog-backend-module-azure/alpha-api-report.md
+++ b/plugins/catalog-backend-module-azure/alpha-api-report.md
@@ -6,7 +6,8 @@
 import { BackendFeature } from '@backstage/backend-plugin-api';
 
 // @alpha
-export const catalogModuleAzureDevOpsEntityProvider: () => BackendFeature;
+const catalogModuleAzureDevOpsEntityProvider: () => BackendFeature;
+export default catalogModuleAzureDevOpsEntityProvider;
 
 // (No @packageDocumentation comment for this package)
 ```
diff --git a/plugins/catalog-backend-module-azure/catalog-info.yaml b/plugins/catalog-backend-module-azure/catalog-info.yaml
new file mode 100644
index 0000000000..c1a74cac6f
--- /dev/null
+++ b/plugins/catalog-backend-module-azure/catalog-info.yaml
@@ -0,0 +1,10 @@
+apiVersion: backstage.io/v1alpha1
+kind: Component
+metadata:
+  name: backstage-plugin-catalog-backend-module-azure
+  title: '@backstage/plugin-catalog-backend-module-azure'
+  description: A Backstage catalog backend module that helps integrate towards Azure
+spec:
+  lifecycle: experimental
+  type: backstage-backend-plugin-module
+  owner: catalog-maintainers
diff --git a/plugins/catalog-backend-module-azure/package.json b/plugins/catalog-backend-module-azure/package.json
index fe9cb9a7cc..899f51dceb 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.19-next.1",
+  "version": "0.1.22-next.2",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
diff --git a/plugins/catalog-backend-module-azure/src/alpha.ts b/plugins/catalog-backend-module-azure/src/alpha.ts
index c277a0a680..01a9b25f7c 100644
--- a/plugins/catalog-backend-module-azure/src/alpha.ts
+++ b/plugins/catalog-backend-module-azure/src/alpha.ts
@@ -15,3 +15,4 @@
  */
 
 export * from './module';
+export { default } from './module';
diff --git a/plugins/catalog-backend-module-azure/src/lib/azure.test.ts b/plugins/catalog-backend-module-azure/src/lib/azure.test.ts
index f26208353a..493f0dda51 100644
--- a/plugins/catalog-backend-module-azure/src/lib/azure.test.ts
+++ b/plugins/catalog-backend-module-azure/src/lib/azure.test.ts
@@ -18,11 +18,40 @@ import { setupRequestMockHandlers } from '@backstage/backend-test-utils';
 import { rest } from 'msw';
 import { setupServer } from 'msw/node';
 import { codeSearch, CodeSearchResponse } from './azure';
+import {
+  DefaultAzureDevOpsCredentialsProvider,
+  ScmIntegrations,
+} from '@backstage/integration';
+import { ConfigReader } from '@backstage/config';
 
 describe('azure', () => {
   const server = setupServer();
   setupRequestMockHandlers(server);
 
+  const createFixture = (host: string, token: string) => {
+    const azureConfig = {
+      host: host,
+      credentials: [
+        {
+          personalAccessToken: token,
+        },
+      ],
+    };
+    const scmIntegrations = ScmIntegrations.fromConfig(
+      new ConfigReader({
+        integrations: {
+          azure: [azureConfig],
+        },
+      }),
+    );
+
+    return {
+      azureConfig: scmIntegrations.azure.byHost(host)?.config!,
+      credentialsProvider:
+        DefaultAzureDevOpsCredentialsProvider.fromIntegrations(scmIntegrations),
+    };
+  };
+
   describe('codeSearch', () => {
     it('returns empty when nothing is found', async () => {
       const response: CodeSearchResponse = { count: 0, results: [] };
@@ -34,6 +63,12 @@ describe('azure', () => {
             expect(req.headers.get('Authorization')).toBe('Basic OkFCQw==');
             expect(req.body).toEqual({
               searchText: 'path:/catalog-info.yaml repo:* proj:engineering',
+              $orderBy: [
+                {
+                  field: 'path',
+                  sortOrder: 'ASC',
+                },
+              ],
               $skip: 0,
               $top: 1000,
             });
@@ -42,9 +77,14 @@ describe('azure', () => {
         ),
       );
 
+      const { credentialsProvider, azureConfig } = createFixture(
+        'dev.azure.com',
+        'ABC',
+      );
       await expect(
         codeSearch(
-          { host: 'dev.azure.com', token: 'ABC' },
+          credentialsProvider,
+          azureConfig,
           'shopify',
           'engineering',
           '',
@@ -88,6 +128,12 @@ describe('azure', () => {
           expect(req.headers.get('Authorization')).toBe('Basic OkFCQw==');
           expect(req.body).toEqual({
             searchText: 'path:/catalog-info.yaml repo:* proj:engineering',
+            $orderBy: [
+              {
+                field: 'path',
+                sortOrder: 'ASC',
+              },
+            ],
             $skip: 0,
             $top: 1000,
           });
@@ -96,9 +142,14 @@ describe('azure', () => {
       ),
     );
 
+    const { credentialsProvider, azureConfig } = createFixture(
+      'dev.azure.com',
+      'ABC',
+    );
     await expect(
       codeSearch(
-        { host: 'dev.azure.com', token: 'ABC' },
+        credentialsProvider,
+        azureConfig,
         'shopify',
         'engineering',
         '',
@@ -132,6 +183,12 @@ describe('azure', () => {
           expect(req.body).toEqual({
             searchText:
               'path:/catalog-info.yaml repo:backstage proj:engineering',
+            $orderBy: [
+              {
+                field: 'path',
+                sortOrder: 'ASC',
+              },
+            ],
             $skip: 0,
             $top: 1000,
           });
@@ -140,9 +197,15 @@ describe('azure', () => {
       ),
     );
 
+    const { credentialsProvider, azureConfig } = createFixture(
+      'dev.azure.com',
+      'ABC',
+    );
+
     await expect(
       codeSearch(
-        { host: 'dev.azure.com', token: 'ABC' },
+        credentialsProvider,
+        azureConfig,
         'shopify',
         'engineering',
         'backstage',
@@ -175,6 +238,12 @@ describe('azure', () => {
           expect(req.headers.get('Authorization')).toBe('Basic OkFCQw==');
           expect(req.body).toEqual({
             searchText: 'path:/catalog-info.yaml repo:* proj:engineering',
+            $orderBy: [
+              {
+                field: 'path',
+                sortOrder: 'ASC',
+              },
+            ],
             $skip: 0,
             $top: 1000,
           });
@@ -183,9 +252,15 @@ describe('azure', () => {
       ),
     );
 
+    const { credentialsProvider, azureConfig } = createFixture(
+      'azuredevops.mycompany.com',
+      'ABC',
+    );
+
     await expect(
       codeSearch(
-        { host: 'azuredevops.mycompany.com', token: 'ABC' },
+        credentialsProvider,
+        azureConfig,
         'shopify',
         'engineering',
         '',
@@ -236,9 +311,15 @@ describe('azure', () => {
       ),
     );
 
+    const { credentialsProvider, azureConfig } = createFixture(
+      'dev.azure.com',
+      'ABC',
+    );
+
     await expect(
       codeSearch(
-        { host: 'dev.azure.com', token: 'ABC' },
+        credentialsProvider,
+        azureConfig,
         'shopify',
         'engineering',
         'backstage',
diff --git a/plugins/catalog-backend-module-azure/src/lib/azure.ts b/plugins/catalog-backend-module-azure/src/lib/azure.ts
index 916d70a9fa..c8ff8dd739 100644
--- a/plugins/catalog-backend-module-azure/src/lib/azure.ts
+++ b/plugins/catalog-backend-module-azure/src/lib/azure.ts
@@ -16,8 +16,8 @@
 
 import fetch from 'node-fetch';
 import {
+  AzureDevOpsCredentialsProvider,
   AzureIntegrationConfig,
-  getAzureRequestOptions,
 } from '@backstage/integration';
 
 export interface CodeSearchResponse {
@@ -42,6 +42,7 @@ const PAGE_SIZE = 1000;
 
 // codeSearch returns all files that matches the given search path.
 export async function codeSearch(
+  credentialsProvider: AzureDevOpsCredentialsProvider,
   azureConfig: AzureIntegrationConfig,
   org: string,
   project: string,
@@ -57,13 +58,24 @@ export async function codeSearch(
   let hasMorePages = true;
 
   do {
+    const credentials = await credentialsProvider.getCredentials({
+      url: `https://${azureConfig.host}/${org}`,
+    });
+
     const response = await fetch(searchUrl, {
-      ...(await getAzureRequestOptions(azureConfig, {
+      headers: {
+        ...credentials?.headers,
         'Content-Type': 'application/json',
-      })),
+      },
       method: 'POST',
       body: JSON.stringify({
         searchText: `path:${path} repo:${repo || '*'} proj:${project || '*'}`,
+        $orderBy: [
+          {
+            field: 'path',
+            sortOrder: 'ASC',
+          },
+        ],
         $skip: items.length,
         $top: PAGE_SIZE,
       }),
diff --git a/plugins/catalog-backend-module-azure/src/module/catalogModuleAzureDevOpsEntityProvider.test.ts b/plugins/catalog-backend-module-azure/src/module/catalogModuleAzureDevOpsEntityProvider.test.ts
index e3140f4583..a20921fa3f 100644
--- a/plugins/catalog-backend-module-azure/src/module/catalogModuleAzureDevOpsEntityProvider.test.ts
+++ b/plugins/catalog-backend-module-azure/src/module/catalogModuleAzureDevOpsEntityProvider.test.ts
@@ -14,14 +14,8 @@
  * limitations under the License.
  */
 
-import { getVoidLogger } 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 { ConfigReader } from '@backstage/config';
+import { TaskScheduleDefinition } from '@backstage/backend-tasks';
+import { mockServices, startTestBackend } from '@backstage/backend-test-utils';
 import { catalogProcessingExtensionPoint } from '@backstage/plugin-catalog-node/alpha';
 import { Duration } from 'luxon';
 import { catalogModuleAzureDevOpsEntityProvider } from './catalogModuleAzureDevOpsEntityProvider';
@@ -38,14 +32,14 @@ describe('catalogModuleAzureDevOpsEntityProvider', () => {
       },
     };
     const runner = jest.fn();
-    const scheduler = {
-      createScheduledTaskRunner: (schedule: TaskScheduleDefinition) => {
+    const scheduler = mockServices.scheduler.mock({
+      createScheduledTaskRunner(schedule) {
         usedSchedule = schedule;
-        return runner;
+        return { run: runner };
       },
-    } as unknown as PluginTaskScheduler;
+    });
 
-    const config = new ConfigReader({
+    const config = {
       catalog: {
         providers: {
           azureDevOps: {
@@ -60,16 +54,16 @@ describe('catalogModuleAzureDevOpsEntityProvider', () => {
           },
         },
       },
-    });
+    };
 
     await startTestBackend({
       extensionPoints: [[catalogProcessingExtensionPoint, extensionPoint]],
-      services: [
-        [coreServices.rootConfig, config],
-        [coreServices.logger, getVoidLogger()],
-        [coreServices.scheduler, scheduler],
+      features: [
+        catalogModuleAzureDevOpsEntityProvider(),
+        mockServices.rootConfig.factory({ data: config }),
+        mockServices.logger.factory(),
+        scheduler.factory,
       ],
-      features: [catalogModuleAzureDevOpsEntityProvider()],
     });
 
     expect(usedSchedule?.frequency).toEqual(Duration.fromISO('P1M'));
diff --git a/plugins/catalog-backend-module-azure/src/module/index.ts b/plugins/catalog-backend-module-azure/src/module/index.ts
index cfa8c78548..329ad604e2 100644
--- a/plugins/catalog-backend-module-azure/src/module/index.ts
+++ b/plugins/catalog-backend-module-azure/src/module/index.ts
@@ -14,4 +14,4 @@
  * limitations under the License.
  */
 
-export { catalogModuleAzureDevOpsEntityProvider } from './catalogModuleAzureDevOpsEntityProvider';
+export { catalogModuleAzureDevOpsEntityProvider as default } from './catalogModuleAzureDevOpsEntityProvider';
diff --git a/plugins/catalog-backend-module-azure/src/processors/AzureDevOpsDiscoveryProcessor.test.ts b/plugins/catalog-backend-module-azure/src/processors/AzureDevOpsDiscoveryProcessor.test.ts
index 4a8e1d4537..36dd920621 100644
--- a/plugins/catalog-backend-module-azure/src/processors/AzureDevOpsDiscoveryProcessor.test.ts
+++ b/plugins/catalog-backend-module-azure/src/processors/AzureDevOpsDiscoveryProcessor.test.ts
@@ -158,6 +158,7 @@ describe('AzureDevOpsDiscoveryProcessor', () => {
       await processor.readLocation(location, false, emitter);
 
       expect(mockCodeSearch).toHaveBeenCalledWith(
+        expect.anything(),
         { host: 'dev.azure.com' },
         'shopify',
         'engineering',
@@ -207,6 +208,7 @@ describe('AzureDevOpsDiscoveryProcessor', () => {
       await processor.readLocation(location, false, emitter);
 
       expect(mockCodeSearch).toHaveBeenCalledWith(
+        expect.anything(),
         { host: 'dev.azure.com' },
         'shopify',
         'engineering',
@@ -248,6 +250,7 @@ describe('AzureDevOpsDiscoveryProcessor', () => {
       await processor.readLocation(location, false, emitter);
 
       expect(mockCodeSearch).toHaveBeenCalledWith(
+        expect.anything(),
         { host: 'dev.azure.com' },
         'shopify',
         'engineering',
@@ -277,6 +280,7 @@ describe('AzureDevOpsDiscoveryProcessor', () => {
       await processor.readLocation(location, false, emitter);
 
       expect(mockCodeSearch).toHaveBeenCalledWith(
+        expect.anything(),
         { host: 'dev.azure.com' },
         'shopify',
         'engineering',
diff --git a/plugins/catalog-backend-module-azure/src/processors/AzureDevOpsDiscoveryProcessor.ts b/plugins/catalog-backend-module-azure/src/processors/AzureDevOpsDiscoveryProcessor.ts
index bad6067dc3..d9638e6cc7 100644
--- a/plugins/catalog-backend-module-azure/src/processors/AzureDevOpsDiscoveryProcessor.ts
+++ b/plugins/catalog-backend-module-azure/src/processors/AzureDevOpsDiscoveryProcessor.ts
@@ -16,6 +16,8 @@
 
 import { Config } from '@backstage/config';
 import {
+  AzureDevOpsCredentialsProvider,
+  DefaultAzureDevOpsCredentialsProvider,
   ScmIntegrationRegistry,
   ScmIntegrations,
 } from '@backstage/integration';
@@ -46,6 +48,7 @@ import { codeSearch } from '../lib';
  */
 export class AzureDevOpsDiscoveryProcessor implements CatalogProcessor {
   private readonly integrations: ScmIntegrationRegistry;
+  private readonly credentialsProvider: AzureDevOpsCredentialsProvider;
   private readonly logger: Logger;
 
   static fromConfig(config: Config, options: { logger: Logger }) {
@@ -63,6 +66,10 @@ export class AzureDevOpsDiscoveryProcessor implements CatalogProcessor {
   }) {
     this.integrations = options.integrations;
     this.logger = options.logger;
+    this.credentialsProvider =
+      DefaultAzureDevOpsCredentialsProvider.fromIntegrations(
+        options.integrations,
+      );
   }
 
   getProcessorName(): string {
@@ -93,6 +100,7 @@ export class AzureDevOpsDiscoveryProcessor implements CatalogProcessor {
     );
 
     const files = await codeSearch(
+      this.credentialsProvider,
       azureConfig,
       org,
       project,
diff --git a/plugins/catalog-backend-module-azure/src/providers/AzureDevOpsEntityProvider.ts b/plugins/catalog-backend-module-azure/src/providers/AzureDevOpsEntityProvider.ts
index 5abd23ce00..92398779c7 100644
--- a/plugins/catalog-backend-module-azure/src/providers/AzureDevOpsEntityProvider.ts
+++ b/plugins/catalog-backend-module-azure/src/providers/AzureDevOpsEntityProvider.ts
@@ -16,7 +16,12 @@
 
 import { PluginTaskScheduler, TaskRunner } from '@backstage/backend-tasks';
 import { Config } from '@backstage/config';
-import { AzureIntegration, ScmIntegrations } from '@backstage/integration';
+import {
+  AzureDevOpsCredentialsProvider,
+  AzureIntegration,
+  DefaultAzureDevOpsCredentialsProvider,
+  ScmIntegrations,
+} from '@backstage/integration';
 import {
   EntityProvider,
   EntityProviderConnection,
@@ -50,6 +55,9 @@ export class AzureDevOpsEntityProvider implements EntityProvider {
     },
   ): AzureDevOpsEntityProvider[] {
     const providerConfigs = readAzureDevOpsConfigs(configRoot);
+    const scmIntegrations = ScmIntegrations.fromConfig(configRoot);
+    const credentialsProvider =
+      DefaultAzureDevOpsCredentialsProvider.fromIntegrations(scmIntegrations);
 
     if (!options.schedule && !options.scheduler) {
       throw new Error('Either schedule or scheduler must be provided.');
@@ -79,6 +87,7 @@ export class AzureDevOpsEntityProvider implements EntityProvider {
       return new AzureDevOpsEntityProvider(
         providerConfig,
         integration,
+        credentialsProvider,
         options.logger,
         taskRunner,
       );
@@ -88,6 +97,7 @@ export class AzureDevOpsEntityProvider implements EntityProvider {
   private constructor(
     private readonly config: AzureDevOpsConfig,
     private readonly integration: AzureIntegration,
+    private readonly credentialsProvider: AzureDevOpsCredentialsProvider,
     logger: Logger,
     taskRunner: TaskRunner,
   ) {
@@ -139,6 +149,7 @@ export class AzureDevOpsEntityProvider implements EntityProvider {
     logger.info('Discovering Azure DevOps catalog files');
 
     const files = await codeSearch(
+      this.credentialsProvider,
       this.integration.config,
       this.config.organization,
       this.config.project,
@@ -148,7 +159,10 @@ export class AzureDevOpsEntityProvider implements EntityProvider {
 
     logger.info(`Discovered ${files.length} catalog files`);
 
-    const locations = files.map(key => this.createLocationSpec(key));
+    const targets = files.map(key => this.createObjectUrl(key));
+    const locations = Array.from(new Set(targets)).map(key =>
+      this.createLocationSpec(key),
+    );
 
     await this.connection.applyMutation({
       type: 'full',
@@ -165,9 +179,7 @@ export class AzureDevOpsEntityProvider implements EntityProvider {
     );
   }
 
-  private createLocationSpec(file: CodeSearchResultItem): LocationSpec {
-    const target = this.createObjectUrl(file);
-
+  private createLocationSpec(target: string): LocationSpec {
     return {
       type: 'url',
       target: target,
diff --git a/plugins/catalog-backend-module-bitbucket-cloud/CHANGELOG.md b/plugins/catalog-backend-module-bitbucket-cloud/CHANGELOG.md
index 593e1fd2a1..b3b5960077 100644
--- a/plugins/catalog-backend-module-bitbucket-cloud/CHANGELOG.md
+++ b/plugins/catalog-backend-module-bitbucket-cloud/CHANGELOG.md
@@ -1,5 +1,86 @@
 # @backstage/plugin-catalog-backend-module-bitbucket-cloud
 
+## 0.1.18-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config@1.1.0-next.1
+  - @backstage/backend-tasks@0.5.8-next.2
+  - @backstage/backend-common@0.19.5-next.2
+  - @backstage/plugin-catalog-node@1.4.4-next.2
+  - @backstage/integration@1.7.0-next.2
+  - @backstage/backend-plugin-api@0.6.3-next.2
+  - @backstage/catalog-model@1.4.2-next.1
+  - @backstage/catalog-client@1.4.4-next.1
+  - @backstage/plugin-bitbucket-cloud-common@0.2.12-next.2
+  - @backstage/plugin-catalog-common@1.0.16-next.1
+  - @backstage/plugin-events-node@0.2.12-next.2
+
+## 0.1.18-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config@1.1.0-next.0
+  - @backstage/integration@1.7.0-next.1
+  - @backstage/backend-tasks@0.5.8-next.1
+  - @backstage/backend-common@0.19.5-next.1
+  - @backstage/backend-plugin-api@0.6.3-next.1
+  - @backstage/catalog-model@1.4.2-next.0
+  - @backstage/plugin-bitbucket-cloud-common@0.2.12-next.1
+  - @backstage/plugin-catalog-node@1.4.4-next.1
+  - @backstage/plugin-events-node@0.2.12-next.1
+  - @backstage/catalog-client@1.4.4-next.0
+  - @backstage/plugin-catalog-common@1.0.16-next.0
+
+## 0.1.17-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.19.4-next.0
+  - @backstage/integration@1.7.0-next.0
+  - @backstage/backend-tasks@0.5.7-next.0
+  - @backstage/backend-plugin-api@0.6.2-next.0
+  - @backstage/catalog-client@1.4.3
+  - @backstage/catalog-model@1.4.1
+  - @backstage/config@1.0.8
+  - @backstage/plugin-bitbucket-cloud-common@0.2.11-next.0
+  - @backstage/plugin-catalog-common@1.0.15
+  - @backstage/plugin-catalog-node@1.4.3-next.0
+  - @backstage/plugin-events-node@0.2.11-next.0
+
+## 0.1.15
+
+### Patch Changes
+
+- 629cbd194a87: Use `coreServices.rootConfig` instead of `coreService.config`
+- 4b82382ed8c2: Fixed invalid configuration schema. The configuration schema may be more strict as a result.
+- Updated dependencies
+  - @backstage/backend-common@0.19.2
+  - @backstage/backend-plugin-api@0.6.0
+  - @backstage/plugin-bitbucket-cloud-common@0.2.9
+  - @backstage/plugin-catalog-node@1.4.1
+  - @backstage/plugin-events-node@0.2.9
+  - @backstage/integration@1.6.0
+  - @backstage/backend-tasks@0.5.5
+  - @backstage/catalog-client@1.4.3
+  - @backstage/catalog-model@1.4.1
+  - @backstage/config@1.0.8
+  - @backstage/plugin-catalog-common@1.0.15
+
+## 0.1.15-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@0.6.0-next.2
+  - @backstage/backend-tasks@0.5.5-next.2
+  - @backstage/backend-common@0.19.2-next.2
+  - @backstage/plugin-catalog-node@1.4.1-next.2
+  - @backstage/plugin-events-node@0.2.9-next.2
+
 ## 0.1.15-next.1
 
 ### Patch Changes
diff --git a/plugins/catalog-backend-module-bitbucket-cloud/alpha-api-report.md b/plugins/catalog-backend-module-bitbucket-cloud/alpha-api-report.md
index a5d0ffc665..69b2b46e4e 100644
--- a/plugins/catalog-backend-module-bitbucket-cloud/alpha-api-report.md
+++ b/plugins/catalog-backend-module-bitbucket-cloud/alpha-api-report.md
@@ -6,7 +6,8 @@
 import { BackendFeature } from '@backstage/backend-plugin-api';
 
 // @alpha (undocumented)
-export const catalogModuleBitbucketCloudEntityProvider: () => BackendFeature;
+const catalogModuleBitbucketCloudEntityProvider: () => BackendFeature;
+export default catalogModuleBitbucketCloudEntityProvider;
 
 // (No @packageDocumentation comment for this package)
 ```
diff --git a/plugins/catalog-backend-module-bitbucket-cloud/catalog-info.yaml b/plugins/catalog-backend-module-bitbucket-cloud/catalog-info.yaml
new file mode 100644
index 0000000000..99fc6661db
--- /dev/null
+++ b/plugins/catalog-backend-module-bitbucket-cloud/catalog-info.yaml
@@ -0,0 +1,12 @@
+apiVersion: backstage.io/v1alpha1
+kind: Component
+metadata:
+  name: backstage-plugin-catalog-backend-module-bitbucket-cloud
+  title: '@backstage/plugin-catalog-backend-module-bitbucket-cloud'
+  description: >-
+    A Backstage catalog backend module that helps integrate towards Bitbucket
+    Cloud
+spec:
+  lifecycle: experimental
+  type: backstage-backend-plugin-module
+  owner: pjungermann
diff --git a/plugins/catalog-backend-module-bitbucket-cloud/package.json b/plugins/catalog-backend-module-bitbucket-cloud/package.json
index 30875be251..ac1dd99dfd 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.15-next.1",
+  "version": "0.1.18-next.2",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
diff --git a/plugins/catalog-backend-module-bitbucket-cloud/src/alpha.ts b/plugins/catalog-backend-module-bitbucket-cloud/src/alpha.ts
index c277a0a680..01a9b25f7c 100644
--- a/plugins/catalog-backend-module-bitbucket-cloud/src/alpha.ts
+++ b/plugins/catalog-backend-module-bitbucket-cloud/src/alpha.ts
@@ -15,3 +15,4 @@
  */
 
 export * from './module';
+export { default } from './module';
diff --git a/plugins/catalog-backend-module-bitbucket-cloud/src/module/catalogModuleBitbucketCloudEntityProvider.test.ts b/plugins/catalog-backend-module-bitbucket-cloud/src/module/catalogModuleBitbucketCloudEntityProvider.test.ts
index b46304d4e3..c771a40acc 100644
--- a/plugins/catalog-backend-module-bitbucket-cloud/src/module/catalogModuleBitbucketCloudEntityProvider.test.ts
+++ b/plugins/catalog-backend-module-bitbucket-cloud/src/module/catalogModuleBitbucketCloudEntityProvider.test.ts
@@ -14,11 +14,7 @@
  * limitations under the License.
  */
 
-import { coreServices } from '@backstage/backend-plugin-api';
-import {
-  PluginTaskScheduler,
-  TaskScheduleDefinition,
-} from '@backstage/backend-tasks';
+import { TaskScheduleDefinition } from '@backstage/backend-tasks';
 import { startTestBackend, mockServices } from '@backstage/backend-test-utils';
 import { catalogProcessingExtensionPoint } from '@backstage/plugin-catalog-node/alpha';
 import { eventsExtensionPoint } from '@backstage/plugin-events-node/alpha';
@@ -43,19 +39,20 @@ describe('catalogModuleBitbucketCloudEntityProvider', () => {
       },
     };
     const runner = jest.fn();
-    const scheduler = {
-      createScheduledTaskRunner: (schedule: TaskScheduleDefinition) => {
+    const scheduler = mockServices.scheduler.mock({
+      createScheduledTaskRunner(schedule) {
         usedSchedule = schedule;
-        return runner;
+        return { run: runner };
       },
-    } as unknown as PluginTaskScheduler;
+    });
 
     await startTestBackend({
       extensionPoints: [
         [catalogProcessingExtensionPoint, catalogExtensionPointImpl],
         [eventsExtensionPoint, eventsExtensionPointImpl],
       ],
-      services: [
+      features: [
+        catalogModuleBitbucketCloudEntityProvider(),
         mockServices.rootConfig.factory({
           data: {
             catalog: {
@@ -71,9 +68,8 @@ describe('catalogModuleBitbucketCloudEntityProvider', () => {
             },
           },
         }),
-        [coreServices.scheduler, scheduler],
+        scheduler.factory,
       ],
-      features: [catalogModuleBitbucketCloudEntityProvider()],
     });
 
     expect(usedSchedule?.frequency).toEqual(Duration.fromISO('P1M'));
diff --git a/plugins/catalog-backend-module-bitbucket-cloud/src/module/index.ts b/plugins/catalog-backend-module-bitbucket-cloud/src/module/index.ts
index f9654971be..22a777ea49 100644
--- a/plugins/catalog-backend-module-bitbucket-cloud/src/module/index.ts
+++ b/plugins/catalog-backend-module-bitbucket-cloud/src/module/index.ts
@@ -14,4 +14,4 @@
  * limitations under the License.
  */
 
-export { catalogModuleBitbucketCloudEntityProvider } from './catalogModuleBitbucketCloudEntityProvider';
+export { catalogModuleBitbucketCloudEntityProvider as default } from './catalogModuleBitbucketCloudEntityProvider';
diff --git a/plugins/catalog-backend-module-bitbucket-server/CHANGELOG.md b/plugins/catalog-backend-module-bitbucket-server/CHANGELOG.md
index 52920ff815..b2556975c1 100644
--- a/plugins/catalog-backend-module-bitbucket-server/CHANGELOG.md
+++ b/plugins/catalog-backend-module-bitbucket-server/CHANGELOG.md
@@ -1,5 +1,73 @@
 # @backstage/plugin-catalog-backend-module-bitbucket-server
 
+## 0.1.16-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config@1.1.0-next.1
+  - @backstage/backend-tasks@0.5.8-next.2
+  - @backstage/backend-common@0.19.5-next.2
+  - @backstage/plugin-catalog-node@1.4.4-next.2
+  - @backstage/integration@1.7.0-next.2
+  - @backstage/backend-plugin-api@0.6.3-next.2
+  - @backstage/catalog-model@1.4.2-next.1
+  - @backstage/errors@1.2.1
+
+## 0.1.16-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config@1.1.0-next.0
+  - @backstage/integration@1.7.0-next.1
+  - @backstage/backend-tasks@0.5.8-next.1
+  - @backstage/backend-common@0.19.5-next.1
+  - @backstage/backend-plugin-api@0.6.3-next.1
+  - @backstage/catalog-model@1.4.2-next.0
+  - @backstage/plugin-catalog-node@1.4.4-next.1
+  - @backstage/errors@1.2.1
+
+## 0.1.15-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.19.4-next.0
+  - @backstage/integration@1.7.0-next.0
+  - @backstage/backend-tasks@0.5.7-next.0
+  - @backstage/backend-plugin-api@0.6.2-next.0
+  - @backstage/catalog-model@1.4.1
+  - @backstage/config@1.0.8
+  - @backstage/errors@1.2.1
+  - @backstage/plugin-catalog-node@1.4.3-next.0
+
+## 0.1.13
+
+### Patch Changes
+
+- 629cbd194a87: Use `coreServices.rootConfig` instead of `coreService.config`
+- 4b82382ed8c2: Fixed invalid configuration schema. The configuration schema may be more strict as a result.
+- Updated dependencies
+  - @backstage/backend-common@0.19.2
+  - @backstage/backend-plugin-api@0.6.0
+  - @backstage/plugin-catalog-node@1.4.1
+  - @backstage/integration@1.6.0
+  - @backstage/backend-tasks@0.5.5
+  - @backstage/catalog-model@1.4.1
+  - @backstage/config@1.0.8
+  - @backstage/errors@1.2.1
+
+## 0.1.13-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@0.6.0-next.2
+  - @backstage/backend-tasks@0.5.5-next.2
+  - @backstage/backend-common@0.19.2-next.2
+  - @backstage/plugin-catalog-node@1.4.1-next.2
+
 ## 0.1.13-next.1
 
 ### Patch Changes
diff --git a/plugins/catalog-backend-module-bitbucket-server/alpha-api-report.md b/plugins/catalog-backend-module-bitbucket-server/alpha-api-report.md
index 2cc53a3c16..5e5b4f68cd 100644
--- a/plugins/catalog-backend-module-bitbucket-server/alpha-api-report.md
+++ b/plugins/catalog-backend-module-bitbucket-server/alpha-api-report.md
@@ -6,7 +6,8 @@
 import { BackendFeature } from '@backstage/backend-plugin-api';
 
 // @alpha (undocumented)
-export const catalogModuleBitbucketServerEntityProvider: () => BackendFeature;
+const catalogModuleBitbucketServerEntityProvider: () => BackendFeature;
+export default catalogModuleBitbucketServerEntityProvider;
 
 // (No @packageDocumentation comment for this package)
 ```
diff --git a/plugins/catalog-backend-module-bitbucket-server/catalog-info.yaml b/plugins/catalog-backend-module-bitbucket-server/catalog-info.yaml
new file mode 100644
index 0000000000..47c49530a0
--- /dev/null
+++ b/plugins/catalog-backend-module-bitbucket-server/catalog-info.yaml
@@ -0,0 +1,9 @@
+apiVersion: backstage.io/v1alpha1
+kind: Component
+metadata:
+  name: backstage-plugin-catalog-backend-module-bitbucket-server
+  title: '@backstage/plugin-catalog-backend-module-bitbucket-server'
+spec:
+  lifecycle: experimental
+  type: backstage-backend-plugin-module
+  owner: catalog-maintainers
diff --git a/plugins/catalog-backend-module-bitbucket-server/package.json b/plugins/catalog-backend-module-bitbucket-server/package.json
index ac28eecc36..5f5e23dff6 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.13-next.1",
+  "version": "0.1.16-next.2",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
diff --git a/plugins/catalog-backend-module-bitbucket-server/src/alpha.ts b/plugins/catalog-backend-module-bitbucket-server/src/alpha.ts
index c277a0a680..01a9b25f7c 100644
--- a/plugins/catalog-backend-module-bitbucket-server/src/alpha.ts
+++ b/plugins/catalog-backend-module-bitbucket-server/src/alpha.ts
@@ -15,3 +15,4 @@
  */
 
 export * from './module';
+export { default } from './module';
diff --git a/plugins/catalog-backend-module-bitbucket-server/src/module/catalogModuleBitbucketServerEntityProvider.test.ts b/plugins/catalog-backend-module-bitbucket-server/src/module/catalogModuleBitbucketServerEntityProvider.test.ts
index f072823052..ab92e24fd7 100644
--- a/plugins/catalog-backend-module-bitbucket-server/src/module/catalogModuleBitbucketServerEntityProvider.test.ts
+++ b/plugins/catalog-backend-module-bitbucket-server/src/module/catalogModuleBitbucketServerEntityProvider.test.ts
@@ -14,14 +14,8 @@
  * limitations under the License.
  */
 
-import { ConfigReader } from '@backstage/config';
-import { getVoidLogger } 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 { TaskScheduleDefinition } from '@backstage/backend-tasks';
+import { mockServices, startTestBackend } from '@backstage/backend-test-utils';
 import { catalogProcessingExtensionPoint } from '@backstage/plugin-catalog-node/alpha';
 import { catalogModuleBitbucketServerEntityProvider } from './catalogModuleBitbucketServerEntityProvider';
 import { Duration } from 'luxon';
@@ -38,14 +32,14 @@ describe('catalogModuleBitbucketServerEntityProvider', () => {
       },
     };
     const runner = jest.fn();
-    const scheduler = {
-      createScheduledTaskRunner: (schedule: TaskScheduleDefinition) => {
+    const scheduler = mockServices.scheduler.mock({
+      createScheduledTaskRunner(schedule) {
         usedSchedule = schedule;
-        return runner;
+        return { run: runner };
       },
-    } as unknown as PluginTaskScheduler;
+    });
 
-    const config = new ConfigReader({
+    const config = {
       catalog: {
         providers: {
           bitbucketServer: {
@@ -64,16 +58,16 @@ describe('catalogModuleBitbucketServerEntityProvider', () => {
           },
         ],
       },
-    });
+    };
 
     await startTestBackend({
       extensionPoints: [[catalogProcessingExtensionPoint, extensionPoint]],
-      services: [
-        [coreServices.rootConfig, config],
-        [coreServices.logger, getVoidLogger()],
-        [coreServices.scheduler, scheduler],
+      features: [
+        catalogModuleBitbucketServerEntityProvider(),
+        mockServices.rootConfig.factory({ data: config }),
+        mockServices.logger.factory(),
+        scheduler.factory,
       ],
-      features: [catalogModuleBitbucketServerEntityProvider()],
     });
 
     expect(usedSchedule?.frequency).toEqual(Duration.fromISO('P1M'));
diff --git a/plugins/catalog-backend-module-bitbucket-server/src/module/index.ts b/plugins/catalog-backend-module-bitbucket-server/src/module/index.ts
index 160f099ae0..033556f566 100644
--- a/plugins/catalog-backend-module-bitbucket-server/src/module/index.ts
+++ b/plugins/catalog-backend-module-bitbucket-server/src/module/index.ts
@@ -14,4 +14,4 @@
  * limitations under the License.
  */
 
-export { catalogModuleBitbucketServerEntityProvider } from './catalogModuleBitbucketServerEntityProvider';
+export { catalogModuleBitbucketServerEntityProvider as default } from './catalogModuleBitbucketServerEntityProvider';
diff --git a/plugins/catalog-backend-module-bitbucket/CHANGELOG.md b/plugins/catalog-backend-module-bitbucket/CHANGELOG.md
index 5b1e75e86d..ad6f296fbf 100644
--- a/plugins/catalog-backend-module-bitbucket/CHANGELOG.md
+++ b/plugins/catalog-backend-module-bitbucket/CHANGELOG.md
@@ -1,5 +1,69 @@
 # @backstage/plugin-catalog-backend-module-bitbucket
 
+## 0.2.18-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config@1.1.0-next.1
+  - @backstage/backend-common@0.19.5-next.2
+  - @backstage/plugin-catalog-node@1.4.4-next.2
+  - @backstage/integration@1.7.0-next.2
+  - @backstage/catalog-model@1.4.2-next.1
+  - @backstage/errors@1.2.1
+  - @backstage/types@1.1.0
+  - @backstage/plugin-bitbucket-cloud-common@0.2.12-next.2
+
+## 0.2.18-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config@1.1.0-next.0
+  - @backstage/integration@1.7.0-next.1
+  - @backstage/backend-common@0.19.5-next.1
+  - @backstage/catalog-model@1.4.2-next.0
+  - @backstage/plugin-bitbucket-cloud-common@0.2.12-next.1
+  - @backstage/plugin-catalog-node@1.4.4-next.1
+  - @backstage/errors@1.2.1
+  - @backstage/types@1.1.0
+
+## 0.2.17-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.19.4-next.0
+  - @backstage/integration@1.7.0-next.0
+  - @backstage/catalog-model@1.4.1
+  - @backstage/config@1.0.8
+  - @backstage/errors@1.2.1
+  - @backstage/types@1.1.0
+  - @backstage/plugin-bitbucket-cloud-common@0.2.11-next.0
+  - @backstage/plugin-catalog-node@1.4.3-next.0
+
+## 0.2.15
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.19.2
+  - @backstage/plugin-bitbucket-cloud-common@0.2.9
+  - @backstage/plugin-catalog-node@1.4.1
+  - @backstage/integration@1.6.0
+  - @backstage/catalog-model@1.4.1
+  - @backstage/config@1.0.8
+  - @backstage/errors@1.2.1
+  - @backstage/types@1.1.0
+
+## 0.2.15-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.19.2-next.2
+  - @backstage/plugin-catalog-node@1.4.1-next.2
+
 ## 0.2.15-next.1
 
 ### Patch Changes
diff --git a/plugins/catalog-backend-module-bitbucket/catalog-info.yaml b/plugins/catalog-backend-module-bitbucket/catalog-info.yaml
new file mode 100644
index 0000000000..a384181766
--- /dev/null
+++ b/plugins/catalog-backend-module-bitbucket/catalog-info.yaml
@@ -0,0 +1,10 @@
+apiVersion: backstage.io/v1alpha1
+kind: Component
+metadata:
+  name: backstage-plugin-catalog-backend-module-bitbucket
+  title: '@backstage/plugin-catalog-backend-module-bitbucket'
+  description: A Backstage catalog backend module that helps integrate towards Bitbucket
+spec:
+  lifecycle: experimental
+  type: backstage-backend-plugin-module
+  owner: catalog-maintainers
diff --git a/plugins/catalog-backend-module-bitbucket/package.json b/plugins/catalog-backend-module-bitbucket/package.json
index 53d80eb89e..681db2dd42 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.15-next.1",
+  "version": "0.2.18-next.2",
   "deprecated": true,
   "main": "src/index.ts",
   "types": "src/index.ts",
diff --git a/plugins/catalog-backend-module-gcp/CHANGELOG.md b/plugins/catalog-backend-module-gcp/CHANGELOG.md
index 7fd00d048d..3efe6cb7d5 100644
--- a/plugins/catalog-backend-module-gcp/CHANGELOG.md
+++ b/plugins/catalog-backend-module-gcp/CHANGELOG.md
@@ -1,5 +1,68 @@
 # @backstage/plugin-catalog-backend-module-gcp
 
+## 0.1.3-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config@1.1.0-next.1
+  - @backstage/backend-tasks@0.5.8-next.2
+  - @backstage/backend-common@0.19.5-next.2
+  - @backstage/plugin-catalog-node@1.4.4-next.2
+  - @backstage/backend-plugin-api@0.6.3-next.2
+  - @backstage/plugin-kubernetes-common@0.6.6-next.1
+
+## 0.1.3-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-kubernetes-common@0.6.6-next.0
+  - @backstage/config@1.1.0-next.0
+  - @backstage/backend-tasks@0.5.8-next.1
+  - @backstage/backend-common@0.19.5-next.1
+  - @backstage/backend-plugin-api@0.6.3-next.1
+  - @backstage/plugin-catalog-node@1.4.4-next.1
+
+## 0.1.2-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.19.4-next.0
+  - @backstage/backend-tasks@0.5.7-next.0
+  - @backstage/backend-plugin-api@0.6.2-next.0
+  - @backstage/config@1.0.8
+  - @backstage/plugin-catalog-node@1.4.3-next.0
+  - @backstage/plugin-kubernetes-common@0.6.5
+
+## 0.1.0
+
+### Minor Changes
+
+- 290eff6692aa: Added GCP catalog plugin with GKE provider
+
+### Patch Changes
+
+- 629cbd194a87: Use `coreServices.rootConfig` instead of `coreService.config`
+- Updated dependencies
+  - @backstage/backend-common@0.19.2
+  - @backstage/backend-plugin-api@0.6.0
+  - @backstage/plugin-catalog-node@1.4.1
+  - @backstage/backend-tasks@0.5.5
+  - @backstage/config@1.0.8
+  - @backstage/plugin-kubernetes-common@0.6.5
+
+## 0.1.0-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@0.6.0-next.2
+  - @backstage/backend-tasks@0.5.5-next.2
+  - @backstage/backend-common@0.19.2-next.2
+  - @backstage/plugin-catalog-node@1.4.1-next.2
+
 ## 0.1.0-next.0
 
 ### Minor Changes
diff --git a/plugins/catalog-backend-module-gcp/api-report.md b/plugins/catalog-backend-module-gcp/api-report.md
index 6f963ed51d..b20b9c8363 100644
--- a/plugins/catalog-backend-module-gcp/api-report.md
+++ b/plugins/catalog-backend-module-gcp/api-report.md
@@ -12,7 +12,8 @@ import { Logger } from 'winston';
 import { SchedulerService } from '@backstage/backend-plugin-api';
 
 // @public
-export const catalogModuleGcpGkeEntityProvider: () => BackendFeature;
+const catalogModuleGcpGkeEntityProvider: () => BackendFeature;
+export default catalogModuleGcpGkeEntityProvider;
 
 // @public
 export class GkeEntityProvider implements EntityProvider {
diff --git a/plugins/catalog-backend-module-gcp/catalog-info.yaml b/plugins/catalog-backend-module-gcp/catalog-info.yaml
new file mode 100644
index 0000000000..2a8b83b3ee
--- /dev/null
+++ b/plugins/catalog-backend-module-gcp/catalog-info.yaml
@@ -0,0 +1,10 @@
+apiVersion: backstage.io/v1alpha1
+kind: Component
+metadata:
+  name: backstage-plugin-catalog-backend-module-gcp
+  title: '@backstage/plugin-catalog-backend-module-gcp'
+  description: A Backstage catalog backend module that helps integrate towards GCP
+spec:
+  lifecycle: experimental
+  type: backstage-backend-plugin-module
+  owner: catalog-maintainers
diff --git a/plugins/catalog-backend-module-gcp/package.json b/plugins/catalog-backend-module-gcp/package.json
index 7ddb7d7b97..067fc3cf9b 100644
--- a/plugins/catalog-backend-module-gcp/package.json
+++ b/plugins/catalog-backend-module-gcp/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@backstage/plugin-catalog-backend-module-gcp",
   "description": "A Backstage catalog backend module that helps integrate towards GCP",
-  "version": "0.1.0-next.0",
+  "version": "0.1.3-next.2",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
diff --git a/plugins/catalog-backend-module-gcp/src/index.ts b/plugins/catalog-backend-module-gcp/src/index.ts
index fb3984a04d..1666fde7e0 100644
--- a/plugins/catalog-backend-module-gcp/src/index.ts
+++ b/plugins/catalog-backend-module-gcp/src/index.ts
@@ -22,3 +22,4 @@
 
 export * from './providers';
 export * from './module';
+export { default } from './module';
diff --git a/plugins/catalog-backend-module-gcp/src/module/index.ts b/plugins/catalog-backend-module-gcp/src/module/index.ts
index c7cd310c97..b51790cbb8 100644
--- a/plugins/catalog-backend-module-gcp/src/module/index.ts
+++ b/plugins/catalog-backend-module-gcp/src/module/index.ts
@@ -14,4 +14,4 @@
  * limitations under the License.
  */
 
-export { catalogModuleGcpGkeEntityProvider } from './catalogModuleGcpGkeEntityProvider';
+export { catalogModuleGcpGkeEntityProvider as default } from './catalogModuleGcpGkeEntityProvider';
diff --git a/plugins/catalog-backend-module-gerrit/CHANGELOG.md b/plugins/catalog-backend-module-gerrit/CHANGELOG.md
index 3f7d7a8dd3..0bceb9560e 100644
--- a/plugins/catalog-backend-module-gerrit/CHANGELOG.md
+++ b/plugins/catalog-backend-module-gerrit/CHANGELOG.md
@@ -1,5 +1,73 @@
 # @backstage/plugin-catalog-backend-module-gerrit
 
+## 0.1.19-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config@1.1.0-next.1
+  - @backstage/backend-tasks@0.5.8-next.2
+  - @backstage/backend-common@0.19.5-next.2
+  - @backstage/plugin-catalog-node@1.4.4-next.2
+  - @backstage/integration@1.7.0-next.2
+  - @backstage/backend-plugin-api@0.6.3-next.2
+  - @backstage/catalog-model@1.4.2-next.1
+  - @backstage/errors@1.2.1
+
+## 0.1.19-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config@1.1.0-next.0
+  - @backstage/integration@1.7.0-next.1
+  - @backstage/backend-tasks@0.5.8-next.1
+  - @backstage/backend-common@0.19.5-next.1
+  - @backstage/backend-plugin-api@0.6.3-next.1
+  - @backstage/catalog-model@1.4.2-next.0
+  - @backstage/plugin-catalog-node@1.4.4-next.1
+  - @backstage/errors@1.2.1
+
+## 0.1.18-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.19.4-next.0
+  - @backstage/integration@1.7.0-next.0
+  - @backstage/backend-tasks@0.5.7-next.0
+  - @backstage/backend-plugin-api@0.6.2-next.0
+  - @backstage/catalog-model@1.4.1
+  - @backstage/config@1.0.8
+  - @backstage/errors@1.2.1
+  - @backstage/plugin-catalog-node@1.4.3-next.0
+
+## 0.1.16
+
+### Patch Changes
+
+- 629cbd194a87: Use `coreServices.rootConfig` instead of `coreService.config`
+- 4b82382ed8c2: Fixed invalid configuration schema. The configuration schema may be more strict as a result.
+- Updated dependencies
+  - @backstage/backend-common@0.19.2
+  - @backstage/backend-plugin-api@0.6.0
+  - @backstage/plugin-catalog-node@1.4.1
+  - @backstage/integration@1.6.0
+  - @backstage/backend-tasks@0.5.5
+  - @backstage/catalog-model@1.4.1
+  - @backstage/config@1.0.8
+  - @backstage/errors@1.2.1
+
+## 0.1.16-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@0.6.0-next.2
+  - @backstage/backend-tasks@0.5.5-next.2
+  - @backstage/backend-common@0.19.2-next.2
+  - @backstage/plugin-catalog-node@1.4.1-next.2
+
 ## 0.1.16-next.1
 
 ### Patch Changes
diff --git a/plugins/catalog-backend-module-gerrit/alpha-api-report.md b/plugins/catalog-backend-module-gerrit/alpha-api-report.md
index 5aee61f28a..dd6c61c5ab 100644
--- a/plugins/catalog-backend-module-gerrit/alpha-api-report.md
+++ b/plugins/catalog-backend-module-gerrit/alpha-api-report.md
@@ -6,7 +6,8 @@
 import { BackendFeature } from '@backstage/backend-plugin-api';
 
 // @alpha (undocumented)
-export const catalogModuleGerritEntityProvider: () => BackendFeature;
+const catalogModuleGerritEntityProvider: () => BackendFeature;
+export default catalogModuleGerritEntityProvider;
 
 // (No @packageDocumentation comment for this package)
 ```
diff --git a/plugins/catalog-backend-module-gerrit/catalog-info.yaml b/plugins/catalog-backend-module-gerrit/catalog-info.yaml
new file mode 100644
index 0000000000..9f75a840aa
--- /dev/null
+++ b/plugins/catalog-backend-module-gerrit/catalog-info.yaml
@@ -0,0 +1,9 @@
+apiVersion: backstage.io/v1alpha1
+kind: Component
+metadata:
+  name: backstage-plugin-catalog-backend-module-gerrit
+  title: '@backstage/plugin-catalog-backend-module-gerrit'
+spec:
+  lifecycle: experimental
+  type: backstage-backend-plugin-module
+  owner: catalog-maintainers
diff --git a/plugins/catalog-backend-module-gerrit/package.json b/plugins/catalog-backend-module-gerrit/package.json
index f9566da0e2..e37b8f8549 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.16-next.1",
+  "version": "0.1.19-next.2",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
diff --git a/plugins/catalog-backend-module-gerrit/src/alpha.ts b/plugins/catalog-backend-module-gerrit/src/alpha.ts
index c277a0a680..01a9b25f7c 100644
--- a/plugins/catalog-backend-module-gerrit/src/alpha.ts
+++ b/plugins/catalog-backend-module-gerrit/src/alpha.ts
@@ -15,3 +15,4 @@
  */
 
 export * from './module';
+export { default } from './module';
diff --git a/plugins/catalog-backend-module-gerrit/src/module/catalogModuleGerritEntityProvider.test.ts b/plugins/catalog-backend-module-gerrit/src/module/catalogModuleGerritEntityProvider.test.ts
index 464837124f..4afcd8e2d4 100644
--- a/plugins/catalog-backend-module-gerrit/src/module/catalogModuleGerritEntityProvider.test.ts
+++ b/plugins/catalog-backend-module-gerrit/src/module/catalogModuleGerritEntityProvider.test.ts
@@ -14,14 +14,8 @@
  * limitations under the License.
  */
 
-import { getVoidLogger } 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 { ConfigReader } from '@backstage/config';
+import { TaskScheduleDefinition } from '@backstage/backend-tasks';
+import { mockServices, startTestBackend } from '@backstage/backend-test-utils';
 import { catalogProcessingExtensionPoint } from '@backstage/plugin-catalog-node/alpha';
 import { Duration } from 'luxon';
 import { catalogModuleGerritEntityProvider } from './catalogModuleGerritEntityProvider';
@@ -38,14 +32,14 @@ describe('catalogModuleGerritEntityProvider', () => {
       },
     };
     const runner = jest.fn();
-    const scheduler = {
-      createScheduledTaskRunner: (schedule: TaskScheduleDefinition) => {
+    const scheduler = mockServices.scheduler.mock({
+      createScheduledTaskRunner(schedule) {
         usedSchedule = schedule;
-        return runner;
+        return { run: runner };
       },
-    } as unknown as PluginTaskScheduler;
+    });
 
-    const config = new ConfigReader({
+    const config = {
       catalog: {
         providers: {
           gerrit: {
@@ -70,16 +64,16 @@ describe('catalogModuleGerritEntityProvider', () => {
           },
         ],
       },
-    });
+    };
 
     await startTestBackend({
       extensionPoints: [[catalogProcessingExtensionPoint, extensionPoint]],
-      services: [
-        [coreServices.rootConfig, config],
-        [coreServices.logger, getVoidLogger()],
-        [coreServices.scheduler, scheduler],
+      features: [
+        catalogModuleGerritEntityProvider(),
+        mockServices.rootConfig.factory({ data: config }),
+        mockServices.logger.factory(),
+        scheduler.factory,
       ],
-      features: [catalogModuleGerritEntityProvider()],
     });
 
     expect(usedSchedule?.frequency).toEqual(Duration.fromISO('P1M'));
diff --git a/plugins/catalog-backend-module-gerrit/src/module/index.ts b/plugins/catalog-backend-module-gerrit/src/module/index.ts
index 95760538e7..10dd6b4475 100644
--- a/plugins/catalog-backend-module-gerrit/src/module/index.ts
+++ b/plugins/catalog-backend-module-gerrit/src/module/index.ts
@@ -14,4 +14,4 @@
  * limitations under the License.
  */
 
-export { catalogModuleGerritEntityProvider } from './catalogModuleGerritEntityProvider';
+export { catalogModuleGerritEntityProvider as default } from './catalogModuleGerritEntityProvider';
diff --git a/plugins/catalog-backend-module-github/CHANGELOG.md b/plugins/catalog-backend-module-github/CHANGELOG.md
index af93dd5419..766f129b57 100644
--- a/plugins/catalog-backend-module-github/CHANGELOG.md
+++ b/plugins/catalog-backend-module-github/CHANGELOG.md
@@ -1,5 +1,98 @@
 # @backstage/plugin-catalog-backend-module-github
 
+## 0.3.8-next.2
+
+### Patch Changes
+
+- 96353bb7cb4a: Properly support custom `userTransformer` returning `undefined` in `GithubMultiOrgEntityProvider`
+- Updated dependencies
+  - @backstage/plugin-catalog-backend@1.13.0-next.2
+  - @backstage/config@1.1.0-next.1
+  - @backstage/backend-tasks@0.5.8-next.2
+  - @backstage/backend-common@0.19.5-next.2
+  - @backstage/plugin-catalog-node@1.4.4-next.2
+  - @backstage/integration@1.7.0-next.2
+  - @backstage/backend-plugin-api@0.6.3-next.2
+  - @backstage/catalog-model@1.4.2-next.1
+  - @backstage/catalog-client@1.4.4-next.1
+  - @backstage/errors@1.2.1
+  - @backstage/types@1.1.0
+  - @backstage/plugin-catalog-common@1.0.16-next.1
+  - @backstage/plugin-events-node@0.2.12-next.2
+
+## 0.3.8-next.1
+
+### Patch Changes
+
+- 3c44761b9191: Allow github user and team transforms to return any Entity
+- Updated dependencies
+  - @backstage/plugin-catalog-backend@1.13.0-next.1
+  - @backstage/config@1.1.0-next.0
+  - @backstage/integration@1.7.0-next.1
+  - @backstage/backend-tasks@0.5.8-next.1
+  - @backstage/backend-common@0.19.5-next.1
+  - @backstage/backend-plugin-api@0.6.3-next.1
+  - @backstage/catalog-model@1.4.2-next.0
+  - @backstage/plugin-catalog-node@1.4.4-next.1
+  - @backstage/plugin-events-node@0.2.12-next.1
+  - @backstage/catalog-client@1.4.4-next.0
+  - @backstage/plugin-catalog-common@1.0.16-next.0
+  - @backstage/errors@1.2.1
+  - @backstage/types@1.1.0
+
+## 0.3.5-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-backend@1.12.2-next.0
+  - @backstage/backend-common@0.19.4-next.0
+  - @backstage/integration@1.7.0-next.0
+  - @backstage/backend-tasks@0.5.7-next.0
+  - @backstage/backend-plugin-api@0.6.2-next.0
+  - @backstage/catalog-client@1.4.3
+  - @backstage/catalog-model@1.4.1
+  - @backstage/config@1.0.8
+  - @backstage/errors@1.2.1
+  - @backstage/types@1.1.0
+  - @backstage/plugin-catalog-common@1.0.15
+  - @backstage/plugin-catalog-node@1.4.3-next.0
+  - @backstage/plugin-events-node@0.2.11-next.0
+
+## 0.3.3
+
+### Patch Changes
+
+- 629cbd194a87: Use `coreServices.rootConfig` instead of `coreService.config`
+- 4b82382ed8c2: Fixed invalid configuration schema. The configuration schema may be more strict as a result.
+- 81c231c9c9ee: Fixed a bug where the visibility filter was case sensitive and casting was inconsistent.
+- Updated dependencies
+  - @backstage/backend-common@0.19.2
+  - @backstage/plugin-catalog-backend@1.12.0
+  - @backstage/backend-plugin-api@0.6.0
+  - @backstage/plugin-catalog-node@1.4.1
+  - @backstage/plugin-events-node@0.2.9
+  - @backstage/integration@1.6.0
+  - @backstage/backend-tasks@0.5.5
+  - @backstage/catalog-client@1.4.3
+  - @backstage/catalog-model@1.4.1
+  - @backstage/config@1.0.8
+  - @backstage/errors@1.2.1
+  - @backstage/types@1.1.0
+  - @backstage/plugin-catalog-common@1.0.15
+
+## 0.3.3-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-backend@1.12.0-next.2
+  - @backstage/backend-plugin-api@0.6.0-next.2
+  - @backstage/backend-tasks@0.5.5-next.2
+  - @backstage/backend-common@0.19.2-next.2
+  - @backstage/plugin-catalog-node@1.4.1-next.2
+  - @backstage/plugin-events-node@0.2.9-next.2
+
 ## 0.3.3-next.1
 
 ### Patch Changes
diff --git a/plugins/catalog-backend-module-github/alpha-api-report.md b/plugins/catalog-backend-module-github/alpha-api-report.md
index 0d4e16b4ea..3bf72c449b 100644
--- a/plugins/catalog-backend-module-github/alpha-api-report.md
+++ b/plugins/catalog-backend-module-github/alpha-api-report.md
@@ -4,9 +4,25 @@
 
 ```ts
 import { BackendFeature } from '@backstage/backend-plugin-api';
+import { ExtensionPoint } from '@backstage/backend-plugin-api';
+import { TeamTransformer } from '@backstage/plugin-catalog-backend-module-github';
+import { UserTransformer } from '@backstage/plugin-catalog-backend-module-github';
 
 // @alpha
-export const catalogModuleGithubEntityProvider: () => BackendFeature;
+const catalogModuleGithubEntityProvider: () => BackendFeature;
+export default catalogModuleGithubEntityProvider;
+
+// @alpha
+export const catalogModuleGithubOrgEntityProvider: () => BackendFeature;
+
+// @alpha
+export interface GithubOrgEntityProviderTransformsExtensionPoint {
+  setTeamTransformer(transformer: TeamTransformer): void;
+  setUserTransformer(transformer: UserTransformer): void;
+}
+
+// @alpha
+export const githubOrgEntityProviderTransformsExtensionPoint: ExtensionPoint<GithubOrgEntityProviderTransformsExtensionPoint>;
 
 // (No @packageDocumentation comment for this package)
 ```
diff --git a/plugins/catalog-backend-module-github/api-report.md b/plugins/catalog-backend-module-github/api-report.md
index 7b944b33a9..12ab6d35e7 100644
--- a/plugins/catalog-backend-module-github/api-report.md
+++ b/plugins/catalog-backend-module-github/api-report.md
@@ -16,7 +16,6 @@ import { EventSubscriber } from '@backstage/plugin-events-node';
 import { GithubCredentialsProvider } from '@backstage/integration';
 import { GithubIntegrationConfig } from '@backstage/integration';
 import { graphql } from '@octokit/graphql';
-import { GroupEntity } from '@backstage/catalog-model';
 import { LocationSpec } from '@backstage/plugin-catalog-node';
 import { Logger } from 'winston';
 import { PluginEndpointDiscovery } from '@backstage/backend-common';
@@ -25,7 +24,6 @@ import { ScmIntegrationRegistry } from '@backstage/integration';
 import { ScmLocationAnalyzer } from '@backstage/plugin-catalog-backend';
 import { TaskRunner } from '@backstage/backend-tasks';
 import { TokenManager } from '@backstage/backend-common';
-import { UserEntity } from '@backstage/catalog-model';
 
 // @public
 export const defaultOrganizationTeamTransformer: TeamTransformer;
@@ -303,7 +301,7 @@ export type GithubUser = {
 export type TeamTransformer = (
   item: GithubTeam,
   ctx: TransformerContext,
-) => Promise<GroupEntity | undefined>;
+) => Promise<Entity | undefined>;
 
 // @public
 export interface TransformerContext {
@@ -319,5 +317,5 @@ export interface TransformerContext {
 export type UserTransformer = (
   item: GithubUser,
   ctx: TransformerContext,
-) => Promise<UserEntity | undefined>;
+) => Promise<Entity | undefined>;
 ```
diff --git a/plugins/catalog-backend-module-github/catalog-info.yaml b/plugins/catalog-backend-module-github/catalog-info.yaml
new file mode 100644
index 0000000000..2b1b9a9553
--- /dev/null
+++ b/plugins/catalog-backend-module-github/catalog-info.yaml
@@ -0,0 +1,10 @@
+apiVersion: backstage.io/v1alpha1
+kind: Component
+metadata:
+  name: backstage-plugin-catalog-backend-module-github
+  title: '@backstage/plugin-catalog-backend-module-github'
+  description: A Backstage catalog backend module that helps integrate towards GitHub
+spec:
+  lifecycle: experimental
+  type: backstage-backend-plugin-module
+  owner: catalog-maintainers
diff --git a/plugins/catalog-backend-module-github/config.d.ts b/plugins/catalog-backend-module-github/config.d.ts
index 9755504ee2..ad4d2d6ec5 100644
--- a/plugins/catalog-backend-module-github/config.d.ts
+++ b/plugins/catalog-backend-module-github/config.d.ts
@@ -183,6 +183,69 @@ export interface Config {
               schedule?: TaskScheduleDefinitionConfig;
             };
           };
+
+      /**
+       * Configuration for catalogModuleGithubOrgEntityProvider
+       */
+      githubOrg?:
+        | {
+            /**
+             * A stable id for this provider. Entities from this provider will
+             * be associated with this ID, so you should take care not to change
+             * it over time since that may lead to orphaned entities and/or
+             * conflicts.
+             *
+             * @example "ghe"
+             */
+            id: string;
+
+            /**
+             * The target that this provider should consume.
+             *
+             * @example "https://mycompany.github.com"
+             */
+            githubUrl: string;
+
+            /**
+             * The list of the GitHub orgs to consume. By default will consume all accessible
+             * orgs on the given GitHub instance (support for GitHub App integration only).
+             */
+            orgs?: string[];
+
+            /**
+             * The refresh schedule to use.
+             */
+            schedule: TaskScheduleDefinitionConfig;
+          }
+        | Array<{
+            /**
+             * A stable id for this provider. Entities from this provider will
+             * be associated with this ID, so you should take care not to change
+             * it over time since that may lead to orphaned entities and/or
+             * conflicts.
+             *
+             * @example "ghe"
+             */
+            id: string;
+
+            /**
+             * The target that this provider should consume.
+             *
+             * @example "https://mycompany.github.com"
+             */
+            githubUrl: string;
+
+            /**
+             * The list of the GitHub orgs to consume. By default will consume all accessible
+             * orgs on the given GitHub instance (support for GitHub App integration only).
+             */
+            orgs?: string[];
+
+            /**
+             * The refresh schedule to use.
+             */
+            schedule: TaskScheduleDefinitionConfig;
+          }>;
     };
   };
 }
diff --git a/plugins/catalog-backend-module-github/package.json b/plugins/catalog-backend-module-github/package.json
index b05630862c..cfab77b141 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.3.3-next.1",
+  "version": "0.3.8-next.2",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
diff --git a/plugins/catalog-backend-module-github/src/alpha.ts b/plugins/catalog-backend-module-github/src/alpha.ts
index c277a0a680..01a9b25f7c 100644
--- a/plugins/catalog-backend-module-github/src/alpha.ts
+++ b/plugins/catalog-backend-module-github/src/alpha.ts
@@ -15,3 +15,4 @@
  */
 
 export * from './module';
+export { default } from './module';
diff --git a/plugins/catalog-backend-module-github/src/lib/defaultTransformers.ts b/plugins/catalog-backend-module-github/src/lib/defaultTransformers.ts
index 7669fd5b47..71613d88d2 100644
--- a/plugins/catalog-backend-module-github/src/lib/defaultTransformers.ts
+++ b/plugins/catalog-backend-module-github/src/lib/defaultTransformers.ts
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-import { GroupEntity, UserEntity } from '@backstage/catalog-model';
+import { Entity, GroupEntity, UserEntity } from '@backstage/catalog-model';
 import { graphql } from '@octokit/graphql';
 import {
   ANNOTATION_GITHUB_TEAM_SLUG,
@@ -34,24 +34,24 @@ export interface TransformerContext {
 }
 
 /**
- * Transformer for GitHub users to UserEntity
+ * Transformer for GitHub users to an Entity
  *
  * @public
  */
 export type UserTransformer = (
   item: GithubUser,
   ctx: TransformerContext,
-) => Promise<UserEntity | undefined>;
+) => Promise<Entity | undefined>;
 
 /**
- * Transformer for GitHub Team to GroupEntity
+ * Transformer for GitHub Team to an Entity
  *
  * @public
  */
 export type TeamTransformer = (
   item: GithubTeam,
   ctx: TransformerContext,
-) => Promise<GroupEntity | undefined>;
+) => Promise<Entity | undefined>;
 
 /**
  * Default transformer for GitHub users to UserEntity
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 7a0a29e098..d83e8031cc 100644
--- a/plugins/catalog-backend-module-github/src/lib/github.test.ts
+++ b/plugins/catalog-backend-module-github/src/lib/github.test.ts
@@ -229,7 +229,7 @@ describe('github', () => {
 
     it('reads teams', async () => {
       const output = {
-        groups: [
+        teams: [
           expect.objectContaining({
             metadata: expect.objectContaining({
               name: 'team',
@@ -329,7 +329,7 @@ describe('github', () => {
 
     it('reads teams', async () => {
       const output = {
-        groups: [
+        teams: [
           expect.objectContaining({
             metadata: expect.objectContaining({
               name: 'Team-custom',
@@ -409,7 +409,7 @@ describe('github', () => {
       };
 
       const output = {
-        groups: [
+        teams: [
           expect.objectContaining({
             metadata: expect.objectContaining({
               name: 'Team-custom',
@@ -444,7 +444,7 @@ describe('github', () => {
         customTeamTransformer,
       );
 
-      expect(teams.groups).toHaveLength(1);
+      expect(teams.teams).toHaveLength(1);
       expect(teams).toEqual(output);
     });
   });
diff --git a/plugins/catalog-backend-module-github/src/lib/github.ts b/plugins/catalog-backend-module-github/src/lib/github.ts
index 412b751c38..6b490f363a 100644
--- a/plugins/catalog-backend-module-github/src/lib/github.ts
+++ b/plugins/catalog-backend-module-github/src/lib/github.ts
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-import { Entity, GroupEntity, UserEntity } from '@backstage/catalog-model';
+import { Entity } from '@backstage/catalog-model';
 import { GithubCredentialType } from '@backstage/integration';
 import { graphql } from '@octokit/graphql';
 import {
@@ -139,7 +139,7 @@ export async function getOrganizationUsers(
   org: string,
   tokenType: GithubCredentialType,
   userTransformer: UserTransformer = defaultUserTransformer,
-): Promise<{ users: UserEntity[] }> {
+): Promise<{ users: Entity[] }> {
   const query = `
     query users($org: String!, $email: Boolean!, $cursor: String) {
       organization(login: $org) {
@@ -188,7 +188,7 @@ export async function getOrganizationTeams(
   org: string,
   teamTransformer: TeamTransformer = defaultOrganizationTeamTransformer,
 ): Promise<{
-  groups: GroupEntity[];
+  teams: Entity[];
 }> {
   const query = `
     query teams($org: String!, $cursor: String) {
@@ -222,7 +222,7 @@ export async function getOrganizationTeams(
   const materialisedTeams = async (
     item: GithubTeamResponse,
     ctx: TransformerContext,
-  ): Promise<GroupEntity | undefined> => {
+  ): Promise<Entity | undefined> => {
     const memberNames: GithubUser[] = [];
 
     if (!item.members.pageInfo.hasNextPage) {
@@ -247,7 +247,7 @@ export async function getOrganizationTeams(
     return await teamTransformer(team, ctx);
   };
 
-  const groups = await queryWithPaging(
+  const teams = await queryWithPaging(
     client,
     query,
     org,
@@ -256,7 +256,7 @@ export async function getOrganizationTeams(
     { org },
   );
 
-  return { groups };
+  return { teams };
 }
 
 export async function getOrganizationTeamsFromUsers(
@@ -265,7 +265,7 @@ export async function getOrganizationTeamsFromUsers(
   userLogins: string[],
   teamTransformer: TeamTransformer = defaultOrganizationTeamTransformer,
 ): Promise<{
-  groups: GroupEntity[];
+  teams: Entity[];
 }> {
   const query = `
    query teams($org: String!, $cursor: String, $userLogins: [String!] = "") {
@@ -306,7 +306,7 @@ export async function getOrganizationTeamsFromUsers(
   const materialisedTeams = async (
     item: GithubTeamResponse,
     ctx: TransformerContext,
-  ): Promise<GroupEntity | undefined> => {
+  ): Promise<Entity | undefined> => {
     const memberNames: GithubUser[] = [];
 
     if (!item.members.pageInfo.hasNextPage) {
@@ -331,7 +331,7 @@ export async function getOrganizationTeamsFromUsers(
     return await teamTransformer(team, ctx);
   };
 
-  const groups = await queryWithPaging(
+  const teams = await queryWithPaging(
     client,
     query,
     org,
@@ -340,7 +340,7 @@ export async function getOrganizationTeamsFromUsers(
     { org, userLogins },
   );
 
-  return { groups };
+  return { teams };
 }
 
 export async function getOrganizationsFromUser(
@@ -377,7 +377,7 @@ export async function getOrganizationTeam(
   teamSlug: string,
   teamTransformer: TeamTransformer = defaultOrganizationTeamTransformer,
 ): Promise<{
-  group: GroupEntity;
+  team: Entity;
 }> {
   const query = `
   query teams($org: String!, $teamSlug: String!) {
@@ -401,7 +401,7 @@ export async function getOrganizationTeam(
   const materialisedTeam = async (
     item: GithubTeamResponse,
     ctx: TransformerContext,
-  ): Promise<GroupEntity | undefined> => {
+  ): Promise<Entity | undefined> => {
     const memberNames: GithubUser[] = [];
 
     if (!item.members.pageInfo.hasNextPage) {
@@ -432,17 +432,17 @@ export async function getOrganizationTeam(
   });
 
   if (!response.organization?.team)
-    throw new Error(`Found no match for group ${teamSlug}`);
+    throw new Error(`Found no match for team ${teamSlug}`);
 
-  const group = await materialisedTeam(response.organization?.team, {
+  const team = await materialisedTeam(response.organization?.team, {
     query,
     client,
     org,
   });
 
-  if (!group) throw new Error(`Can't transform for group ${teamSlug}`);
+  if (!team) throw new Error(`Can't transform for team ${teamSlug}`);
 
-  return { group };
+  return { team };
 }
 
 export async function getOrganizationRepositories(
diff --git a/plugins/catalog-backend-module-github/src/lib/guards.ts b/plugins/catalog-backend-module-github/src/lib/guards.ts
new file mode 100644
index 0000000000..f092d2365a
--- /dev/null
+++ b/plugins/catalog-backend-module-github/src/lib/guards.ts
@@ -0,0 +1,32 @@
+/*
+ * 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,
+  GroupEntity,
+  UserEntity,
+  isGroupEntity,
+  isUserEntity,
+} from '@backstage/catalog-model';
+
+export function areGroupEntities(
+  entities: Entity[],
+): entities is GroupEntity[] {
+  return entities.every(e => isGroupEntity(e));
+}
+
+export function areUserEntities(entities: Entity[]): entities is UserEntity[] {
+  return entities.every(e => isUserEntity(e));
+}
diff --git a/plugins/catalog-backend-module-github/src/lib/util.ts b/plugins/catalog-backend-module-github/src/lib/util.ts
index bb91e9dd2a..58ae8d6551 100644
--- a/plugins/catalog-backend-module-github/src/lib/util.ts
+++ b/plugins/catalog-backend-module-github/src/lib/util.ts
@@ -107,5 +107,10 @@ export function satisfiesVisibilityFilter(
   if (!visibilities.length) {
     return true;
   }
-  return visibilities.includes(visibility);
+  const lowerCaseVisibilities = visibilities.map(v =>
+    v.toLocaleLowerCase('en-US'),
+  );
+  const lowerCaseVisibility = visibility.toLocaleLowerCase('en-US');
+
+  return lowerCaseVisibilities.includes(lowerCaseVisibility);
 }
diff --git a/plugins/catalog-backend-module-github/src/module/catalogModuleGithubEntityProvider.test.ts b/plugins/catalog-backend-module-github/src/module/catalogModuleGithubEntityProvider.test.ts
index ca82e58e26..cb38be1a5d 100644
--- a/plugins/catalog-backend-module-github/src/module/catalogModuleGithubEntityProvider.test.ts
+++ b/plugins/catalog-backend-module-github/src/module/catalogModuleGithubEntityProvider.test.ts
@@ -14,22 +14,16 @@
  * limitations under the License.
  */
 
-import { getVoidLogger } 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 { ConfigReader } from '@backstage/config';
+import { TaskScheduleDefinition } from '@backstage/backend-tasks';
+import { mockServices, startTestBackend } from '@backstage/backend-test-utils';
+import { EntityProvider } from '@backstage/plugin-catalog-node';
 import { catalogProcessingExtensionPoint } from '@backstage/plugin-catalog-node/alpha';
 import { Duration } from 'luxon';
 import { catalogModuleGithubEntityProvider } from './catalogModuleGithubEntityProvider';
-import { GithubEntityProvider } from '../providers/GithubEntityProvider';
 
 describe('catalogModuleGithubEntityProvider', () => {
   it('should register provider at the catalog extension point', async () => {
-    let addedProviders: Array<GithubEntityProvider> | undefined;
+    let addedProviders: Array<EntityProvider> | undefined;
     let usedSchedule: TaskScheduleDefinition | undefined;
 
     const extensionPoint = {
@@ -38,14 +32,14 @@ describe('catalogModuleGithubEntityProvider', () => {
       },
     };
     const runner = jest.fn();
-    const scheduler = {
-      createScheduledTaskRunner: (schedule: TaskScheduleDefinition) => {
+    const scheduler = mockServices.scheduler.mock({
+      createScheduledTaskRunner(schedule) {
         usedSchedule = schedule;
-        return runner;
+        return { run: runner };
       },
-    } as unknown as PluginTaskScheduler;
+    });
 
-    const config = new ConfigReader({
+    const config = {
       catalog: {
         providers: {
           github: {
@@ -57,16 +51,15 @@ describe('catalogModuleGithubEntityProvider', () => {
           },
         },
       },
-    });
+    };
 
     await startTestBackend({
       extensionPoints: [[catalogProcessingExtensionPoint, extensionPoint]],
-      services: [
-        [coreServices.rootConfig, config],
-        [coreServices.logger, getVoidLogger()],
-        [coreServices.scheduler, scheduler],
+      features: [
+        catalogModuleGithubEntityProvider(),
+        mockServices.rootConfig.factory({ data: config }),
+        scheduler.factory,
       ],
-      features: [catalogModuleGithubEntityProvider()],
     });
 
     expect(usedSchedule?.frequency).toEqual(Duration.fromISO('P1M'));
diff --git a/plugins/catalog-backend-module-github/src/module/catalogModuleGithubOrgEntityProvider.test.ts b/plugins/catalog-backend-module-github/src/module/catalogModuleGithubOrgEntityProvider.test.ts
new file mode 100644
index 0000000000..1b8b115a96
--- /dev/null
+++ b/plugins/catalog-backend-module-github/src/module/catalogModuleGithubOrgEntityProvider.test.ts
@@ -0,0 +1,77 @@
+/*
+ * 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 { TaskScheduleDefinition } from '@backstage/backend-tasks';
+import { mockServices, startTestBackend } from '@backstage/backend-test-utils';
+import { EntityProvider } from '@backstage/plugin-catalog-node';
+import { catalogProcessingExtensionPoint } from '@backstage/plugin-catalog-node/alpha';
+import { Duration } from 'luxon';
+import { catalogModuleGithubOrgEntityProvider } from './catalogModuleGithubOrgEntityProvider';
+
+describe('catalogModuleGithubOrgEntityProvider', () => {
+  it('should register provider at the catalog extension point', async () => {
+    let addedProviders: Array<EntityProvider> | undefined;
+    let usedSchedule: TaskScheduleDefinition | undefined;
+
+    const extensionPoint = {
+      addEntityProvider: (...providers: any) => {
+        addedProviders = providers;
+      },
+    };
+    const runner = jest.fn();
+    const scheduler = mockServices.scheduler.mock({
+      createScheduledTaskRunner(schedule) {
+        usedSchedule = schedule;
+        return { run: runner };
+      },
+    });
+
+    const config = {
+      catalog: {
+        providers: {
+          githubOrg: [
+            {
+              id: 'default',
+              githubUrl: 'https://github.com',
+              orgs: ['backstage'],
+              schedule: {
+                frequency: 'P1M',
+                timeout: 'PT3M',
+              },
+            },
+          ],
+        },
+      },
+    };
+
+    await startTestBackend({
+      extensionPoints: [[catalogProcessingExtensionPoint, extensionPoint]],
+      features: [
+        catalogModuleGithubOrgEntityProvider(),
+        mockServices.rootConfig.factory({ data: config }),
+        scheduler.factory,
+      ],
+    });
+
+    expect(usedSchedule?.frequency).toEqual(Duration.fromISO('P1M'));
+    expect(usedSchedule?.timeout).toEqual(Duration.fromISO('PT3M'));
+    expect(addedProviders?.length).toEqual(1);
+    expect(addedProviders![0].getProviderName()).toEqual(
+      'GithubMultiOrgEntityProvider:default',
+    );
+    expect(runner).not.toHaveBeenCalled();
+  });
+});
diff --git a/plugins/catalog-backend-module-github/src/module/catalogModuleGithubOrgEntityProvider.ts b/plugins/catalog-backend-module-github/src/module/catalogModuleGithubOrgEntityProvider.ts
new file mode 100644
index 0000000000..4838be54e1
--- /dev/null
+++ b/plugins/catalog-backend-module-github/src/module/catalogModuleGithubOrgEntityProvider.ts
@@ -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 { loggerToWinstonLogger } from '@backstage/backend-common';
+import {
+  coreServices,
+  createBackendModule,
+  createExtensionPoint,
+} from '@backstage/backend-plugin-api';
+import {
+  readTaskScheduleDefinitionFromConfig,
+  TaskScheduleDefinition,
+} from '@backstage/backend-tasks';
+import { Config } from '@backstage/config';
+import {
+  GithubMultiOrgEntityProvider,
+  TeamTransformer,
+  UserTransformer,
+} from '@backstage/plugin-catalog-backend-module-github';
+import { catalogProcessingExtensionPoint } from '@backstage/plugin-catalog-node/alpha';
+
+/**
+ * Interface for {@link githubOrgEntityProviderTransformsExtensionPoint}.
+ *
+ * @alpha
+ */
+export interface GithubOrgEntityProviderTransformsExtensionPoint {
+  /**
+   * Set a custom transformer for transforming from GitHub users to catalog
+   * entities.
+   */
+  setUserTransformer(transformer: UserTransformer): void;
+
+  /**
+   * Set a custom transformer for transforming from GitHub teams to catalog
+   * entities.
+   */
+  setTeamTransformer(transformer: TeamTransformer): void;
+}
+
+/**
+ * Extension point for runtime configuration of {@link catalogModuleGithubOrgEntityProvider}.
+ *
+ * @alpha
+ */
+export const githubOrgEntityProviderTransformsExtensionPoint =
+  createExtensionPoint<GithubOrgEntityProviderTransformsExtensionPoint>({
+    id: 'catalog.githubOrgEntityProvider',
+  });
+
+/**
+ * Registers the `GithubMultiOrgEntityProvider` with the catalog processing extension point.
+ *
+ * @alpha
+ */
+export const catalogModuleGithubOrgEntityProvider = createBackendModule({
+  pluginId: 'catalog',
+  moduleId: 'githubOrgEntityProvider',
+  register(env) {
+    let userTransformer: UserTransformer | undefined;
+    let teamTransformer: TeamTransformer | undefined;
+
+    env.registerExtensionPoint(
+      githubOrgEntityProviderTransformsExtensionPoint,
+      {
+        setUserTransformer(transformer) {
+          if (userTransformer) {
+            throw new Error('User transformer may only be set once');
+          }
+          userTransformer = transformer;
+        },
+        setTeamTransformer(transformer) {
+          if (teamTransformer) {
+            throw new Error('Team transformer may only be set once');
+          }
+          teamTransformer = transformer;
+        },
+      },
+    );
+
+    env.registerInit({
+      deps: {
+        catalog: catalogProcessingExtensionPoint,
+        config: coreServices.rootConfig,
+        logger: coreServices.logger,
+        scheduler: coreServices.scheduler,
+      },
+      async init({ catalog, config, logger, scheduler }) {
+        for (const definition of readDefinitionsFromConfig(config)) {
+          catalog.addEntityProvider(
+            GithubMultiOrgEntityProvider.fromConfig(config, {
+              id: definition.id,
+              githubUrl: definition.githubUrl,
+              orgs: definition.orgs,
+              schedule: scheduler.createScheduledTaskRunner(
+                definition.schedule,
+              ),
+              logger: loggerToWinstonLogger(logger),
+              userTransformer,
+              teamTransformer,
+            }),
+          );
+        }
+      },
+    });
+  },
+});
+
+function readDefinitionsFromConfig(rootConfig: Config): Array<{
+  id: string;
+  githubUrl: string;
+  orgs?: string[];
+  schedule: TaskScheduleDefinition;
+}> {
+  const baseKey = 'catalog.providers.githubOrg';
+  const baseConfig = rootConfig.getOptional(baseKey);
+  if (!baseConfig) {
+    return [];
+  }
+
+  const configs = Array.isArray(baseConfig)
+    ? rootConfig.getConfigArray(baseKey)
+    : [rootConfig.getConfig(baseKey)];
+
+  return configs.map(c => ({
+    id: c.getString('id'),
+    githubUrl: c.getString('githubUrl'),
+    orgs: c.getOptionalStringArray('orgs'),
+    schedule: readTaskScheduleDefinitionFromConfig(c.getConfig('schedule')),
+  }));
+}
diff --git a/plugins/catalog-backend-module-github/src/module/index.ts b/plugins/catalog-backend-module-github/src/module/index.ts
index 640a633093..7e8a214ca3 100644
--- a/plugins/catalog-backend-module-github/src/module/index.ts
+++ b/plugins/catalog-backend-module-github/src/module/index.ts
@@ -14,4 +14,9 @@
  * limitations under the License.
  */
 
-export { catalogModuleGithubEntityProvider } from './catalogModuleGithubEntityProvider';
+export { catalogModuleGithubEntityProvider as default } from './catalogModuleGithubEntityProvider';
+export {
+  catalogModuleGithubOrgEntityProvider,
+  githubOrgEntityProviderTransformsExtensionPoint,
+  type GithubOrgEntityProviderTransformsExtensionPoint,
+} from './catalogModuleGithubOrgEntityProvider';
diff --git a/plugins/catalog-backend-module-github/src/processors/GithubMultiOrgReaderProcessor.ts b/plugins/catalog-backend-module-github/src/processors/GithubMultiOrgReaderProcessor.ts
index cf5e484fc2..8bfbd20e2e 100644
--- a/plugins/catalog-backend-module-github/src/processors/GithubMultiOrgReaderProcessor.ts
+++ b/plugins/catalog-backend-module-github/src/processors/GithubMultiOrgReaderProcessor.ts
@@ -16,9 +16,9 @@
 
 import {
   DEFAULT_NAMESPACE,
-  GroupEntity,
+  Entity,
+  isGroupEntity,
   stringifyEntityRef,
-  UserEntity,
 } from '@backstage/catalog-model';
 import { Config } from '@backstage/config';
 import {
@@ -49,6 +49,7 @@ import {
   TeamTransformer,
   UserTransformer,
 } from '../lib';
+import { areGroupEntities, areUserEntities } from '../lib/guards';
 
 /**
  * Extracts teams and users out of a multiple GitHub orgs namespaced per org.
@@ -147,7 +148,7 @@ export class GithubMultiOrgReaderProcessor implements CatalogProcessor {
           client,
           orgConfig.name,
           tokenType,
-          async (githubUser, ctx): Promise<UserEntity | undefined> => {
+          async (githubUser, ctx): Promise<Entity | undefined> => {
             const result = this.options.userTransformer
               ? await this.options.userTransformer(githubUser, ctx)
               : await defaultUserTransformer(githubUser, ctx);
@@ -160,15 +161,15 @@ export class GithubMultiOrgReaderProcessor implements CatalogProcessor {
           },
         );
 
-        const { groups } = await getOrganizationTeams(
+        const { teams } = await getOrganizationTeams(
           client,
           orgConfig.name,
-          async (team, ctx): Promise<GroupEntity | undefined> => {
+          async (team, ctx): Promise<Entity | undefined> => {
             const result = this.options.teamTransformer
               ? await this.options.teamTransformer(team, ctx)
               : await defaultOrganizationTeamTransformer(team, ctx);
 
-            if (result) {
+            if (result && isGroupEntity(result)) {
               result.metadata.namespace = orgConfig.groupNamespace;
               // Group `spec.members` inherits the namespace of it's group so need to explicitly specify refs here
               result.spec.members = team.members.map(
@@ -185,7 +186,7 @@ export class GithubMultiOrgReaderProcessor implements CatalogProcessor {
 
         const duration = ((Date.now() - startTimestamp) / 1000).toFixed(1);
         this.logger.debug(
-          `Read ${users.length} GitHub users and ${groups.length} GitHub teams from ${orgConfig.name} in ${duration} seconds`,
+          `Read ${users.length} GitHub users and ${teams.length} GitHub teams from ${orgConfig.name} in ${duration} seconds`,
         );
 
         // Grab current users from `allUsersMap` if they already exist in our
@@ -199,11 +200,15 @@ export class GithubMultiOrgReaderProcessor implements CatalogProcessor {
           return allUsersMap.get(userRef);
         });
 
-        assignGroupsToUsers(pendingUsers, groups);
-        buildOrgHierarchy(groups);
+        if (areGroupEntities(teams)) {
+          buildOrgHierarchy(teams);
+          if (areUserEntities(pendingUsers)) {
+            assignGroupsToUsers(pendingUsers, teams);
+          }
+        }
 
-        for (const group of groups) {
-          emit(processingResult.entity(location, group));
+        for (const team of teams) {
+          emit(processingResult.entity(location, team));
         }
       } catch (e) {
         this.logger.error(
diff --git a/plugins/catalog-backend-module-github/src/processors/GithubOrgReaderProcessor.ts b/plugins/catalog-backend-module-github/src/processors/GithubOrgReaderProcessor.ts
index 654deb3079..63a273378b 100644
--- a/plugins/catalog-backend-module-github/src/processors/GithubOrgReaderProcessor.ts
+++ b/plugins/catalog-backend-module-github/src/processors/GithubOrgReaderProcessor.ts
@@ -37,6 +37,7 @@ import {
   getOrganizationUsers,
   parseGithubOrgUrl,
 } from '../lib';
+import { areGroupEntities, areUserEntities } from '../lib/guards';
 
 type GraphQL = typeof graphql;
 
@@ -101,19 +102,23 @@ export class GithubOrgReaderProcessor implements CatalogProcessor {
     this.logger.info('Reading GitHub users and groups');
 
     const { users } = await getOrganizationUsers(client, org, tokenType);
-    const { groups } = await getOrganizationTeams(client, org);
+    const { teams } = await getOrganizationTeams(client, org);
 
     const duration = ((Date.now() - startTimestamp) / 1000).toFixed(1);
     this.logger.debug(
-      `Read ${users.length} GitHub users and ${groups.length} GitHub groups in ${duration} seconds`,
+      `Read ${users.length} GitHub users and ${teams.length} GitHub teams in ${duration} seconds`,
     );
 
-    assignGroupsToUsers(users, groups);
-    buildOrgHierarchy(groups);
+    if (areGroupEntities(teams)) {
+      buildOrgHierarchy(teams);
+      if (areUserEntities(users)) {
+        assignGroupsToUsers(users, teams);
+      }
+    }
 
     // Done!
-    for (const group of groups) {
-      emit(processingResult.entity(location, group));
+    for (const team of teams) {
+      emit(processingResult.entity(location, team));
     }
     for (const user of users) {
       emit(processingResult.entity(location, user));
diff --git a/plugins/catalog-backend-module-github/src/providers/GithubMultiOrgEntityProvider.test.ts b/plugins/catalog-backend-module-github/src/providers/GithubMultiOrgEntityProvider.test.ts
index 2622b2483d..504e5772dd 100644
--- a/plugins/catalog-backend-module-github/src/providers/GithubMultiOrgEntityProvider.test.ts
+++ b/plugins/catalog-backend-module-github/src/providers/GithubMultiOrgEntityProvider.test.ts
@@ -1699,31 +1699,6 @@ describe('GithubMultiOrgEntityProvider', () => {
         expect(entityProviderConnection.applyMutation).toHaveBeenCalledWith({
           type: 'delta',
           added: [
-            {
-              entity: {
-                apiVersion: 'backstage.io/v1alpha1',
-                kind: 'User',
-                metadata: {
-                  annotations: {
-                    'backstage.io/managed-by-location':
-                      'url:https://github.com/a',
-                    'backstage.io/managed-by-origin-location':
-                      'url:https://github.com/a',
-                    'github.com/user-login': 'a',
-                  },
-                  name: 'a',
-                },
-                spec: {
-                  memberOf: ['orga/team', 'orgb/team'],
-                  profile: {
-                    displayName: 'a',
-                    email: 'user1@test.com',
-                    picture: 'https://avatars.githubusercontent.com/u/83820368',
-                  },
-                },
-              },
-              locationKey: 'github-multi-org-provider:my-id',
-            },
             {
               entity: {
                 apiVersion: 'backstage.io/v1alpha1',
@@ -1754,6 +1729,31 @@ describe('GithubMultiOrgEntityProvider', () => {
               },
               locationKey: 'github-multi-org-provider:my-id',
             },
+            {
+              entity: {
+                apiVersion: 'backstage.io/v1alpha1',
+                kind: 'User',
+                metadata: {
+                  annotations: {
+                    'backstage.io/managed-by-location':
+                      'url:https://github.com/a',
+                    'backstage.io/managed-by-origin-location':
+                      'url:https://github.com/a',
+                    'github.com/user-login': 'a',
+                  },
+                  name: 'a',
+                },
+                spec: {
+                  memberOf: ['orga/team', 'orgb/team'],
+                  profile: {
+                    displayName: 'a',
+                    email: 'user1@test.com',
+                    picture: 'https://avatars.githubusercontent.com/u/83820368',
+                  },
+                },
+              },
+              locationKey: 'github-multi-org-provider:my-id',
+            },
           ],
           removed: [],
         });
@@ -1871,31 +1871,6 @@ describe('GithubMultiOrgEntityProvider', () => {
         expect(entityProviderConnection.applyMutation).toHaveBeenCalledWith({
           type: 'delta',
           added: [
-            {
-              entity: {
-                apiVersion: 'backstage.io/v1alpha1',
-                kind: 'User',
-                metadata: {
-                  annotations: {
-                    'backstage.io/managed-by-location':
-                      'url:https://github.com/a',
-                    'backstage.io/managed-by-origin-location':
-                      'url:https://github.com/a',
-                    'github.com/user-login': 'a',
-                  },
-                  name: 'a',
-                },
-                spec: {
-                  memberOf: ['orgb/team'],
-                  profile: {
-                    displayName: 'a',
-                    email: 'user1@test.com',
-                    picture: 'https://avatars.githubusercontent.com/u/83820368',
-                  },
-                },
-              },
-              locationKey: 'github-multi-org-provider:my-id',
-            },
             {
               entity: {
                 apiVersion: 'backstage.io/v1alpha1',
@@ -1926,6 +1901,31 @@ describe('GithubMultiOrgEntityProvider', () => {
               },
               locationKey: 'github-multi-org-provider:my-id',
             },
+            {
+              entity: {
+                apiVersion: 'backstage.io/v1alpha1',
+                kind: 'User',
+                metadata: {
+                  annotations: {
+                    'backstage.io/managed-by-location':
+                      'url:https://github.com/a',
+                    'backstage.io/managed-by-origin-location':
+                      'url:https://github.com/a',
+                    'github.com/user-login': 'a',
+                  },
+                  name: 'a',
+                },
+                spec: {
+                  memberOf: ['orgb/team'],
+                  profile: {
+                    displayName: 'a',
+                    email: 'user1@test.com',
+                    picture: 'https://avatars.githubusercontent.com/u/83820368',
+                  },
+                },
+              },
+              locationKey: 'github-multi-org-provider:my-id',
+            },
           ],
           removed: [],
         });
diff --git a/plugins/catalog-backend-module-github/src/providers/GithubMultiOrgEntityProvider.ts b/plugins/catalog-backend-module-github/src/providers/GithubMultiOrgEntityProvider.ts
index 4d343493f6..7e15c4ce68 100644
--- a/plugins/catalog-backend-module-github/src/providers/GithubMultiOrgEntityProvider.ts
+++ b/plugins/catalog-backend-module-github/src/providers/GithubMultiOrgEntityProvider.ts
@@ -20,10 +20,10 @@ import {
   ANNOTATION_ORIGIN_LOCATION,
   DEFAULT_NAMESPACE,
   Entity,
-  GroupEntity,
+  isGroupEntity,
+  isUserEntity,
   parseEntityRef,
   stringifyEntityRef,
-  UserEntity,
 } from '@backstage/catalog-model';
 import { Config } from '@backstage/config';
 import {
@@ -78,6 +78,7 @@ import {
   getOrganizationTeamsFromUsers,
 } from '../lib/github';
 import { splitTeamSlug } from '../lib/util';
+import { areGroupEntities, areUserEntities } from '../lib/guards';
 
 /**
  * Options for {@link GithubMultiOrgEntityProvider}.
@@ -240,7 +241,7 @@ export class GithubMultiOrgEntityProvider implements EntityProvider {
     const { markReadComplete } = trackProgress(logger);
 
     const allUsersMap = new Map();
-    const allGroups: Entity[] = [];
+    const allTeams: Entity[] = [];
 
     const orgsToProcess = this.options.orgs?.length
       ? this.options.orgs
@@ -266,7 +267,7 @@ export class GithubMultiOrgEntityProvider implements EntityProvider {
           this.options.userTransformer,
         );
 
-        const { groups } = await getOrganizationTeams(
+        const { teams } = await getOrganizationTeams(
           client,
           org,
           this.defaultMultiOrgTeamTransformer.bind(this),
@@ -283,10 +284,14 @@ export class GithubMultiOrgEntityProvider implements EntityProvider {
           return allUsersMap.get(userRef);
         });
 
-        assignGroupsToUsers(pendingUsers, groups);
-        buildOrgHierarchy(groups);
+        if (areGroupEntities(teams)) {
+          buildOrgHierarchy(teams);
+          if (areUserEntities(pendingUsers)) {
+            assignGroupsToUsers(pendingUsers, teams);
+          }
+        }
 
-        allGroups.push(...groups);
+        allTeams.push(...teams);
       } catch (e) {
         logger.error(`Failed to read GitHub org data for ${org}: ${e}`);
       }
@@ -294,11 +299,11 @@ export class GithubMultiOrgEntityProvider implements EntityProvider {
 
     const allUsers = Array.from(allUsersMap.values());
 
-    const { markCommitComplete } = markReadComplete({ allUsers, allGroups });
+    const { markCommitComplete } = markReadComplete({ allUsers, allTeams });
 
     await this.connection.applyMutation({
       type: 'full',
-      entities: [...allUsers, ...allGroups].map(entity => ({
+      entities: [...allUsers, ...allTeams].map(entity => ({
         locationKey: `github-multi-org-provider:${this.options.id}`,
         entity: withLocations(
           `https://${this.options.gitHubConfig.host}`,
@@ -422,41 +427,45 @@ export class GithubMultiOrgEntityProvider implements EntityProvider {
       this.options.userTransformer,
     );
 
-    const { groups } = await getOrganizationTeams(
+    const { teams } = await getOrganizationTeams(
       client,
       org,
       this.defaultMultiOrgTeamTransformer.bind(this),
     );
 
-    // Fetch group memberships of users in case they already exist and
-    // have memberships in groups from other applicable orgs
-    for (const userOrg of applicableOrgs) {
-      const { headers: orgHeaders } =
-        await this.options.githubCredentialsProvider.getCredentials({
-          url: `${this.options.githubUrl}/${userOrg}`,
+    if (users.length) {
+      // Fetch group memberships of users in case they already exist and
+      // have memberships in groups from other applicable orgs
+      for (const userOrg of applicableOrgs) {
+        const { headers: orgHeaders } =
+          await this.options.githubCredentialsProvider.getCredentials({
+            url: `${this.options.githubUrl}/${userOrg}`,
+          });
+        const orgClient = graphql.defaults({
+          baseUrl: this.options.gitHubConfig.apiBaseUrl,
+          headers: orgHeaders,
         });
-      const orgClient = graphql.defaults({
-        baseUrl: this.options.gitHubConfig.apiBaseUrl,
-        headers: orgHeaders,
-      });
 
-      const { groups: userGroups } = await getOrganizationTeamsFromUsers(
-        orgClient,
-        userOrg,
-        users.map(
-          u =>
-            u.metadata.annotations?.[ANNOTATION_GITHUB_USER_LOGIN] ||
-            u.metadata.name,
-        ),
-        this.defaultMultiOrgTeamTransformer.bind(this),
-      );
+        const { teams: userTeams } = await getOrganizationTeamsFromUsers(
+          orgClient,
+          userOrg,
+          users.map(
+            u =>
+              u.metadata.annotations?.[ANNOTATION_GITHUB_USER_LOGIN] ||
+              u.metadata.name,
+          ),
+          this.defaultMultiOrgTeamTransformer.bind(this),
+        );
 
-      assignGroupsToUsers(users, userGroups);
+        if (areGroupEntities(userTeams) && areUserEntities(users)) {
+          assignGroupsToUsers(users, userTeams);
+        }
+      }
     }
 
     const { added, removed } = this.createAddEntitiesOperation([
       ...users,
-      ...groups,
+      ...teams,
     ]);
     await this.connection.applyMutation({
       type: 'delta',
@@ -511,7 +520,7 @@ export class GithubMultiOrgEntityProvider implements EntityProvider {
       updateMemberships = true;
     }
 
-    const user = (await userTransformer(
+    const user = await userTransformer(
       {
         name,
         avatarUrl,
@@ -523,7 +532,11 @@ export class GithubMultiOrgEntityProvider implements EntityProvider {
         client,
         query: '',
       },
-    )) as UserEntity;
+    );
+
+    if (!user) {
+      return;
+    }
 
     if (updateMemberships) {
       for (const userOrg of userApplicableOrgs) {
@@ -536,14 +549,16 @@ export class GithubMultiOrgEntityProvider implements EntityProvider {
           headers: orgHeaders,
         });
 
-        const { groups } = await getOrganizationTeamsFromUsers(
+        const { teams } = await getOrganizationTeamsFromUsers(
           orgClient,
           userOrg,
           [login],
           this.defaultMultiOrgTeamTransformer.bind(this),
         );
 
-        assignGroupsToUsers([user], groups);
+        if (isUserEntity(user) && areGroupEntities(teams)) {
+          assignGroupsToUsers([user], teams);
+        }
       }
     }
 
@@ -623,7 +638,7 @@ export class GithubMultiOrgEntityProvider implements EntityProvider {
     });
 
     const teamSlug = event.team.slug;
-    const { group } = await getOrganizationTeam(
+    const { team } = await getOrganizationTeam(
       client,
       org,
       teamSlug,
@@ -637,37 +652,42 @@ export class GithubMultiOrgEntityProvider implements EntityProvider {
       this.options.userTransformer,
     );
 
-    const usersFromChangedGroup =
-      group.spec.members?.map(m =>
-        stringifyEntityRef(parseEntityRef(m, { defaultKind: 'user' })),
-      ) || [];
+    const usersFromChangedGroup = isGroupEntity(team)
+      ? team.spec.members?.map(m =>
+          stringifyEntityRef(parseEntityRef(m, { defaultKind: 'user' })),
+        ) || []
+      : [];
     const usersToRebuild = users.filter(u =>
       usersFromChangedGroup.includes(stringifyEntityRef(u)),
     );
 
-    // Update memberships of associated members of this group in case the group entity ref changed
-    for (const userOrg of applicableOrgs) {
-      const { headers: orgHeaders } =
-        await this.options.githubCredentialsProvider.getCredentials({
-          url: `${this.options.githubUrl}/${userOrg}`,
+    if (usersToRebuild.length) {
+      // Update memberships of associated members of this group in case the group entity ref changed
+      for (const userOrg of applicableOrgs) {
+        const { headers: orgHeaders } =
+          await this.options.githubCredentialsProvider.getCredentials({
+            url: `${this.options.githubUrl}/${userOrg}`,
+          });
+        const orgClient = graphql.defaults({
+          baseUrl: this.options.gitHubConfig.apiBaseUrl,
+          headers: orgHeaders,
         });
-      const orgClient = graphql.defaults({
-        baseUrl: this.options.gitHubConfig.apiBaseUrl,
-        headers: orgHeaders,
-      });
 
-      const { groups } = await getOrganizationTeamsFromUsers(
-        orgClient,
-        userOrg,
-        usersToRebuild.map(
-          u =>
-            u.metadata.annotations?.[ANNOTATION_GITHUB_USER_LOGIN] ||
-            u.metadata.name,
-        ),
-        this.defaultMultiOrgTeamTransformer.bind(this),
-      );
+        const { teams } = await getOrganizationTeamsFromUsers(
+          orgClient,
+          userOrg,
+          usersToRebuild.map(
+            u =>
+              u.metadata.annotations?.[ANNOTATION_GITHUB_USER_LOGIN] ||
+              u.metadata.name,
+          ),
+          this.defaultMultiOrgTeamTransformer.bind(this),
+        );
 
-      assignGroupsToUsers(usersToRebuild, groups);
+        if (areGroupEntities(teams) && areUserEntities(usersToRebuild)) {
+          assignGroupsToUsers(usersToRebuild, teams);
+        }
+      }
     }
 
     const oldName = event.changes.name?.from || '';
@@ -693,7 +713,7 @@ export class GithubMultiOrgEntityProvider implements EntityProvider {
     const { removed } = this.createRemoveEntitiesOperation([oldGroup]);
     const { added } = this.createAddEntitiesOperation([
       ...usersToRebuild,
-      group,
+      team,
     ]);
     await this.connection.applyMutation({
       type: 'delta',
@@ -729,7 +749,7 @@ export class GithubMultiOrgEntityProvider implements EntityProvider {
     });
 
     const teamSlug = event.team.slug;
-    const { group } = await getOrganizationTeam(
+    const { team } = await getOrganizationTeam(
       client,
       org,
       teamSlug,
@@ -739,7 +759,7 @@ export class GithubMultiOrgEntityProvider implements EntityProvider {
     const userTransformer =
       this.options.userTransformer || defaultUserTransformer;
     const { name, avatar_url: avatarUrl, email, login } = event.member;
-    const user = (await userTransformer(
+    const user = await userTransformer(
       {
         name,
         avatarUrl,
@@ -751,31 +771,40 @@ export class GithubMultiOrgEntityProvider implements EntityProvider {
         client,
         query: '',
       },
-    )) as UserEntity;
+    );
 
-    const { orgs } = await getOrganizationsFromUser(client, login);
-    const userApplicableOrgs = orgs.filter(o => applicableOrgs.includes(o));
-    for (const userOrg of userApplicableOrgs) {
-      const { headers: orgHeaders } =
-        await this.options.githubCredentialsProvider.getCredentials({
-          url: `${this.options.githubUrl}/${userOrg}`,
+    const mutationEntities = [team];
+
+    if (user && isUserEntity(user)) {
+      const { orgs } = await getOrganizationsFromUser(client, login);
+      const userApplicableOrgs = orgs.filter(o => applicableOrgs.includes(o));
+      for (const userOrg of userApplicableOrgs) {
+        const { headers: orgHeaders } =
+          await this.options.githubCredentialsProvider.getCredentials({
+            url: `${this.options.githubUrl}/${userOrg}`,
+          });
+        const orgClient = graphql.defaults({
+          baseUrl: this.options.gitHubConfig.apiBaseUrl,
+          headers: orgHeaders,
         });
-      const orgClient = graphql.defaults({
-        baseUrl: this.options.gitHubConfig.apiBaseUrl,
-        headers: orgHeaders,
-      });
 
-      const { groups } = await getOrganizationTeamsFromUsers(
-        orgClient,
-        userOrg,
-        [login],
-        this.defaultMultiOrgTeamTransformer.bind(this),
-      );
+        const { teams } = await getOrganizationTeamsFromUsers(
+          orgClient,
+          userOrg,
+          [login],
+          this.defaultMultiOrgTeamTransformer.bind(this),
+        );
 
-      assignGroupsToUsers([user], groups);
+        if (areGroupEntities(teams)) {
+          assignGroupsToUsers([user], teams);
+        }
+      }
+
+      mutationEntities.push(user);
     }
 
-    const { added, removed } = this.createAddEntitiesOperation([user, group]);
+    const { added, removed } =
+      this.createAddEntitiesOperation(mutationEntities);
     await this.connection.applyMutation({
       type: 'delta',
       removed,
@@ -812,14 +841,14 @@ export class GithubMultiOrgEntityProvider implements EntityProvider {
   private async defaultMultiOrgTeamTransformer(
     team: GithubTeam,
     ctx: TransformerContext,
-  ): Promise<GroupEntity | undefined> {
+  ): Promise<Entity | undefined> {
     if (this.options.teamTransformer) {
       return await this.options.teamTransformer(team, ctx);
     }
 
     const result = await defaultOrganizationTeamTransformer(team, ctx);
 
-    if (result) {
+    if (result && result.spec) {
       result.metadata.namespace = ctx.org.toLocaleLowerCase('en-US');
       // Group `spec.members` inherits the namespace of it's group so need to explicitly specify refs here
       result.spec.members = team.members.map(
@@ -885,9 +914,9 @@ function trackProgress(logger: Logger) {
 
   function markReadComplete(read: {
     allUsers: unknown[];
-    allGroups: unknown[];
+    allTeams: unknown[];
   }) {
-    summary = `${read.allUsers.length} GitHub users and ${read.allGroups.length} GitHub groups`;
+    summary = `${read.allUsers.length} GitHub users and ${read.allTeams.length} GitHub groups`;
     const readDuration = ((Date.now() - timestamp) / 1000).toFixed(1);
     timestamp = Date.now();
     logger.info(`Read ${summary} in ${readDuration} seconds. Committing...`);
diff --git a/plugins/catalog-backend-module-github/src/providers/GithubOrgEntityProvider.ts b/plugins/catalog-backend-module-github/src/providers/GithubOrgEntityProvider.ts
index bf82607c6b..22f1f12e8d 100644
--- a/plugins/catalog-backend-module-github/src/providers/GithubOrgEntityProvider.ts
+++ b/plugins/catalog-backend-module-github/src/providers/GithubOrgEntityProvider.ts
@@ -19,6 +19,7 @@ import {
   ANNOTATION_LOCATION,
   ANNOTATION_ORIGIN_LOCATION,
   Entity,
+  isGroupEntity,
 } from '@backstage/catalog-model';
 import { Config } from '@backstage/config';
 import {
@@ -68,6 +69,7 @@ import {
 } from '../lib/github';
 import { assignGroupsToUsers, buildOrgHierarchy } from '../lib/org';
 import { parseGithubOrgUrl, splitTeamSlug } from '../lib/util';
+import { areGroupEntities, areUserEntities } from '../lib/guards';
 
 /**
  * Options for {@link GithubOrgEntityProvider}.
@@ -223,20 +225,24 @@ export class GithubOrgEntityProvider
       tokenType,
       this.options.userTransformer,
     );
-    const { groups } = await getOrganizationTeams(
+    const { teams } = await getOrganizationTeams(
       client,
       org,
       this.options.teamTransformer,
     );
 
-    assignGroupsToUsers(users, groups);
-    buildOrgHierarchy(groups);
+    if (areGroupEntities(teams)) {
+      buildOrgHierarchy(teams);
+      if (areUserEntities(users)) {
+        assignGroupsToUsers(users, teams);
+      }
+    }
 
-    const { markCommitComplete } = markReadComplete({ users, groups });
+    const { markCommitComplete } = markReadComplete({ users, teams });
 
     await this.connection.applyMutation({
       type: 'full',
-      entities: [...users, ...groups].map(entity => ({
+      entities: [...users, ...teams].map(entity => ({
         locationKey: `github-org-provider:${this.options.id}`,
         entity: withLocations(
           `https://${this.options.gitHubConfig.host}`,
@@ -340,7 +346,7 @@ export class GithubOrgEntityProvider
     });
 
     const { org } = parseGithubOrgUrl(this.options.orgUrl);
-    const { group } = await getOrganizationTeam(
+    const { team } = await getOrganizationTeam(
       client,
       org,
       teamSlug,
@@ -354,20 +360,28 @@ export class GithubOrgEntityProvider
       this.options.userTransformer,
     );
 
-    const usersFromChangedGroup = group.spec.members || [];
+    if (!isGroupEntity(team)) {
+      return;
+    }
+
+    const usersFromChangedGroup = team.spec.members || [];
     const usersToRebuild = users.filter(u =>
       usersFromChangedGroup.includes(u.metadata.name),
     );
 
-    const { groups } = await getOrganizationTeamsFromUsers(
+    const { teams } = await getOrganizationTeamsFromUsers(
       client,
       org,
       usersToRebuild.map(u => u.metadata.name),
       this.options.teamTransformer,
     );
 
-    assignGroupsToUsers(usersToRebuild, groups);
-    buildOrgHierarchy(groups);
+    if (areGroupEntities(teams)) {
+      buildOrgHierarchy(teams);
+      if (areUserEntities(usersToRebuild)) {
+        assignGroupsToUsers(usersToRebuild, teams);
+      }
+    }
 
     const oldName = event.changes.name?.from || event.team.name;
     const oldSlug = oldName.toLowerCase().replaceAll(/\s/gi, '-');
@@ -380,14 +394,14 @@ export class GithubOrgEntityProvider
 
     const { removed } = createDeltaOperation(org, [
       {
-        ...group,
+        ...team,
         metadata: {
           name: oldSlug,
           description: oldDescriptionSlug,
         },
       },
     ]);
-    const { added } = createDeltaOperation(org, [...usersToRebuild, ...groups]);
+    const { added } = createDeltaOperation(org, [...usersToRebuild, ...teams]);
     await this.connection.applyMutation({
       type: 'delta',
       removed,
@@ -423,7 +437,7 @@ export class GithubOrgEntityProvider
     });
 
     const { org } = parseGithubOrgUrl(this.options.orgUrl);
-    const { group } = await getOrganizationTeam(
+    const { team } = await getOrganizationTeam(
       client,
       org,
       teamSlug,
@@ -439,7 +453,7 @@ export class GithubOrgEntityProvider
 
     const usersToRebuild = users.filter(u => u.metadata.name === userLogin);
 
-    const { groups } = await getOrganizationTeamsFromUsers(
+    const { teams } = await getOrganizationTeamsFromUsers(
       client,
       org,
       [userLogin],
@@ -447,16 +461,20 @@ export class GithubOrgEntityProvider
     );
 
     // we include group because the removed event need to update the old group too
-    if (!groups.some(g => g.metadata.name === group.metadata.name)) {
-      groups.push(group);
+    if (!teams.some(t => t.metadata.name === team.metadata.name)) {
+      teams.push(team);
     }
 
-    assignGroupsToUsers(usersToRebuild, groups);
-    buildOrgHierarchy(groups);
+    if (areGroupEntities(teams)) {
+      buildOrgHierarchy(teams);
+      if (areUserEntities(usersToRebuild)) {
+        assignGroupsToUsers(usersToRebuild, teams);
+      }
+    }
 
     const { added, removed } = createDeltaOperation(org, [
       ...usersToRebuild,
-      ...groups,
+      ...teams,
     ]);
     await this.connection.applyMutation({
       type: 'delta',
@@ -588,10 +606,10 @@ function trackProgress(logger: Logger) {
   let timestamp = Date.now();
   let summary: string;
 
-  logger.info('Reading GitHub users and groups');
+  logger.info('Reading GitHub users and teams');
 
-  function markReadComplete(read: { users: unknown[]; groups: unknown[] }) {
-    summary = `${read.users.length} GitHub users and ${read.groups.length} GitHub groups`;
+  function markReadComplete(read: { users: unknown[]; teams: unknown[] }) {
+    summary = `${read.users.length} GitHub users and ${read.teams.length} GitHub teams`;
     const readDuration = ((Date.now() - timestamp) / 1000).toFixed(1);
     timestamp = Date.now();
     logger.info(`Read ${summary} in ${readDuration} seconds. Committing...`);
diff --git a/plugins/catalog-backend-module-gitlab/CHANGELOG.md b/plugins/catalog-backend-module-gitlab/CHANGELOG.md
index d92ddbce43..39c8e960dd 100644
--- a/plugins/catalog-backend-module-gitlab/CHANGELOG.md
+++ b/plugins/catalog-backend-module-gitlab/CHANGELOG.md
@@ -1,5 +1,80 @@
 # @backstage/plugin-catalog-backend-module-gitlab
 
+## 0.2.7-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config@1.1.0-next.1
+  - @backstage/backend-tasks@0.5.8-next.2
+  - @backstage/backend-common@0.19.5-next.2
+  - @backstage/plugin-catalog-node@1.4.4-next.2
+  - @backstage/integration@1.7.0-next.2
+  - @backstage/backend-plugin-api@0.6.3-next.2
+  - @backstage/catalog-model@1.4.2-next.1
+  - @backstage/errors@1.2.1
+  - @backstage/types@1.1.0
+
+## 0.2.7-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config@1.1.0-next.0
+  - @backstage/integration@1.7.0-next.1
+  - @backstage/backend-tasks@0.5.8-next.1
+  - @backstage/backend-common@0.19.5-next.1
+  - @backstage/backend-plugin-api@0.6.3-next.1
+  - @backstage/catalog-model@1.4.2-next.0
+  - @backstage/plugin-catalog-node@1.4.4-next.1
+  - @backstage/errors@1.2.1
+  - @backstage/types@1.1.0
+
+## 0.2.6-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.19.4-next.0
+  - @backstage/integration@1.7.0-next.0
+  - @backstage/backend-tasks@0.5.7-next.0
+  - @backstage/backend-plugin-api@0.6.2-next.0
+  - @backstage/catalog-model@1.4.1
+  - @backstage/config@1.0.8
+  - @backstage/errors@1.2.1
+  - @backstage/types@1.1.0
+  - @backstage/plugin-catalog-node@1.4.3-next.0
+
+## 0.2.4
+
+### Patch Changes
+
+- 629cbd194a87: Use `coreServices.rootConfig` instead of `coreService.config`
+- e6c721439f37: Added option to skip forked repos in GitlabDiscoveryEntityProvider
+- 4b82382ed8c2: Fixed invalid configuration schema. The configuration schema may be more strict as a result.
+- 2fe1f5973ff7: Filter Gitlab archived projects through APIs
+- Updated dependencies
+  - @backstage/backend-common@0.19.2
+  - @backstage/backend-plugin-api@0.6.0
+  - @backstage/plugin-catalog-node@1.4.1
+  - @backstage/integration@1.6.0
+  - @backstage/backend-tasks@0.5.5
+  - @backstage/catalog-model@1.4.1
+  - @backstage/config@1.0.8
+  - @backstage/errors@1.2.1
+  - @backstage/types@1.1.0
+
+## 0.2.4-next.2
+
+### Patch Changes
+
+- 2fe1f5973ff7: Filter Gitlab archived projects through APIs
+- Updated dependencies
+  - @backstage/backend-plugin-api@0.6.0-next.2
+  - @backstage/backend-tasks@0.5.5-next.2
+  - @backstage/backend-common@0.19.2-next.2
+  - @backstage/plugin-catalog-node@1.4.1-next.2
+
 ## 0.2.4-next.1
 
 ### Patch Changes
diff --git a/plugins/catalog-backend-module-gitlab/alpha-api-report.md b/plugins/catalog-backend-module-gitlab/alpha-api-report.md
index f14b41d6c5..bb466a632e 100644
--- a/plugins/catalog-backend-module-gitlab/alpha-api-report.md
+++ b/plugins/catalog-backend-module-gitlab/alpha-api-report.md
@@ -6,7 +6,8 @@
 import { BackendFeature } from '@backstage/backend-plugin-api';
 
 // @alpha
-export const catalogModuleGitlabDiscoveryEntityProvider: () => BackendFeature;
+const catalogModuleGitlabDiscoveryEntityProvider: () => BackendFeature;
+export default catalogModuleGitlabDiscoveryEntityProvider;
 
 // (No @packageDocumentation comment for this package)
 ```
diff --git a/plugins/catalog-backend-module-gitlab/catalog-info.yaml b/plugins/catalog-backend-module-gitlab/catalog-info.yaml
new file mode 100644
index 0000000000..41968a1c34
--- /dev/null
+++ b/plugins/catalog-backend-module-gitlab/catalog-info.yaml
@@ -0,0 +1,10 @@
+apiVersion: backstage.io/v1alpha1
+kind: Component
+metadata:
+  name: backstage-plugin-catalog-backend-module-gitlab
+  title: '@backstage/plugin-catalog-backend-module-gitlab'
+  description: A Backstage catalog backend module that helps integrate towards GitLab
+spec:
+  lifecycle: experimental
+  type: backstage-backend-plugin-module
+  owner: catalog-maintainers
diff --git a/plugins/catalog-backend-module-gitlab/package.json b/plugins/catalog-backend-module-gitlab/package.json
index 1465b430ae..788e39ba38 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.2.4-next.1",
+  "version": "0.2.7-next.2",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
diff --git a/plugins/catalog-backend-module-gitlab/src/GitLabDiscoveryProcessor.test.ts b/plugins/catalog-backend-module-gitlab/src/GitLabDiscoveryProcessor.test.ts
index 6333184ea8..a56c229105 100644
--- a/plugins/catalog-backend-module-gitlab/src/GitLabDiscoveryProcessor.test.ts
+++ b/plugins/catalog-backend-module-gitlab/src/GitLabDiscoveryProcessor.test.ts
@@ -56,6 +56,7 @@ function setupFakeServer(
   listProjectsCallback: (request: {
     page: number;
     include_subgroups: boolean;
+    archived: boolean;
   }) => {
     data: GitLabProject[];
     nextPage?: number;
@@ -74,20 +75,24 @@ function setupFakeServer(
       }
       const page = req.url.searchParams.get('page');
       const include_subgroups = req.url.searchParams.get('include_subgroups');
+      const archived = req.url.searchParams.get('archived');
       const response = listProjectsCallback({
         page: parseInt(page!, 10),
         include_subgroups: include_subgroups === 'true',
+        archived: archived === 'true',
       });
 
       // Filter the fake results based on the `last_activity_after` parameter
       const last_activity_after = req.url.searchParams.get(
         'last_activity_after',
       );
-      const filteredData = response.data.filter(
-        v =>
-          !last_activity_after ||
-          Date.parse(v.last_activity_at) >= Date.parse(last_activity_after),
-      );
+      const filteredData = response.data
+        .filter(
+          v =>
+            !last_activity_after ||
+            Date.parse(v.last_activity_at) >= Date.parse(last_activity_after),
+        )
+        .filter(v => archived || !v.archived);
 
       return res(
         ctx.set('x-next-page', response.nextPage?.toString() ?? ''),
@@ -250,6 +255,7 @@ describe('GitlabDiscoveryProcessor', () => {
                 },
               ],
             };
+
           default:
             throw new Error('Invalid request');
         }
diff --git a/plugins/catalog-backend-module-gitlab/src/GitLabDiscoveryProcessor.ts b/plugins/catalog-backend-module-gitlab/src/GitLabDiscoveryProcessor.ts
index c9bd4d9187..02b1b1cb51 100644
--- a/plugins/catalog-backend-module-gitlab/src/GitLabDiscoveryProcessor.ts
+++ b/plugins/catalog-backend-module-gitlab/src/GitLabDiscoveryProcessor.ts
@@ -109,6 +109,7 @@ export class GitLabDiscoveryProcessor implements CatalogProcessor {
 
     const lastActivity = (await this.cache.get(this.getCacheKey())) as string;
     const opts = {
+      archived: false,
       group,
       page: 1,
       // We check for the existence of lastActivity and only set it if it's present to ensure
@@ -125,10 +126,6 @@ export class GitLabDiscoveryProcessor implements CatalogProcessor {
     for await (const project of projects) {
       res.scanned++;
 
-      if (project.archived) {
-        continue;
-      }
-
       if (branch === '*' && project.default_branch === undefined) {
         continue;
       }
diff --git a/plugins/catalog-backend-module-gitlab/src/alpha.ts b/plugins/catalog-backend-module-gitlab/src/alpha.ts
index ace970e3aa..65f5b05b49 100644
--- a/plugins/catalog-backend-module-gitlab/src/alpha.ts
+++ b/plugins/catalog-backend-module-gitlab/src/alpha.ts
@@ -14,4 +14,4 @@
  * limitations under the License.
  */
 
-export { catalogModuleGitlabDiscoveryEntityProvider } from './module/catalogModuleGitlabDiscoveryEntityProvider';
+export { catalogModuleGitlabDiscoveryEntityProvider as default } from './module/catalogModuleGitlabDiscoveryEntityProvider';
diff --git a/plugins/catalog-backend-module-gitlab/src/lib/client.ts b/plugins/catalog-backend-module-gitlab/src/lib/client.ts
index f0e169d8df..41b99e1c5b 100644
--- a/plugins/catalog-backend-module-gitlab/src/lib/client.ts
+++ b/plugins/catalog-backend-module-gitlab/src/lib/client.ts
@@ -30,6 +30,7 @@ export type CommonListOptions = {
 };
 
 interface ListProjectOptions extends CommonListOptions {
+  archived?: boolean;
   group?: string;
 }
 
diff --git a/plugins/catalog-backend-module-gitlab/src/module/catalogModuleGitlabDiscoveryEntityProvider.test.ts b/plugins/catalog-backend-module-gitlab/src/module/catalogModuleGitlabDiscoveryEntityProvider.test.ts
index da11601f09..46cfe403e8 100644
--- a/plugins/catalog-backend-module-gitlab/src/module/catalogModuleGitlabDiscoveryEntityProvider.test.ts
+++ b/plugins/catalog-backend-module-gitlab/src/module/catalogModuleGitlabDiscoveryEntityProvider.test.ts
@@ -14,14 +14,8 @@
  * limitations under the License.
  */
 
-import { getVoidLogger } 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 { ConfigReader } from '@backstage/config';
+import { TaskScheduleDefinition } from '@backstage/backend-tasks';
+import { mockServices, startTestBackend } from '@backstage/backend-test-utils';
 import { catalogProcessingExtensionPoint } from '@backstage/plugin-catalog-node/alpha';
 import { Duration } from 'luxon';
 import { catalogModuleGitlabDiscoveryEntityProvider } from './catalogModuleGitlabDiscoveryEntityProvider';
@@ -38,14 +32,14 @@ describe('catalogModuleGitlabDiscoveryEntityProvider', () => {
       },
     };
     const runner = jest.fn();
-    const scheduler = {
-      createScheduledTaskRunner: (schedule: TaskScheduleDefinition) => {
+    const scheduler = mockServices.scheduler.mock({
+      createScheduledTaskRunner(schedule) {
         usedSchedule = schedule;
-        return runner;
+        return { run: runner };
       },
-    } as unknown as PluginTaskScheduler;
+    });
 
-    const config = new ConfigReader({
+    const config = {
       integrations: {
         gitlab: [
           {
@@ -69,16 +63,16 @@ describe('catalogModuleGitlabDiscoveryEntityProvider', () => {
           },
         },
       },
-    });
+    };
 
     await startTestBackend({
       extensionPoints: [[catalogProcessingExtensionPoint, extensionPoint]],
-      services: [
-        [coreServices.rootConfig, config],
-        [coreServices.logger, getVoidLogger()],
-        [coreServices.scheduler, scheduler],
+      features: [
+        catalogModuleGitlabDiscoveryEntityProvider(),
+        mockServices.rootConfig.factory({ data: config }),
+        mockServices.logger.factory(),
+        scheduler.factory,
       ],
-      features: [catalogModuleGitlabDiscoveryEntityProvider()],
     });
 
     expect(usedSchedule?.frequency).toEqual(Duration.fromISO('P1M'));
diff --git a/plugins/catalog-backend-module-gitlab/src/providers/GitlabDiscoveryEntityProvider.ts b/plugins/catalog-backend-module-gitlab/src/providers/GitlabDiscoveryEntityProvider.ts
index 08d2fe48a7..ce7a304746 100644
--- a/plugins/catalog-backend-module-gitlab/src/providers/GitlabDiscoveryEntityProvider.ts
+++ b/plugins/catalog-backend-module-gitlab/src/providers/GitlabDiscoveryEntityProvider.ts
@@ -155,6 +155,7 @@ export class GitlabDiscoveryEntityProvider implements EntityProvider {
     const projects = paginated<GitLabProject>(
       options => client.listProjects(options),
       {
+        archived: false,
         group: this.config.group,
         page: 1,
         per_page: 50,
@@ -173,10 +174,6 @@ export class GitlabDiscoveryEntityProvider implements EntityProvider {
 
       res.scanned++;
 
-      if (project.archived) {
-        continue;
-      }
-
       if (
         this.config.skipForkedRepos &&
         project.hasOwnProperty('forked_from_project')
diff --git a/plugins/catalog-backend-module-incremental-ingestion/CHANGELOG.md b/plugins/catalog-backend-module-incremental-ingestion/CHANGELOG.md
index 0cc4dc584d..dd92105d91 100644
--- a/plugins/catalog-backend-module-incremental-ingestion/CHANGELOG.md
+++ b/plugins/catalog-backend-module-incremental-ingestion/CHANGELOG.md
@@ -1,5 +1,83 @@
 # @backstage/plugin-catalog-backend-module-incremental-ingestion
 
+## 0.4.6-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-backend@1.13.0-next.2
+  - @backstage/config@1.1.0-next.1
+  - @backstage/backend-tasks@0.5.8-next.2
+  - @backstage/backend-common@0.19.5-next.2
+  - @backstage/plugin-catalog-node@1.4.4-next.2
+  - @backstage/backend-plugin-api@0.6.3-next.2
+  - @backstage/catalog-model@1.4.2-next.1
+  - @backstage/plugin-permission-common@0.7.8-next.1
+  - @backstage/errors@1.2.1
+  - @backstage/plugin-events-node@0.2.12-next.2
+
+## 0.4.6-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-backend@1.13.0-next.1
+  - @backstage/config@1.1.0-next.0
+  - @backstage/backend-tasks@0.5.8-next.1
+  - @backstage/backend-common@0.19.5-next.1
+  - @backstage/backend-plugin-api@0.6.3-next.1
+  - @backstage/catalog-model@1.4.2-next.0
+  - @backstage/plugin-permission-common@0.7.8-next.0
+  - @backstage/plugin-catalog-node@1.4.4-next.1
+  - @backstage/plugin-events-node@0.2.12-next.1
+  - @backstage/errors@1.2.1
+
+## 0.4.3-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-backend@1.12.2-next.0
+  - @backstage/backend-common@0.19.4-next.0
+  - @backstage/backend-tasks@0.5.7-next.0
+  - @backstage/backend-plugin-api@0.6.2-next.0
+  - @backstage/catalog-model@1.4.1
+  - @backstage/config@1.0.8
+  - @backstage/errors@1.2.1
+  - @backstage/plugin-catalog-node@1.4.3-next.0
+  - @backstage/plugin-events-node@0.2.11-next.0
+  - @backstage/plugin-permission-common@0.7.7
+
+## 0.4.1
+
+### Patch Changes
+
+- 629cbd194a87: Use `coreServices.rootConfig` instead of `coreService.config`
+- e2b6396a1274: Export new alpha `incrementalIngestionProvidersExtensionPoint` for registering incremental providers, rather than the providers being passed as options to the backend module.
+- Updated dependencies
+  - @backstage/backend-common@0.19.2
+  - @backstage/plugin-catalog-backend@1.12.0
+  - @backstage/backend-plugin-api@0.6.0
+  - @backstage/plugin-catalog-node@1.4.1
+  - @backstage/plugin-events-node@0.2.9
+  - @backstage/backend-tasks@0.5.5
+  - @backstage/catalog-model@1.4.1
+  - @backstage/config@1.0.8
+  - @backstage/errors@1.2.1
+  - @backstage/plugin-permission-common@0.7.7
+
+## 0.4.1-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-backend@1.12.0-next.2
+  - @backstage/backend-plugin-api@0.6.0-next.2
+  - @backstage/backend-tasks@0.5.5-next.2
+  - @backstage/backend-common@0.19.2-next.2
+  - @backstage/plugin-catalog-node@1.4.1-next.2
+  - @backstage/plugin-events-node@0.2.9-next.2
+
 ## 0.4.1-next.1
 
 ### Patch Changes
diff --git a/plugins/catalog-backend-module-incremental-ingestion/README.md b/plugins/catalog-backend-module-incremental-ingestion/README.md
index 3728121540..c5ed3e6367 100644
--- a/plugins/catalog-backend-module-incremental-ingestion/README.md
+++ b/plugins/catalog-backend-module-incremental-ingestion/README.md
@@ -20,7 +20,7 @@ We created the Incremental Entity Provider to address all of the above issues. T
 
 Incremental Entity Providers will wait a configurable interval before proceeding to the next burst.
 
-Once the source has no more results, Incremental Entity Provider compares all entities annotated with `@backstage/incremental-entity-provider: <entity-provider-id>` against all marked entities to determine which entities committed by same entity provider were not marked during the last ingestion cycle. All unmarked entities are deleted at the end of the cycle. The Incremental Entity Provider rests for a fixed internal before restarting the ingestion process.
+Once the source has no more results, Incremental Entity Provider compares all entities annotated with `@backstage/incremental-entity-provider: <entity-provider-id>` against all marked entities to determine which entities committed by same entity provider were not marked during the last ingestion cycle. All unmarked entities are deleted at the end of the cycle. The Incremental Entity Provider rests for a fixed interval before restarting the ingestion process.
 
 ![Diagram of execution of an Incremental Entity Provider](https://user-images.githubusercontent.com/74687/185822734-ee6279c7-64fa-46b9-9aa8-d4092ab73858.png)
 
diff --git a/plugins/catalog-backend-module-incremental-ingestion/alpha-api-report.md b/plugins/catalog-backend-module-incremental-ingestion/alpha-api-report.md
index b11ec43cf5..6ab775f25b 100644
--- a/plugins/catalog-backend-module-incremental-ingestion/alpha-api-report.md
+++ b/plugins/catalog-backend-module-incremental-ingestion/alpha-api-report.md
@@ -4,16 +4,24 @@
 
 ```ts
 import { BackendFeature } from '@backstage/backend-plugin-api';
+import { ExtensionPoint } from '@backstage/backend-plugin-api';
 import { IncrementalEntityProvider } from '@backstage/plugin-catalog-backend-module-incremental-ingestion';
 import { IncrementalEntityProviderOptions } from '@backstage/plugin-catalog-backend-module-incremental-ingestion';
 
 // @alpha
-export const catalogModuleIncrementalIngestionEntityProvider: (options: {
-  providers: {
-    provider: IncrementalEntityProvider<unknown, unknown>;
+const catalogModuleIncrementalIngestionEntityProvider: () => BackendFeature;
+export default catalogModuleIncrementalIngestionEntityProvider;
+
+// @alpha
+export interface IncrementalIngestionProviderExtensionPoint {
+  addProvider<TCursor, TContext>(config: {
     options: IncrementalEntityProviderOptions;
-  }[];
-}) => BackendFeature;
+    provider: IncrementalEntityProvider<TCursor, TContext>;
+  }): void;
+}
+
+// @alpha
+export const incrementalIngestionProvidersExtensionPoint: ExtensionPoint<IncrementalIngestionProviderExtensionPoint>;
 
 // (No @packageDocumentation comment for this package)
 ```
diff --git a/plugins/catalog-backend-module-incremental-ingestion/catalog-info.yaml b/plugins/catalog-backend-module-incremental-ingestion/catalog-info.yaml
new file mode 100644
index 0000000000..78c1b33d19
--- /dev/null
+++ b/plugins/catalog-backend-module-incremental-ingestion/catalog-info.yaml
@@ -0,0 +1,10 @@
+apiVersion: backstage.io/v1alpha1
+kind: Component
+metadata:
+  name: backstage-plugin-catalog-backend-module-incremental-ingestion
+  title: '@backstage/plugin-catalog-backend-module-incremental-ingestion'
+  description: An entity provider for streaming large asset sources into the catalog
+spec:
+  lifecycle: experimental
+  type: backstage-backend-plugin-module
+  owner: catalog-maintainers
diff --git a/plugins/catalog-backend-module-incremental-ingestion/package.json b/plugins/catalog-backend-module-incremental-ingestion/package.json
index d4cae08da0..668170ba32 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.4.1-next.1",
+  "version": "0.4.6-next.2",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
diff --git a/plugins/catalog-backend-module-incremental-ingestion/src/alpha.ts b/plugins/catalog-backend-module-incremental-ingestion/src/alpha.ts
index c277a0a680..01a9b25f7c 100644
--- a/plugins/catalog-backend-module-incremental-ingestion/src/alpha.ts
+++ b/plugins/catalog-backend-module-incremental-ingestion/src/alpha.ts
@@ -15,3 +15,4 @@
  */
 
 export * from './module';
+export { default } from './module';
diff --git a/plugins/catalog-backend-module-incremental-ingestion/src/module/WrapperProviders.test.ts b/plugins/catalog-backend-module-incremental-ingestion/src/module/WrapperProviders.test.ts
index 0d910f664d..1f318c2590 100644
--- a/plugins/catalog-backend-module-incremental-ingestion/src/module/WrapperProviders.test.ts
+++ b/plugins/catalog-backend-module-incremental-ingestion/src/module/WrapperProviders.test.ts
@@ -24,7 +24,7 @@ import { WrapperProviders } from './WrapperProviders';
 describe('WrapperProviders', () => {
   const applyDatabaseMigrations = jest.fn();
   const databases = TestDatabases.create({
-    ids: ['POSTGRES_13', 'POSTGRES_9', 'SQLITE_3'],
+    ids: ['POSTGRES_13', 'POSTGRES_9', 'SQLITE_3', 'MYSQL_8'],
   });
   const config = new ConfigReader({});
   const logger = getVoidLogger();
diff --git a/plugins/catalog-backend-module-incremental-ingestion/src/module/catalogModuleIncrementalIngestionEntityProvider.test.ts b/plugins/catalog-backend-module-incremental-ingestion/src/module/catalogModuleIncrementalIngestionEntityProvider.test.ts
index ae480048d1..7d76ddf480 100644
--- a/plugins/catalog-backend-module-incremental-ingestion/src/module/catalogModuleIncrementalIngestionEntityProvider.test.ts
+++ b/plugins/catalog-backend-module-incremental-ingestion/src/module/catalogModuleIncrementalIngestionEntityProvider.test.ts
@@ -14,13 +14,14 @@
  * limitations under the License.
  */
 
-import { getVoidLogger } from '@backstage/backend-common';
-import { coreServices } from '@backstage/backend-plugin-api';
-import { startTestBackend } from '@backstage/backend-test-utils';
-import { ConfigReader } from '@backstage/config';
+import { createBackendModule } from '@backstage/backend-plugin-api';
+import { mockServices, startTestBackend } from '@backstage/backend-test-utils';
 import { catalogProcessingExtensionPoint } from '@backstage/plugin-catalog-node/alpha';
 import { IncrementalEntityProvider } from '../types';
-import { catalogModuleIncrementalIngestionEntityProvider } from './catalogModuleIncrementalIngestionEntityProvider';
+import {
+  catalogModuleIncrementalIngestionEntityProvider,
+  incrementalIngestionProvidersExtensionPoint,
+} from './catalogModuleIncrementalIngestionEntityProvider';
 
 describe('catalogModuleIncrementalIngestionEntityProvider', () => {
   it('should register provider at the catalog extension point', async () => {
@@ -35,39 +36,34 @@ describe('catalogModuleIncrementalIngestionEntityProvider', () => {
     };
 
     const addEntityProvider = jest.fn();
-    const httpRouterUse = jest.fn();
 
-    const scheduler = {};
-    const database = {
-      getClient: jest.fn(),
-    };
-    const httpRouter = {
-      use: httpRouterUse,
-    };
+    const httpRouterMock = mockServices.httpRouter.mock();
 
     await startTestBackend({
       extensionPoints: [
         [catalogProcessingExtensionPoint, { addEntityProvider }],
       ],
-      services: [
-        [coreServices.rootConfig, new ConfigReader({})],
-        [coreServices.database, database],
-        [coreServices.httpRouter, httpRouter],
-        [coreServices.logger, getVoidLogger()],
-        [coreServices.scheduler, scheduler],
-      ],
       features: [
-        catalogModuleIncrementalIngestionEntityProvider({
-          providers: [
-            {
-              provider: provider1,
-              options: {
-                burstInterval: { seconds: 1 },
-                burstLength: { seconds: 1 },
-                restLength: { seconds: 1 },
+        httpRouterMock.factory,
+        catalogModuleIncrementalIngestionEntityProvider(),
+        createBackendModule({
+          pluginId: 'catalog',
+          moduleId: 'incrementalTest',
+          register(env) {
+            env.registerInit({
+              deps: { extension: incrementalIngestionProvidersExtensionPoint },
+              async init({ extension }) {
+                extension.addProvider({
+                  provider: provider1,
+                  options: {
+                    burstInterval: { seconds: 1 },
+                    burstLength: { seconds: 1 },
+                    restLength: { seconds: 1 },
+                  },
+                });
               },
-            },
-          ],
+            });
+          },
         }),
       ],
     });
@@ -76,6 +72,6 @@ describe('catalogModuleIncrementalIngestionEntityProvider', () => {
     expect(addEntityProvider.mock.calls[0][0].getProviderName()).toBe(
       'provider1',
     );
-    expect(httpRouterUse).toHaveBeenCalledTimes(1);
+    expect(httpRouterMock.use).toHaveBeenCalledTimes(1);
   });
 });
diff --git a/plugins/catalog-backend-module-incremental-ingestion/src/module/catalogModuleIncrementalIngestionEntityProvider.ts b/plugins/catalog-backend-module-incremental-ingestion/src/module/catalogModuleIncrementalIngestionEntityProvider.ts
index 78d28d7b07..4e94088ef6 100644
--- a/plugins/catalog-backend-module-incremental-ingestion/src/module/catalogModuleIncrementalIngestionEntityProvider.ts
+++ b/plugins/catalog-backend-module-incremental-ingestion/src/module/catalogModuleIncrementalIngestionEntityProvider.ts
@@ -17,6 +17,7 @@
 import {
   coreServices,
   createBackendModule,
+  createExtensionPoint,
 } from '@backstage/backend-plugin-api';
 import { catalogProcessingExtensionPoint } from '@backstage/plugin-catalog-node/alpha';
 import {
@@ -25,56 +26,111 @@ import {
 } from '@backstage/plugin-catalog-backend-module-incremental-ingestion';
 import { WrapperProviders } from './WrapperProviders';
 
+/**
+ * @alpha
+ * Interface for {@link incrementalIngestionProvidersExtensionPoint}.
+ */
+export interface IncrementalIngestionProviderExtensionPoint {
+  /** Adds a new incremental entity provider */
+  addProvider<TCursor, TContext>(config: {
+    options: IncrementalEntityProviderOptions;
+    provider: IncrementalEntityProvider<TCursor, TContext>;
+  }): void;
+}
+
+/**
+ * @alpha
+ *
+ * Extension point for registering incremental ingestion providers.
+ * The `catalogModuleIncrementalIngestionEntityProvider` must be installed for these providers to work.
+ *
+ * @example
+ *
+ * ```ts
+ * backend.add(createBackendModule({
+ *   pluginId: 'catalog',
+ *   moduleId: 'myIncrementalProvider',
+ *   register(env) {
+ *     env.registerInit({
+ *       deps: {
+ *         extension: incrementalIngestionProvidersExtensionPoint,
+ *       },
+ *       async init({ extension }) {
+ *         extension.addProvider({
+ *           burstInterval: ...,
+ *           burstLength: ...,
+ *           restLength: ...,
+ *         }, {
+ *           next(context, cursor) {
+ *             ...
+ *           },
+ *           ...
+ *         })
+ *       })
+ *     })
+ *   }
+ * }))
+ * ```
+ */
+export const incrementalIngestionProvidersExtensionPoint =
+  createExtensionPoint<IncrementalIngestionProviderExtensionPoint>({
+    id: 'catalog.incrementalIngestionProvider.providers',
+  });
+
 /**
  * Registers the incremental entity provider with the catalog processing extension point.
  *
  * @alpha
  */
 export const catalogModuleIncrementalIngestionEntityProvider =
-  createBackendModule(
-    (options: {
-      providers: Array<{
+  createBackendModule({
+    pluginId: 'catalog',
+    moduleId: 'incrementalIngestionEntityProvider',
+    register(env) {
+      const addedProviders = new Array<{
         provider: IncrementalEntityProvider<unknown, unknown>;
         options: IncrementalEntityProviderOptions;
-      }>;
-    }) => ({
-      pluginId: 'catalog',
-      moduleId: 'incrementalIngestionEntityProvider',
-      register(env) {
-        env.registerInit({
-          deps: {
-            catalog: catalogProcessingExtensionPoint,
-            config: coreServices.rootConfig,
-            database: coreServices.database,
-            httpRouter: coreServices.httpRouter,
-            logger: coreServices.logger,
-            scheduler: coreServices.scheduler,
-          },
-          async init({
-            catalog,
+      }>();
+
+      env.registerExtensionPoint(incrementalIngestionProvidersExtensionPoint, {
+        addProvider({ options, provider }) {
+          addedProviders.push({ options, provider });
+        },
+      });
+
+      env.registerInit({
+        deps: {
+          catalog: catalogProcessingExtensionPoint,
+          config: coreServices.rootConfig,
+          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({
             config,
-            database,
-            httpRouter,
             logger,
+            client,
             scheduler,
-          }) {
-            const client = await database.getClient();
+          });
 
-            const providers = new WrapperProviders({
-              config,
-              logger,
-              client,
-              scheduler,
-            });
+          for (const entry of addedProviders) {
+            const wrapped = providers.wrap(entry.provider, entry.options);
+            catalog.addEntityProvider(wrapped);
+          }
 
-            for (const entry of options.providers) {
-              const wrapped = providers.wrap(entry.provider, entry.options);
-              catalog.addEntityProvider(wrapped);
-            }
-
-            httpRouter.use(await providers.adminRouter());
-          },
-        });
-      },
-    }),
-  );
+          httpRouter.use(await providers.adminRouter());
+        },
+      });
+    },
+  });
diff --git a/plugins/catalog-backend-module-incremental-ingestion/src/module/index.ts b/plugins/catalog-backend-module-incremental-ingestion/src/module/index.ts
index 9fcee99e01..8a395f06fe 100644
--- a/plugins/catalog-backend-module-incremental-ingestion/src/module/index.ts
+++ b/plugins/catalog-backend-module-incremental-ingestion/src/module/index.ts
@@ -14,4 +14,8 @@
  * limitations under the License.
  */
 
-export { catalogModuleIncrementalIngestionEntityProvider } from './catalogModuleIncrementalIngestionEntityProvider';
+export {
+  catalogModuleIncrementalIngestionEntityProvider as default,
+  incrementalIngestionProvidersExtensionPoint,
+  type IncrementalIngestionProviderExtensionPoint,
+} from './catalogModuleIncrementalIngestionEntityProvider';
diff --git a/plugins/catalog-backend-module-incremental-ingestion/src/run.ts b/plugins/catalog-backend-module-incremental-ingestion/src/run.ts
index e7e7a900b9..c24deb6adb 100644
--- a/plugins/catalog-backend-module-incremental-ingestion/src/run.ts
+++ b/plugins/catalog-backend-module-incremental-ingestion/src/run.ts
@@ -20,12 +20,14 @@
 import { createBackend } from '@backstage/backend-defaults';
 import {
   coreServices,
+  createBackendModule,
   createServiceFactory,
 } from '@backstage/backend-plugin-api';
 import { ConfigReader } from '@backstage/config';
-import { catalogPlugin } from '@backstage/plugin-catalog-backend/alpha';
 import { IncrementalEntityProvider } from '.';
-import { catalogModuleIncrementalIngestionEntityProvider } from './alpha';
+import catalogModuleIncrementalIngestionEntityProvider, {
+  incrementalIngestionProvidersExtensionPoint,
+} from './alpha';
 
 const provider: IncrementalEntityProvider<number, {}> = {
   getProviderName: () => 'test-provider',
@@ -51,29 +53,36 @@ async function main() {
     },
   };
 
-  const backend = createBackend({
-    services: [
-      createServiceFactory({
-        service: coreServices.rootConfig,
-        deps: {},
-        factory: () => new ConfigReader(config),
-      }),
-    ],
-  });
+  const backend = createBackend();
 
-  backend.add(catalogPlugin());
   backend.add(
-    catalogModuleIncrementalIngestionEntityProvider({
-      providers: [
-        {
-          provider: provider,
-          options: {
-            burstInterval: { seconds: 1 },
-            burstLength: { seconds: 10 },
-            restLength: { seconds: 10 },
+    createServiceFactory({
+      service: coreServices.rootConfig,
+      deps: {},
+      factory: () => new ConfigReader(config),
+    }),
+  );
+  backend.add(import('@backstage/plugin-catalog-backend/alpha'));
+  backend.add(catalogModuleIncrementalIngestionEntityProvider());
+  backend.add(
+    createBackendModule({
+      pluginId: 'catalog',
+      moduleId: 'incrementalTestProvider',
+      register(reg) {
+        reg.registerInit({
+          deps: { extension: incrementalIngestionProvidersExtensionPoint },
+          async init({ extension }) {
+            extension.addProvider({
+              provider: provider,
+              options: {
+                burstInterval: { seconds: 1 },
+                burstLength: { seconds: 10 },
+                restLength: { seconds: 10 },
+              },
+            });
           },
-        },
-      ],
+        });
+      },
     }),
   );
 
diff --git a/plugins/catalog-backend-module-ldap/CHANGELOG.md b/plugins/catalog-backend-module-ldap/CHANGELOG.md
index 9cb5788b30..0acf538b9a 100644
--- a/plugins/catalog-backend-module-ldap/CHANGELOG.md
+++ b/plugins/catalog-backend-module-ldap/CHANGELOG.md
@@ -1,5 +1,65 @@
 # @backstage/plugin-catalog-backend-module-ldap
 
+## 0.5.18-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config@1.1.0-next.1
+  - @backstage/backend-tasks@0.5.8-next.2
+  - @backstage/plugin-catalog-node@1.4.4-next.2
+  - @backstage/catalog-model@1.4.2-next.1
+  - @backstage/errors@1.2.1
+  - @backstage/types@1.1.0
+  - @backstage/plugin-catalog-common@1.0.16-next.1
+
+## 0.5.18-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config@1.1.0-next.0
+  - @backstage/backend-tasks@0.5.8-next.1
+  - @backstage/catalog-model@1.4.2-next.0
+  - @backstage/plugin-catalog-node@1.4.4-next.1
+  - @backstage/plugin-catalog-common@1.0.16-next.0
+  - @backstage/errors@1.2.1
+  - @backstage/types@1.1.0
+
+## 0.5.17-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-tasks@0.5.7-next.0
+  - @backstage/catalog-model@1.4.1
+  - @backstage/config@1.0.8
+  - @backstage/errors@1.2.1
+  - @backstage/types@1.1.0
+  - @backstage/plugin-catalog-common@1.0.15
+  - @backstage/plugin-catalog-node@1.4.3-next.0
+
+## 0.5.15
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-node@1.4.1
+  - @backstage/backend-tasks@0.5.5
+  - @backstage/catalog-model@1.4.1
+  - @backstage/config@1.0.8
+  - @backstage/errors@1.2.1
+  - @backstage/types@1.1.0
+  - @backstage/plugin-catalog-common@1.0.15
+
+## 0.5.15-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-tasks@0.5.5-next.2
+  - @backstage/plugin-catalog-node@1.4.1-next.2
+
 ## 0.5.15-next.1
 
 ### Patch Changes
diff --git a/plugins/catalog-backend-module-ldap/catalog-info.yaml b/plugins/catalog-backend-module-ldap/catalog-info.yaml
new file mode 100644
index 0000000000..b3032ca72e
--- /dev/null
+++ b/plugins/catalog-backend-module-ldap/catalog-info.yaml
@@ -0,0 +1,10 @@
+apiVersion: backstage.io/v1alpha1
+kind: Component
+metadata:
+  name: backstage-plugin-catalog-backend-module-ldap
+  title: '@backstage/plugin-catalog-backend-module-ldap'
+  description: A Backstage catalog backend module that helps integrate towards LDAP
+spec:
+  lifecycle: experimental
+  type: backstage-backend-plugin-module
+  owner: catalog-maintainers
diff --git a/plugins/catalog-backend-module-ldap/package.json b/plugins/catalog-backend-module-ldap/package.json
index 8a963923ff..158c43fcf3 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.15-next.1",
+  "version": "0.5.18-next.2",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
diff --git a/plugins/catalog-backend-module-msgraph/CHANGELOG.md b/plugins/catalog-backend-module-msgraph/CHANGELOG.md
index f2e0173a13..91a4b6f004 100644
--- a/plugins/catalog-backend-module-msgraph/CHANGELOG.md
+++ b/plugins/catalog-backend-module-msgraph/CHANGELOG.md
@@ -1,5 +1,70 @@
 # @backstage/plugin-catalog-backend-module-msgraph
 
+## 0.5.10-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config@1.1.0-next.1
+  - @backstage/backend-tasks@0.5.8-next.2
+  - @backstage/backend-common@0.19.5-next.2
+  - @backstage/plugin-catalog-node@1.4.4-next.2
+  - @backstage/backend-plugin-api@0.6.3-next.2
+  - @backstage/catalog-model@1.4.2-next.1
+  - @backstage/plugin-catalog-common@1.0.16-next.1
+
+## 0.5.10-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config@1.1.0-next.0
+  - @backstage/backend-tasks@0.5.8-next.1
+  - @backstage/backend-common@0.19.5-next.1
+  - @backstage/backend-plugin-api@0.6.3-next.1
+  - @backstage/catalog-model@1.4.2-next.0
+  - @backstage/plugin-catalog-node@1.4.4-next.1
+  - @backstage/plugin-catalog-common@1.0.16-next.0
+
+## 0.5.9-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.19.4-next.0
+  - @backstage/backend-tasks@0.5.7-next.0
+  - @backstage/backend-plugin-api@0.6.2-next.0
+  - @backstage/catalog-model@1.4.1
+  - @backstage/config@1.0.8
+  - @backstage/plugin-catalog-common@1.0.15
+  - @backstage/plugin-catalog-node@1.4.3-next.0
+
+## 0.5.7
+
+### Patch Changes
+
+- 629cbd194a87: Use `coreServices.rootConfig` instead of `coreService.config`
+- fb93323201bf: The alpha `catalogModuleMicrosoftGraphOrgEntityProvider` export no longer accepts options. Transformers are now instead configured via the `microsoftGraphOrgEntityProviderTransformExtensionPoint`.
+- 4b82382ed8c2: Fixed invalid configuration schema. The configuration schema may be more strict as a result.
+- Updated dependencies
+  - @backstage/backend-common@0.19.2
+  - @backstage/backend-plugin-api@0.6.0
+  - @backstage/plugin-catalog-node@1.4.1
+  - @backstage/backend-tasks@0.5.5
+  - @backstage/catalog-model@1.4.1
+  - @backstage/config@1.0.8
+  - @backstage/plugin-catalog-common@1.0.15
+
+## 0.5.7-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@0.6.0-next.2
+  - @backstage/backend-tasks@0.5.5-next.2
+  - @backstage/backend-common@0.19.2-next.2
+  - @backstage/plugin-catalog-node@1.4.1-next.2
+
 ## 0.5.7-next.1
 
 ### Patch Changes
diff --git a/plugins/catalog-backend-module-msgraph/alpha-api-report.md b/plugins/catalog-backend-module-msgraph/alpha-api-report.md
index 0fa093a1bc..b9c96e7798 100644
--- a/plugins/catalog-backend-module-msgraph/alpha-api-report.md
+++ b/plugins/catalog-backend-module-msgraph/alpha-api-report.md
@@ -4,20 +4,31 @@
 
 ```ts
 import { BackendFeature } from '@backstage/backend-plugin-api';
+import { ExtensionPoint } from '@backstage/backend-plugin-api';
 import { GroupTransformer } from '@backstage/plugin-catalog-backend-module-msgraph';
 import { OrganizationTransformer } from '@backstage/plugin-catalog-backend-module-msgraph';
 import { UserTransformer } from '@backstage/plugin-catalog-backend-module-msgraph';
 
 // @alpha
-export const catalogModuleMicrosoftGraphOrgEntityProvider: () => BackendFeature;
+const catalogModuleMicrosoftGraphOrgEntityProvider: () => BackendFeature;
+export default catalogModuleMicrosoftGraphOrgEntityProvider;
 
 // @alpha
-export interface CatalogModuleMicrosoftGraphOrgEntityProviderOptions {
-  groupTransformer?: GroupTransformer | Record<string, GroupTransformer>;
-  organizationTransformer?:
-    | OrganizationTransformer
-    | Record<string, OrganizationTransformer>;
-  userTransformer?: UserTransformer | Record<string, UserTransformer>;
+export const microsoftGraphOrgEntityProviderTransformExtensionPoint: ExtensionPoint<MicrosoftGraphOrgEntityProviderTransformsExtensionPoint>;
+
+// @alpha
+export interface MicrosoftGraphOrgEntityProviderTransformsExtensionPoint {
+  setGroupTransformer(
+    transformer: GroupTransformer | Record<string, GroupTransformer>,
+  ): void;
+  setOrganizationTransformer(
+    transformer:
+      | OrganizationTransformer
+      | Record<string, OrganizationTransformer>,
+  ): void;
+  setUserTransformer(
+    transformer: UserTransformer | Record<string, UserTransformer>,
+  ): void;
 }
 
 // (No @packageDocumentation comment for this package)
diff --git a/plugins/catalog-backend-module-msgraph/catalog-info.yaml b/plugins/catalog-backend-module-msgraph/catalog-info.yaml
new file mode 100644
index 0000000000..acaf5e73b9
--- /dev/null
+++ b/plugins/catalog-backend-module-msgraph/catalog-info.yaml
@@ -0,0 +1,12 @@
+apiVersion: backstage.io/v1alpha1
+kind: Component
+metadata:
+  name: backstage-plugin-catalog-backend-module-msgraph
+  title: '@backstage/plugin-catalog-backend-module-msgraph'
+  description: >-
+    A Backstage catalog backend module that helps integrate towards Microsoft
+    Graph
+spec:
+  lifecycle: experimental
+  type: backstage-backend-plugin-module
+  owner: pjungermann
diff --git a/plugins/catalog-backend-module-msgraph/package.json b/plugins/catalog-backend-module-msgraph/package.json
index 002531f141..a159b2942a 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.5.7-next.1",
+  "version": "0.5.10-next.2",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
diff --git a/plugins/catalog-backend-module-msgraph/src/alpha.ts b/plugins/catalog-backend-module-msgraph/src/alpha.ts
index c277a0a680..01a9b25f7c 100644
--- a/plugins/catalog-backend-module-msgraph/src/alpha.ts
+++ b/plugins/catalog-backend-module-msgraph/src/alpha.ts
@@ -15,3 +15,4 @@
  */
 
 export * from './module';
+export { default } from './module';
diff --git a/plugins/catalog-backend-module-msgraph/src/module/catalogModuleMicrosoftGraphOrgEntityProvider.test.ts b/plugins/catalog-backend-module-msgraph/src/module/catalogModuleMicrosoftGraphOrgEntityProvider.test.ts
index 9f1a4ead8b..d36995b1c8 100644
--- a/plugins/catalog-backend-module-msgraph/src/module/catalogModuleMicrosoftGraphOrgEntityProvider.test.ts
+++ b/plugins/catalog-backend-module-msgraph/src/module/catalogModuleMicrosoftGraphOrgEntityProvider.test.ts
@@ -14,14 +14,8 @@
  * limitations under the License.
  */
 
-import { getVoidLogger } 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 { ConfigReader } from '@backstage/config';
+import { TaskScheduleDefinition } from '@backstage/backend-tasks';
+import { mockServices, startTestBackend } from '@backstage/backend-test-utils';
 import { catalogProcessingExtensionPoint } from '@backstage/plugin-catalog-node/alpha';
 import { Duration } from 'luxon';
 import { catalogModuleMicrosoftGraphOrgEntityProvider } from './catalogModuleMicrosoftGraphOrgEntityProvider';
@@ -38,14 +32,14 @@ describe('catalogModuleMicrosoftGraphOrgEntityProvider', () => {
       },
     };
     const runner = jest.fn();
-    const scheduler = {
-      createScheduledTaskRunner: (schedule: TaskScheduleDefinition) => {
+    const scheduler = mockServices.scheduler.mock({
+      createScheduledTaskRunner(schedule) {
         usedSchedule = schedule;
-        return runner;
+        return { run: runner };
       },
-    } as unknown as PluginTaskScheduler;
+    });
 
-    const config = new ConfigReader({
+    const config = {
       catalog: {
         providers: {
           microsoftGraphOrg: {
@@ -62,16 +56,15 @@ describe('catalogModuleMicrosoftGraphOrgEntityProvider', () => {
           },
         },
       },
-    });
+    };
 
     await startTestBackend({
       extensionPoints: [[catalogProcessingExtensionPoint, extensionPoint]],
-      services: [
-        [coreServices.rootConfig, config],
-        [coreServices.logger, getVoidLogger()],
-        [coreServices.scheduler, scheduler],
+      features: [
+        catalogModuleMicrosoftGraphOrgEntityProvider(),
+        mockServices.rootConfig.factory({ data: config }),
+        scheduler.factory,
       ],
-      features: [catalogModuleMicrosoftGraphOrgEntityProvider()],
     });
 
     expect(usedSchedule?.frequency).toEqual(Duration.fromISO('PT30M'));
diff --git a/plugins/catalog-backend-module-msgraph/src/module/catalogModuleMicrosoftGraphOrgEntityProvider.ts b/plugins/catalog-backend-module-msgraph/src/module/catalogModuleMicrosoftGraphOrgEntityProvider.ts
index 2d3e1dd4d4..f13081d3c6 100644
--- a/plugins/catalog-backend-module-msgraph/src/module/catalogModuleMicrosoftGraphOrgEntityProvider.ts
+++ b/plugins/catalog-backend-module-msgraph/src/module/catalogModuleMicrosoftGraphOrgEntityProvider.ts
@@ -17,6 +17,7 @@
 import {
   coreServices,
   createBackendModule,
+  createExtensionPoint,
 } from '@backstage/backend-plugin-api';
 import { loggerToWinstonLogger } from '@backstage/backend-common';
 import { catalogProcessingExtensionPoint } from '@backstage/plugin-catalog-node/alpha';
@@ -28,32 +29,50 @@ import {
 import { MicrosoftGraphOrgEntityProvider } from '../processors';
 
 /**
- * Options for {@link catalogModuleMicrosoftGraphOrgEntityProvider}.
+ * Interface for {@link microsoftGraphOrgEntityProviderTransformExtensionPoint}.
  *
  * @alpha
  */
-export interface CatalogModuleMicrosoftGraphOrgEntityProviderOptions {
+export interface MicrosoftGraphOrgEntityProviderTransformsExtensionPoint {
   /**
-   * The function that transforms a user entry in msgraph to an entity.
+   * Set the function that transforms a user entry in msgraph to an entity.
    * Optionally, you can pass separate transformers per provider ID.
    */
-  userTransformer?: UserTransformer | Record<string, UserTransformer>;
+  setUserTransformer(
+    transformer: UserTransformer | Record<string, UserTransformer>,
+  ): void;
 
   /**
-   * The function that transforms a group entry in msgraph to an entity.
+   * Set the function that transforms a group entry in msgraph to an entity.
    * Optionally, you can pass separate transformers per provider ID.
    */
-  groupTransformer?: GroupTransformer | Record<string, GroupTransformer>;
+  setGroupTransformer(
+    transformer: GroupTransformer | Record<string, GroupTransformer>,
+  ): void;
 
   /**
-   * The function that transforms an organization entry in msgraph to an entity.
+   * Set the function that transforms an organization entry in msgraph to an entity.
    * Optionally, you can pass separate transformers per provider ID.
    */
-  organizationTransformer?:
-    | OrganizationTransformer
-    | Record<string, OrganizationTransformer>;
+  setOrganizationTransformer(
+    transformer:
+      | OrganizationTransformer
+      | Record<string, OrganizationTransformer>,
+  ): void;
 }
 
+/**
+ * Extension point used to customize the transforms used by the module.
+ *
+ * @alpha
+ */
+export const microsoftGraphOrgEntityProviderTransformExtensionPoint =
+  createExtensionPoint<MicrosoftGraphOrgEntityProviderTransformsExtensionPoint>(
+    {
+      id: 'catalog.microsoftGraphOrgEntityProvider.transforms',
+    },
+  );
+
 /**
  * Registers the MicrosoftGraphOrgEntityProvider with the catalog processing extension point.
  *
@@ -63,10 +82,44 @@ export const catalogModuleMicrosoftGraphOrgEntityProvider = createBackendModule(
   {
     pluginId: 'catalog',
     moduleId: 'microsoftGraphOrgEntityProvider',
-    register(
-      env,
-      options?: CatalogModuleMicrosoftGraphOrgEntityProviderOptions,
-    ) {
+    register(env) {
+      let userTransformer:
+        | UserTransformer
+        | Record<string, UserTransformer>
+        | undefined;
+      let groupTransformer:
+        | GroupTransformer
+        | Record<string, GroupTransformer>
+        | undefined;
+      let organizationTransformer:
+        | OrganizationTransformer
+        | Record<string, OrganizationTransformer>
+        | undefined;
+
+      env.registerExtensionPoint(
+        microsoftGraphOrgEntityProviderTransformExtensionPoint,
+        {
+          setUserTransformer(transformer) {
+            if (userTransformer) {
+              throw new Error('User transformer may only be set once');
+            }
+            userTransformer = transformer;
+          },
+          setGroupTransformer(transformer) {
+            if (groupTransformer) {
+              throw new Error('Group transformer may only be set once');
+            }
+            groupTransformer = transformer;
+          },
+          setOrganizationTransformer(transformer) {
+            if (organizationTransformer) {
+              throw new Error('Organization transformer may only be set once');
+            }
+            organizationTransformer = transformer;
+          },
+        },
+      );
+
       env.registerInit({
         deps: {
           catalog: catalogProcessingExtensionPoint,
@@ -77,11 +130,11 @@ export const catalogModuleMicrosoftGraphOrgEntityProvider = createBackendModule(
         async init({ catalog, config, logger, scheduler }) {
           catalog.addEntityProvider(
             MicrosoftGraphOrgEntityProvider.fromConfig(config, {
-              groupTransformer: options?.groupTransformer,
               logger: loggerToWinstonLogger(logger),
-              organizationTransformer: options?.organizationTransformer,
               scheduler,
-              userTransformer: options?.userTransformer,
+              userTransformer: userTransformer,
+              groupTransformer: groupTransformer,
+              organizationTransformer: organizationTransformer,
             }),
           );
         },
diff --git a/plugins/catalog-backend-module-msgraph/src/module/index.ts b/plugins/catalog-backend-module-msgraph/src/module/index.ts
index f53f41141c..9b92588297 100644
--- a/plugins/catalog-backend-module-msgraph/src/module/index.ts
+++ b/plugins/catalog-backend-module-msgraph/src/module/index.ts
@@ -14,5 +14,8 @@
  * limitations under the License.
  */
 
-export { catalogModuleMicrosoftGraphOrgEntityProvider } from './catalogModuleMicrosoftGraphOrgEntityProvider';
-export type { CatalogModuleMicrosoftGraphOrgEntityProviderOptions } from './catalogModuleMicrosoftGraphOrgEntityProvider';
+export {
+  catalogModuleMicrosoftGraphOrgEntityProvider as default,
+  microsoftGraphOrgEntityProviderTransformExtensionPoint,
+  type MicrosoftGraphOrgEntityProviderTransformsExtensionPoint,
+} from './catalogModuleMicrosoftGraphOrgEntityProvider';
diff --git a/plugins/catalog-backend-module-openapi/CHANGELOG.md b/plugins/catalog-backend-module-openapi/CHANGELOG.md
index 1e63a1193d..0ea9fc4edf 100644
--- a/plugins/catalog-backend-module-openapi/CHANGELOG.md
+++ b/plugins/catalog-backend-module-openapi/CHANGELOG.md
@@ -1,5 +1,70 @@
 # @backstage/plugin-catalog-backend-module-openapi
 
+## 0.1.19-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-backend@1.13.0-next.2
+  - @backstage/config@1.1.0-next.1
+  - @backstage/backend-common@0.19.5-next.2
+  - @backstage/plugin-catalog-node@1.4.4-next.2
+  - @backstage/integration@1.7.0-next.2
+  - @backstage/catalog-model@1.4.2-next.1
+  - @backstage/types@1.1.0
+  - @backstage/plugin-catalog-common@1.0.16-next.1
+
+## 0.1.19-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-backend@1.13.0-next.1
+  - @backstage/config@1.1.0-next.0
+  - @backstage/integration@1.7.0-next.1
+  - @backstage/backend-common@0.19.5-next.1
+  - @backstage/catalog-model@1.4.2-next.0
+  - @backstage/plugin-catalog-node@1.4.4-next.1
+  - @backstage/plugin-catalog-common@1.0.16-next.0
+  - @backstage/types@1.1.0
+
+## 0.1.16-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-backend@1.12.2-next.0
+  - @backstage/backend-common@0.19.4-next.0
+  - @backstage/integration@1.7.0-next.0
+  - @backstage/catalog-model@1.4.1
+  - @backstage/config@1.0.8
+  - @backstage/types@1.1.0
+  - @backstage/plugin-catalog-common@1.0.15
+  - @backstage/plugin-catalog-node@1.4.3-next.0
+
+## 0.1.14
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.19.2
+  - @backstage/plugin-catalog-backend@1.12.0
+  - @backstage/plugin-catalog-node@1.4.1
+  - @backstage/integration@1.6.0
+  - @backstage/catalog-model@1.4.1
+  - @backstage/config@1.0.8
+  - @backstage/types@1.1.0
+  - @backstage/plugin-catalog-common@1.0.15
+
+## 0.1.14-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-backend@1.12.0-next.2
+  - @backstage/backend-common@0.19.2-next.2
+  - @backstage/plugin-catalog-node@1.4.1-next.2
+
 ## 0.1.14-next.1
 
 ### Patch Changes
diff --git a/plugins/catalog-backend-module-openapi/catalog-info.yaml b/plugins/catalog-backend-module-openapi/catalog-info.yaml
new file mode 100644
index 0000000000..507bf555db
--- /dev/null
+++ b/plugins/catalog-backend-module-openapi/catalog-info.yaml
@@ -0,0 +1,10 @@
+apiVersion: backstage.io/v1alpha1
+kind: Component
+metadata:
+  name: backstage-plugin-catalog-backend-module-openapi
+  title: '@backstage/plugin-catalog-backend-module-openapi'
+  description: A Backstage catalog backend module that helps with OpenAPI specifications
+spec:
+  lifecycle: experimental
+  type: backstage-backend-plugin-module
+  owner: catalog-maintainers
diff --git a/plugins/catalog-backend-module-openapi/package.json b/plugins/catalog-backend-module-openapi/package.json
index 13f0305cae..9c182234c6 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.14-next.1",
+  "version": "0.1.19-next.2",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
diff --git a/plugins/catalog-backend-module-puppetdb/CHANGELOG.md b/plugins/catalog-backend-module-puppetdb/CHANGELOG.md
index 8d86cc9c2f..0137c41830 100644
--- a/plugins/catalog-backend-module-puppetdb/CHANGELOG.md
+++ b/plugins/catalog-backend-module-puppetdb/CHANGELOG.md
@@ -1,5 +1,73 @@
 # @backstage/plugin-catalog-backend-module-puppetdb
 
+## 0.1.8-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config@1.1.0-next.1
+  - @backstage/backend-tasks@0.5.8-next.2
+  - @backstage/backend-common@0.19.5-next.2
+  - @backstage/plugin-catalog-node@1.4.4-next.2
+  - @backstage/backend-plugin-api@0.6.3-next.2
+  - @backstage/catalog-model@1.4.2-next.1
+  - @backstage/errors@1.2.1
+  - @backstage/types@1.1.0
+
+## 0.1.8-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config@1.1.0-next.0
+  - @backstage/backend-tasks@0.5.8-next.1
+  - @backstage/backend-common@0.19.5-next.1
+  - @backstage/backend-plugin-api@0.6.3-next.1
+  - @backstage/catalog-model@1.4.2-next.0
+  - @backstage/plugin-catalog-node@1.4.4-next.1
+  - @backstage/errors@1.2.1
+  - @backstage/types@1.1.0
+
+## 0.1.7-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.19.4-next.0
+  - @backstage/backend-tasks@0.5.7-next.0
+  - @backstage/backend-plugin-api@0.6.2-next.0
+  - @backstage/catalog-model@1.4.1
+  - @backstage/config@1.0.8
+  - @backstage/errors@1.2.1
+  - @backstage/types@1.1.0
+  - @backstage/plugin-catalog-node@1.4.3-next.0
+
+## 0.1.5
+
+### Patch Changes
+
+- 629cbd194a87: Use `coreServices.rootConfig` instead of `coreService.config`
+- 4b82382ed8c2: Fixed invalid configuration schema. The configuration schema may be more strict as a result.
+- Updated dependencies
+  - @backstage/backend-common@0.19.2
+  - @backstage/backend-plugin-api@0.6.0
+  - @backstage/plugin-catalog-node@1.4.1
+  - @backstage/backend-tasks@0.5.5
+  - @backstage/catalog-model@1.4.1
+  - @backstage/config@1.0.8
+  - @backstage/errors@1.2.1
+  - @backstage/types@1.1.0
+
+## 0.1.5-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@0.6.0-next.2
+  - @backstage/backend-tasks@0.5.5-next.2
+  - @backstage/backend-common@0.19.2-next.2
+  - @backstage/plugin-catalog-node@1.4.1-next.2
+
 ## 0.1.5-next.1
 
 ### Patch Changes
diff --git a/plugins/catalog-backend-module-puppetdb/alpha-api-report.md b/plugins/catalog-backend-module-puppetdb/alpha-api-report.md
index 0856fdb836..2f3921012a 100644
--- a/plugins/catalog-backend-module-puppetdb/alpha-api-report.md
+++ b/plugins/catalog-backend-module-puppetdb/alpha-api-report.md
@@ -6,7 +6,8 @@
 import { BackendFeature } from '@backstage/backend-plugin-api';
 
 // @alpha
-export const catalogModulePuppetDbEntityProvider: () => BackendFeature;
+const catalogModulePuppetDbEntityProvider: () => BackendFeature;
+export default catalogModulePuppetDbEntityProvider;
 
 // (No @packageDocumentation comment for this package)
 ```
diff --git a/plugins/catalog-backend-module-puppetdb/catalog-info.yaml b/plugins/catalog-backend-module-puppetdb/catalog-info.yaml
new file mode 100644
index 0000000000..11021ea68f
--- /dev/null
+++ b/plugins/catalog-backend-module-puppetdb/catalog-info.yaml
@@ -0,0 +1,10 @@
+apiVersion: backstage.io/v1alpha1
+kind: Component
+metadata:
+  name: backstage-plugin-catalog-backend-module-puppetdb
+  title: '@backstage/plugin-catalog-backend-module-puppetdb'
+  description: A Backstage catalog backend module that helps integrate towards PuppetDB
+spec:
+  lifecycle: experimental
+  type: backstage-backend-plugin-module
+  owner: catalog-maintainers
diff --git a/plugins/catalog-backend-module-puppetdb/package.json b/plugins/catalog-backend-module-puppetdb/package.json
index d17b788737..9e830c0902 100644
--- a/plugins/catalog-backend-module-puppetdb/package.json
+++ b/plugins/catalog-backend-module-puppetdb/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@backstage/plugin-catalog-backend-module-puppetdb",
   "description": "A Backstage catalog backend module that helps integrate towards PuppetDB",
-  "version": "0.1.5-next.1",
+  "version": "0.1.8-next.2",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
diff --git a/plugins/catalog-backend-module-puppetdb/src/alpha.ts b/plugins/catalog-backend-module-puppetdb/src/alpha.ts
index c277a0a680..01a9b25f7c 100644
--- a/plugins/catalog-backend-module-puppetdb/src/alpha.ts
+++ b/plugins/catalog-backend-module-puppetdb/src/alpha.ts
@@ -15,3 +15,4 @@
  */
 
 export * from './module';
+export { default } from './module';
diff --git a/plugins/catalog-backend-module-puppetdb/src/module/catalogModulePuppetDbEntityProvider.test.ts b/plugins/catalog-backend-module-puppetdb/src/module/catalogModulePuppetDbEntityProvider.test.ts
index c167035917..f931b2c741 100644
--- a/plugins/catalog-backend-module-puppetdb/src/module/catalogModulePuppetDbEntityProvider.test.ts
+++ b/plugins/catalog-backend-module-puppetdb/src/module/catalogModulePuppetDbEntityProvider.test.ts
@@ -14,14 +14,8 @@
  * limitations under the License.
  */
 
-import { getVoidLogger } 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 { ConfigReader } from '@backstage/config';
+import { TaskScheduleDefinition } from '@backstage/backend-tasks';
+import { mockServices, startTestBackend } from '@backstage/backend-test-utils';
 import { catalogProcessingExtensionPoint } from '@backstage/plugin-catalog-node/alpha';
 import { catalogModulePuppetDbEntityProvider } from './catalogModulePuppetDbEntityProvider';
 import { PuppetDbEntityProvider } from '../providers/PuppetDbEntityProvider';
@@ -37,14 +31,14 @@ describe('catalogModulePuppetDbEntityProvider', () => {
       },
     };
     const runner = jest.fn();
-    const scheduler = {
-      createScheduledTaskRunner: (schedule: TaskScheduleDefinition) => {
+    const scheduler = mockServices.scheduler.mock({
+      createScheduledTaskRunner(schedule) {
         usedSchedule = schedule;
-        return runner;
+        return { run: runner };
       },
-    } as unknown as PluginTaskScheduler;
+    });
 
-    const config = new ConfigReader({
+    const config = {
       catalog: {
         providers: {
           puppetdb: {
@@ -56,16 +50,15 @@ describe('catalogModulePuppetDbEntityProvider', () => {
           },
         },
       },
-    });
+    };
 
     await startTestBackend({
       extensionPoints: [[catalogProcessingExtensionPoint, extensionPoint]],
-      services: [
-        [coreServices.rootConfig, config],
-        [coreServices.logger, getVoidLogger()],
-        [coreServices.scheduler, scheduler],
+      features: [
+        catalogModulePuppetDbEntityProvider(),
+        mockServices.rootConfig.factory({ data: config }),
+        scheduler.factory,
       ],
-      features: [catalogModulePuppetDbEntityProvider()],
     });
 
     expect(usedSchedule?.frequency).toEqual({ minutes: 10 });
diff --git a/plugins/catalog-backend-module-puppetdb/src/module/index.ts b/plugins/catalog-backend-module-puppetdb/src/module/index.ts
index f30f236df4..21dc43561d 100644
--- a/plugins/catalog-backend-module-puppetdb/src/module/index.ts
+++ b/plugins/catalog-backend-module-puppetdb/src/module/index.ts
@@ -14,4 +14,4 @@
  * limitations under the License.
  */
 
-export { catalogModulePuppetDbEntityProvider } from './catalogModulePuppetDbEntityProvider';
+export { catalogModulePuppetDbEntityProvider as default } from './catalogModulePuppetDbEntityProvider';
diff --git a/plugins/catalog-backend-module-unprocessed/CHANGELOG.md b/plugins/catalog-backend-module-unprocessed/CHANGELOG.md
index 0e4ac7a0e2..cc800f60a5 100644
--- a/plugins/catalog-backend-module-unprocessed/CHANGELOG.md
+++ b/plugins/catalog-backend-module-unprocessed/CHANGELOG.md
@@ -1,5 +1,54 @@
 # @backstage/plugin-catalog-backend-module-unprocessed
 
+## 0.2.3-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-auth-node@0.3.0-next.2
+  - @backstage/backend-plugin-api@0.6.3-next.2
+  - @backstage/catalog-model@1.4.2-next.1
+
+## 0.2.3-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@0.6.3-next.1
+  - @backstage/catalog-model@1.4.2-next.0
+  - @backstage/plugin-auth-node@0.3.0-next.1
+
+## 0.2.2-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-auth-node@0.3.0-next.0
+  - @backstage/backend-plugin-api@0.6.2-next.0
+  - @backstage/catalog-model@1.4.1
+
+## 0.2.0
+
+### Minor Changes
+
+- 5156a94c2e2a: **BREAKING**: Fixing typo in exported module. You will have to rename the import to the correct spelling. `UnprocessedEntites` -> `UnprocessedEntities`
+
+### Patch Changes
+
+- 12a8c94eda8d: Add package repository and homepage metadata
+- Updated dependencies
+  - @backstage/backend-plugin-api@0.6.0
+  - @backstage/plugin-auth-node@0.2.17
+  - @backstage/catalog-model@1.4.1
+
+## 0.2.0-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@0.6.0-next.2
+  - @backstage/plugin-auth-node@0.2.17-next.2
+
 ## 0.2.0-next.1
 
 ### Patch Changes
diff --git a/plugins/catalog-backend-module-unprocessed/api-report.md b/plugins/catalog-backend-module-unprocessed/api-report.md
index 7fd7119276..6e5e4f843b 100644
--- a/plugins/catalog-backend-module-unprocessed/api-report.md
+++ b/plugins/catalog-backend-module-unprocessed/api-report.md
@@ -8,7 +8,8 @@ import { HttpRouterService } from '@backstage/backend-plugin-api';
 import { Knex } from 'knex';
 
 // @public
-export const catalogModuleUnprocessedEntities: () => BackendFeature;
+const catalogModuleUnprocessedEntities: () => BackendFeature;
+export default catalogModuleUnprocessedEntities;
 
 // @public
 export class UnprocessedEntitiesModule {
diff --git a/plugins/catalog-backend-module-unprocessed/catalog-info.yaml b/plugins/catalog-backend-module-unprocessed/catalog-info.yaml
new file mode 100644
index 0000000000..a889859494
--- /dev/null
+++ b/plugins/catalog-backend-module-unprocessed/catalog-info.yaml
@@ -0,0 +1,10 @@
+apiVersion: backstage.io/v1alpha1
+kind: Component
+metadata:
+  name: backstage-plugin-catalog-backend-module-unprocessed
+  title: '@backstage/plugin-catalog-backend-module-unprocessed'
+  description: Backstage Catalog module to view unprocessed entities
+spec:
+  lifecycle: experimental
+  type: backstage-backend-plugin-module
+  owner: catalog-maintainers
diff --git a/plugins/catalog-backend-module-unprocessed/package.json b/plugins/catalog-backend-module-unprocessed/package.json
index 6052015439..6d0e25107e 100644
--- a/plugins/catalog-backend-module-unprocessed/package.json
+++ b/plugins/catalog-backend-module-unprocessed/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@backstage/plugin-catalog-backend-module-unprocessed",
   "description": "Backstage Catalog module to view unprocessed entities",
-  "version": "0.2.0-next.1",
+  "version": "0.2.3-next.2",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
diff --git a/plugins/catalog-backend-module-unprocessed/src/index.ts b/plugins/catalog-backend-module-unprocessed/src/index.ts
index 21cb2dbcd6..20132d9b27 100644
--- a/plugins/catalog-backend-module-unprocessed/src/index.ts
+++ b/plugins/catalog-backend-module-unprocessed/src/index.ts
@@ -20,5 +20,5 @@
  * @packageDocumentation
  */
 
-export * from './module';
+export { catalogModuleUnprocessedEntities as default } from './module';
 export * from './UnprocessedEntitiesModule';
diff --git a/plugins/catalog-backend/CHANGELOG.md b/plugins/catalog-backend/CHANGELOG.md
index cedbc1ed08..cfc1bc40f4 100644
--- a/plugins/catalog-backend/CHANGELOG.md
+++ b/plugins/catalog-backend/CHANGELOG.md
@@ -1,5 +1,146 @@
 # @backstage/plugin-catalog-backend
 
+## 1.13.0-next.2
+
+### Patch Changes
+
+- acffa17027b6: Added some examples to the catalog OpenAPI definition
+- 45947d3b2759: Fixes an issue where `order` was not a recognized parameter for the `/entities` endpoint.
+- 814feeed7343: Update to handle invalid luxon values
+- Updated dependencies
+  - @backstage/config@1.1.0-next.1
+  - @backstage/backend-tasks@0.5.8-next.2
+  - @backstage/backend-common@0.19.5-next.2
+  - @backstage/plugin-auth-node@0.3.0-next.2
+  - @backstage/plugin-catalog-node@1.4.4-next.2
+  - @backstage/plugin-permission-node@0.7.14-next.2
+  - @backstage/plugin-search-backend-module-catalog@0.1.7-next.2
+  - @backstage/integration@1.7.0-next.2
+  - @backstage/backend-plugin-api@0.6.3-next.2
+  - @backstage/catalog-model@1.4.2-next.1
+  - @backstage/plugin-permission-common@0.7.8-next.1
+  - @backstage/backend-openapi-utils@0.0.3
+  - @backstage/catalog-client@1.4.4-next.1
+  - @backstage/errors@1.2.1
+  - @backstage/types@1.1.0
+  - @backstage/plugin-catalog-common@1.0.16-next.1
+  - @backstage/plugin-events-node@0.2.12-next.2
+  - @backstage/plugin-scaffolder-common@1.4.1-next.1
+  - @backstage/plugin-search-common@1.2.6-next.1
+
+## 1.13.0-next.1
+
+### Minor Changes
+
+- 62f448edb0b5: Allow configuring the processing interval in your app-config, under the `catalog.processingInterval` key.
+
+### Patch Changes
+
+- 1fd2109739c1: Changed the processing loop task pipeline implementation from recursive to iterative
+- 0f8a97777489: Update OpenAPI schema to relax the encoding validation of all request parameters.
+- 2d32d8a611e3: Fixed validation of the `fullTextFilterFields` query parameter.
+- 618257f3e413: Fix issue with `catalogFileName` not being a required property for `/analyze-location`
+- Updated dependencies
+  - @backstage/config@1.1.0-next.0
+  - @backstage/integration@1.7.0-next.1
+  - @backstage/backend-tasks@0.5.8-next.1
+  - @backstage/backend-common@0.19.5-next.1
+  - @backstage/backend-plugin-api@0.6.3-next.1
+  - @backstage/catalog-model@1.4.2-next.0
+  - @backstage/plugin-auth-node@0.3.0-next.1
+  - @backstage/plugin-permission-common@0.7.8-next.0
+  - @backstage/plugin-permission-node@0.7.14-next.1
+  - @backstage/plugin-search-backend-module-catalog@0.1.7-next.1
+  - @backstage/plugin-catalog-node@1.4.4-next.1
+  - @backstage/plugin-events-node@0.2.12-next.1
+  - @backstage/catalog-client@1.4.4-next.0
+  - @backstage/plugin-catalog-common@1.0.16-next.0
+  - @backstage/plugin-scaffolder-common@1.4.1-next.0
+  - @backstage/backend-openapi-utils@0.0.3
+  - @backstage/errors@1.2.1
+  - @backstage/types@1.1.0
+  - @backstage/plugin-search-common@1.2.6-next.0
+
+## 1.12.2-next.0
+
+### Patch Changes
+
+- 149361e81622: Fix to the `limit` parameter on entity queries.
+- 0198aa596fd9: Fixed a link to the frontend Backstage plugin that had pointed to itself.
+- 41d1b2d628ea: Fix OpenAPI schema for the facets endpoint
+- cfc3ca6ce060: Changes needed to support MySQL
+- Updated dependencies
+  - @backstage/plugin-auth-node@0.3.0-next.0
+  - @backstage/backend-common@0.19.4-next.0
+  - @backstage/integration@1.7.0-next.0
+  - @backstage/backend-tasks@0.5.7-next.0
+  - @backstage/backend-openapi-utils@0.0.3
+  - @backstage/backend-plugin-api@0.6.2-next.0
+  - @backstage/catalog-client@1.4.3
+  - @backstage/catalog-model@1.4.1
+  - @backstage/config@1.0.8
+  - @backstage/errors@1.2.1
+  - @backstage/types@1.1.0
+  - @backstage/plugin-catalog-common@1.0.15
+  - @backstage/plugin-catalog-node@1.4.3-next.0
+  - @backstage/plugin-events-node@0.2.11-next.0
+  - @backstage/plugin-permission-common@0.7.7
+  - @backstage/plugin-permission-node@0.7.13-next.0
+  - @backstage/plugin-scaffolder-common@1.4.0
+  - @backstage/plugin-search-backend-module-catalog@0.1.6-next.0
+  - @backstage/plugin-search-common@1.2.5
+
+## 1.12.0
+
+### Minor Changes
+
+- b8cccd8ee858: Support configuring applicable kinds for `AnnotateScmSlugEntityProcessor`
+- f32252cdf631: Added OpenTelemetry spans for catalog processing
+- ebeb77586975: Now performs request validation based on OpenAPI schema through `@backstage/backend-openapi-utils`. Error responses for invalid input, like `"a"` instead of a number, may have changed.
+
+### Patch Changes
+
+- 629cbd194a87: Use `coreServices.rootConfig` instead of `coreService.config`
+- b8d6b22acd57: Internal refactor for load test
+- Updated dependencies
+  - @backstage/plugin-search-backend-module-catalog@0.1.4
+  - @backstage/backend-common@0.19.2
+  - @backstage/backend-plugin-api@0.6.0
+  - @backstage/backend-openapi-utils@0.0.3
+  - @backstage/plugin-catalog-node@1.4.1
+  - @backstage/plugin-events-node@0.2.9
+  - @backstage/plugin-auth-node@0.2.17
+  - @backstage/integration@1.6.0
+  - @backstage/backend-tasks@0.5.5
+  - @backstage/plugin-scaffolder-common@1.4.0
+  - @backstage/plugin-permission-node@0.7.11
+  - @backstage/catalog-client@1.4.3
+  - @backstage/catalog-model@1.4.1
+  - @backstage/config@1.0.8
+  - @backstage/errors@1.2.1
+  - @backstage/types@1.1.0
+  - @backstage/plugin-catalog-common@1.0.15
+  - @backstage/plugin-permission-common@0.7.7
+  - @backstage/plugin-search-common@1.2.5
+
+## 1.12.0-next.2
+
+### Minor Changes
+
+- b8cccd8ee858: Support configuring applicable kinds for `AnnotateScmSlugEntityProcessor`
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-search-backend-module-catalog@0.1.4-next.2
+  - @backstage/backend-plugin-api@0.6.0-next.2
+  - @backstage/backend-tasks@0.5.5-next.2
+  - @backstage/backend-common@0.19.2-next.2
+  - @backstage/plugin-catalog-node@1.4.1-next.2
+  - @backstage/plugin-events-node@0.2.9-next.2
+  - @backstage/plugin-permission-node@0.7.11-next.2
+  - @backstage/plugin-auth-node@0.2.17-next.2
+
 ## 1.12.0-next.1
 
 ### Minor Changes
diff --git a/plugins/catalog-backend/README.md b/plugins/catalog-backend/README.md
index 1e2bce3142..cd921499d3 100644
--- a/plugins/catalog-backend/README.md
+++ b/plugins/catalog-backend/README.md
@@ -86,5 +86,5 @@ some example entities.
 
 ## Links
 
-- [catalog](https://github.com/backstage/backstage/tree/master/plugins/catalog-backend)
+- [catalog](https://github.com/backstage/backstage/tree/master/plugins/catalog)
   is the frontend interface for this plugin.
diff --git a/plugins/catalog-backend/alpha-api-report.md b/plugins/catalog-backend/alpha-api-report.md
index df3e809ade..ff826508b2 100644
--- a/plugins/catalog-backend/alpha-api-report.md
+++ b/plugins/catalog-backend/alpha-api-report.md
@@ -74,7 +74,8 @@ export type CatalogPermissionRule<
 > = PermissionRule<Entity, EntitiesSearchFilter, 'catalog-entity', TParams>;
 
 // @alpha
-export const catalogPlugin: () => BackendFeature;
+const catalogPlugin: () => BackendFeature;
+export default catalogPlugin;
 
 // @alpha
 export const createCatalogConditionalDecision: (
diff --git a/plugins/catalog-backend/catalog-info.yaml b/plugins/catalog-backend/catalog-info.yaml
new file mode 100644
index 0000000000..b94d3b458a
--- /dev/null
+++ b/plugins/catalog-backend/catalog-info.yaml
@@ -0,0 +1,10 @@
+apiVersion: backstage.io/v1alpha1
+kind: Component
+metadata:
+  name: backstage-plugin-catalog-backend
+  title: '@backstage/plugin-catalog-backend'
+  description: The Backstage backend plugin that provides the Backstage catalog
+spec:
+  lifecycle: production
+  type: backstage-backend-plugin
+  owner: catalog-maintainers
diff --git a/plugins/catalog-backend/config.d.ts b/plugins/catalog-backend/config.d.ts
index 03e47f8e61..4b9f606043 100644
--- a/plugins/catalog-backend/config.d.ts
+++ b/plugins/catalog-backend/config.d.ts
@@ -14,6 +14,8 @@
  * limitations under the License.
  */
 
+import { HumanDuration } from '@backstage/types';
+
 export interface Config {
   /**
    * Configuration options for the catalog plugin.
@@ -142,5 +144,30 @@ export interface Config {
      * "keep".
      */
     orphanStrategy?: 'keep' | 'delete';
+
+    /**
+     * The interval at which the catalog should process its entities.
+     *
+     * @remarks
+     *
+     * Example:
+     *
+     * ```yaml
+     * catalog:
+     *   processingInterval: { minutes: 30 }
+     * ```
+     *
+     * Note that this is only a suggested minimum, and the actual interval may
+     * be longer. Internally, the catalog will scale up this number by a small
+     * factor and choose random numbers in that range to spread out the load. If
+     * the catalog is overloaded and cannot process all entities during the
+     * interval, the time taken between processing runs of any given entity may
+     * also be longer than specified here.
+     *
+     * Setting this value too low risks exhausting rate limits on external
+     * systems that are queried by processors, such as version control systems
+     * housing catalog-info files.
+     */
+    processingInterval?: HumanDuration;
   };
 }
diff --git a/plugins/catalog-backend/migrations/20210302150147_refresh_state.js b/plugins/catalog-backend/migrations/20210302150147_refresh_state.js
index 1c8081c0ef..f600667727 100644
--- a/plugins/catalog-backend/migrations/20210302150147_refresh_state.js
+++ b/plugins/catalog-backend/migrations/20210302150147_refresh_state.js
@@ -37,7 +37,7 @@ exports.up = async function up(knex) {
       .notNullable()
       .comment('The unprocessed entity (in original form) as JSON');
     table
-      .text('processed_entity')
+      .text('processed_entity', 'longtext')
       .nullable()
       .comment('The processed entity (not yet stitched) as JSON');
     table
@@ -83,7 +83,7 @@ exports.up = async function up(knex) {
       .notNullable()
       .comment('Random value representing a unique stitch attempt ticket');
     table
-      .text('final_entity')
+      .text('final_entity', 'longtext')
       .nullable()
       .comment('The JSON encoded final entity');
     table.index('entity_id', 'final_entities_entity_id_idx');
diff --git a/plugins/catalog-backend/package.json b/plugins/catalog-backend/package.json
index 2fee3c3a46..3e13c4948f 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.12.0-next.1",
+  "version": "1.13.0-next.2",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
diff --git a/plugins/catalog-backend/src/alpha.ts b/plugins/catalog-backend/src/alpha.ts
index c90f4d1cdf..06c9571bfa 100644
--- a/plugins/catalog-backend/src/alpha.ts
+++ b/plugins/catalog-backend/src/alpha.ts
@@ -21,4 +21,4 @@ import type { EntitiesSearchFilter } from './catalog/types';
 export type { /** @alpha */ EntitiesSearchFilter };
 
 export * from './permissions';
-export { catalogPlugin } from './service/CatalogPlugin';
+export { catalogPlugin as default } from './service/CatalogPlugin';
diff --git a/plugins/catalog-backend/src/database/DefaultProcessingDatabase.ts b/plugins/catalog-backend/src/database/DefaultProcessingDatabase.ts
index 4959a33eef..01025f73dd 100644
--- a/plugins/catalog-backend/src/database/DefaultProcessingDatabase.ts
+++ b/plugins/catalog-backend/src/database/DefaultProcessingDatabase.ts
@@ -138,6 +138,7 @@ export class DefaultProcessingDatabase implements ProcessingDatabase {
         type,
       }),
     );
+
     await tx.batchInsert(
       'relations',
       this.deduplicateRelations(relationRows),
@@ -374,7 +375,7 @@ export class DefaultProcessingDatabase implements ProcessingDatabase {
               entityRef,
               newLocationKey: locationKey,
               existingLocationKey: conflictingKey,
-              lastConflictAt: DateTime.now().toISO(),
+              lastConflictAt: DateTime.now().toISO()!,
             },
           };
           await this.options.eventBroker?.publish(eventParams);
diff --git a/plugins/catalog-backend/src/index.ts b/plugins/catalog-backend/src/index.ts
index 345102adcd..55c1c672d3 100644
--- a/plugins/catalog-backend/src/index.ts
+++ b/plugins/catalog-backend/src/index.ts
@@ -36,13 +36,13 @@ import {
 
 /**
  * @public
- * @deprecated import from `@backstage/search-backend-module-catalog` instead
+ * @deprecated import from `@backstage/plugin-search-backend-module-catalog` instead
  */
 export const DefaultCatalogCollatorFactory = _DefaultCatalogCollatorFactory;
 
 /**
  * @public
- * @deprecated import from `@backstage/search-backend-module-catalog` instead
+ * @deprecated import from `@backstage/plugin-search-backend-module-catalog` instead
  */
 export const defaultCatalogCollatorEntityTransformer =
   _defaultCatalogCollatorEntityTransformer;
@@ -54,14 +54,14 @@ import type {
 
 /**
  * @public
- * @deprecated import from `@backstage/search-backend-module-catalog` instead
+ * @deprecated import from `@backstage/plugin-search-backend-module-catalog` instead
  */
 export type DefaultCatalogCollatorFactoryOptions =
   _DefaultCatalogCollatorFactoryOptions;
 
 /**
  * @public
- * @deprecated import from `@backstage/search-backend-module-catalog` instead
+ * @deprecated import from `@backstage/plugin-search-backend-module-catalog` instead
  */
 export type CatalogCollatorEntityTransformer =
   _CatalogCollatorEntityTransformer;
diff --git a/plugins/catalog-backend/src/processing/TaskPipeline.test.ts b/plugins/catalog-backend/src/processing/TaskPipeline.test.ts
index f814e8a608..43ec118bdb 100644
--- a/plugins/catalog-backend/src/processing/TaskPipeline.test.ts
+++ b/plugins/catalog-backend/src/processing/TaskPipeline.test.ts
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-import { startTaskPipeline } from './TaskPipeline';
+import { startTaskPipeline, createBarrier } from './TaskPipeline';
 
 function createLimitedLoader(count: number, loadDelay?: number) {
   const items = new Array(count).fill(0).map((_, index) => index);
@@ -119,3 +119,88 @@ describe('startTaskPipeline', () => {
     }).toThrow('must be lower');
   });
 });
+
+describe('createBarrier', () => {
+  const tick = (millis: number) =>
+    new Promise(resolve => setTimeout(resolve, millis));
+
+  it('abandons a wait after the timeout expires', async () => {
+    const abortController = new AbortController();
+    const signal = abortController.signal;
+    const barrier = createBarrier({ waitTimeoutMillis: 100, signal });
+
+    const fn1 = jest.fn();
+    barrier.wait().then(fn1);
+
+    await tick(0);
+    expect(fn1).not.toHaveBeenCalled();
+
+    await tick(50);
+    expect(fn1).not.toHaveBeenCalled();
+
+    // start a new wait mid-way through the timeout
+    // should NOT resolve when the first one times out
+    const fn2 = jest.fn();
+    barrier.wait().then(fn2);
+
+    await tick(0);
+    expect(fn2).not.toHaveBeenCalled();
+
+    await tick(50);
+    expect(fn1).toHaveBeenCalledTimes(1);
+    expect(fn2).not.toHaveBeenCalled();
+
+    await tick(50);
+    expect(fn1).toHaveBeenCalledTimes(1);
+    expect(fn2).toHaveBeenCalledTimes(1);
+  });
+
+  it('abandons a wait after aborted', async () => {
+    const abortController = new AbortController();
+    const signal = abortController.signal;
+    const barrier = createBarrier({ waitTimeoutMillis: 100, signal });
+
+    const fn1 = jest.fn();
+    barrier.wait().then(fn1);
+
+    // should resolve immediately, not after timeout
+    await tick(0);
+    expect(fn1).not.toHaveBeenCalled();
+    abortController.abort();
+    await tick(0);
+    expect(fn1).toHaveBeenCalledTimes(1);
+
+    // subsequent waits should be immediate no matter what
+    const fn2 = jest.fn();
+    barrier.wait().then(fn2);
+    await tick(0);
+    expect(fn2).toHaveBeenCalledTimes(1);
+  });
+
+  it('release immediately unblocks all waits', async () => {
+    const abortController = new AbortController();
+    const signal = abortController.signal;
+    const barrier = createBarrier({ waitTimeoutMillis: 100, signal });
+
+    const fn1 = jest.fn();
+    barrier.wait().then(fn1);
+
+    await tick(50);
+    expect(fn1).not.toHaveBeenCalled();
+
+    // start a new wait mid-way through the timeout
+    // SHOULD resolve when releasing
+    const fn2 = jest.fn();
+    barrier.wait().then(fn2);
+
+    await tick(0);
+    expect(fn1).not.toHaveBeenCalled();
+    expect(fn2).not.toHaveBeenCalled();
+
+    barrier.release();
+
+    await tick(0);
+    expect(fn1).toHaveBeenCalledTimes(1);
+    expect(fn2).toHaveBeenCalledTimes(1);
+  });
+});
diff --git a/plugins/catalog-backend/src/processing/TaskPipeline.ts b/plugins/catalog-backend/src/processing/TaskPipeline.ts
index 4afe2408a8..44030be9e0 100644
--- a/plugins/catalog-backend/src/processing/TaskPipeline.ts
+++ b/plugins/catalog-backend/src/processing/TaskPipeline.ts
@@ -72,50 +72,112 @@ export function startTaskPipeline<T>(options: Options<T>) {
     throw new Error('lowWatermark must be lower than highWatermark');
   }
 
-  let loading = false;
-  let stopped = false;
-  let inFlightCount = 0;
+  // State is in an object so that it can be stably referenced from within
+  // callbacks below
+  const state = { inFlightCount: 0 };
+  const abortController = new AbortController();
+  const abortSignal = abortController.signal;
 
-  async function maybeLoadMore() {
-    if (stopped || loading || inFlightCount > lowWatermark) {
-      return;
-    }
+  const barrier = createBarrier({
+    waitTimeoutMillis: pollingIntervalMs,
+    signal: abortSignal,
+  });
 
-    // Once we hit the low watermark we load in enough items to reach the high watermark
-    loading = true;
-    const loadCount = highWatermark - inFlightCount;
-    const loadedItems = await loadTasks(loadCount);
-    loading = false;
-
-    // We might not reach the high watermark here, in case there weren't enough items to load
-    inFlightCount += loadedItems.length;
-    loadedItems.forEach(item => {
-      processTask(item).finally(() => {
-        if (stopped) {
-          return;
+  async function pipelineLoop() {
+    while (!abortSignal.aborted) {
+      if (state.inFlightCount <= lowWatermark) {
+        const loadCount = highWatermark - state.inFlightCount;
+        const loadedItems = await Promise.resolve()
+          .then(() => loadTasks(loadCount))
+          .catch(() => {
+            // Silently swallow errors and go back to sleep to try again; we
+            // delegate to the loadTasks function itself to catch errors and log
+            // if it so desires
+            return [];
+          });
+        if (loadedItems.length && !abortSignal.aborted) {
+          state.inFlightCount += loadedItems.length;
+          for (const item of loadedItems) {
+            Promise.resolve()
+              .then(() => processTask(item))
+              .catch(() => {
+                // Silently swallow errors and go back to sleep to try again; we
+                // delegate to the processTask function itself to catch errors
+                // and log if it so desires
+              })
+              .finally(() => {
+                state.inFlightCount -= 1;
+                barrier.release();
+              });
+          }
         }
+      }
 
-        // For each item we complete we check if it's time to load more
-        inFlightCount -= 1;
-        maybeLoadMore();
-      });
-    });
-
-    // We might have processed some tasks while we where loading, so check if we can load more
-    if (loadedItems.length > 1) {
-      maybeLoadMore();
+      await barrier.wait();
     }
   }
 
-  // This interval makes sure that we load in new items if the loop runs
-  // dry because of the lack of available tasks. As long as there are
-  // enough items to process this will be a noop.
-  const intervalId = setInterval(() => {
-    maybeLoadMore();
-  }, pollingIntervalMs);
+  pipelineLoop().catch(error => {
+    // This should be impossible, but if it did happen, it would signal a
+    // programming error inside the loop (errors should definitely be caught
+    // inside of it). Let's rethrow with more information, and let it be caught
+    // by the process' uncaught exception handler, which will log the occurrence
+    // at a high level.
+    throw new Error(`Unexpected error in processing pipeline loop`, error);
+  });
 
   return () => {
-    stopped = true;
-    clearInterval(intervalId);
+    abortController.abort();
+    barrier.destroy();
+  };
+}
+
+/**
+ * Creates a barrier with a timeout, that can be awaited or prematurely
+ * released either manually or by an abort signal.
+ */
+export function createBarrier(options: {
+  waitTimeoutMillis: number;
+  signal: AbortSignal;
+}): {
+  wait: () => Promise<void>;
+  release: () => void;
+  destroy: () => void;
+} {
+  const { waitTimeoutMillis, signal } = options;
+  const resolvers = new Set<() => void>();
+
+  function wait() {
+    if (signal.aborted || !(waitTimeoutMillis > 0)) {
+      return Promise.resolve();
+    }
+
+    return new Promise<void>(resolve => {
+      const timeoutHandle = setTimeout(done, waitTimeoutMillis);
+
+      function done() {
+        resolvers.delete(done);
+        clearTimeout(timeoutHandle);
+        resolve();
+      }
+
+      resolvers.add(done);
+    });
+  }
+
+  function release() {
+    const resolversToCall = new Set(resolvers);
+    resolvers.clear();
+    for (const resolver of resolversToCall) {
+      resolver();
+    }
+  }
+
+  signal.addEventListener('abort', release);
+
+  return {
+    wait,
+    release,
+    destroy: () => signal.removeEventListener('abort', release),
   };
 }
diff --git a/plugins/catalog-backend/src/schema/openapi.generated.ts b/plugins/catalog-backend/src/schema/openapi.generated.ts
index 7428e5ace2..2278a30e62 100644
--- a/plugins/catalog-backend/src/schema/openapi.generated.ts
+++ b/plugins/catalog-backend/src/schema/openapi.generated.ts
@@ -45,6 +45,7 @@ export const spec = {
         name: 'kind',
         in: 'path',
         required: true,
+        allowReserved: true,
         schema: {
           type: 'string',
         },
@@ -53,6 +54,7 @@ export const spec = {
         name: 'namespace',
         in: 'path',
         required: true,
+        allowReserved: true,
         schema: {
           type: 'string',
         },
@@ -61,6 +63,7 @@ export const spec = {
         name: 'name',
         in: 'path',
         required: true,
+        allowReserved: true,
         schema: {
           type: 'string',
         },
@@ -69,6 +72,7 @@ export const spec = {
         name: 'uid',
         in: 'path',
         required: true,
+        allowReserved: true,
         schema: {
           type: 'string',
         },
@@ -78,6 +82,7 @@ export const spec = {
         in: 'query',
         description: 'Cursor to a set page of results.',
         required: false,
+        allowReserved: true,
         schema: {
           type: 'string',
           minLength: 1,
@@ -88,6 +93,7 @@ export const spec = {
         in: 'query',
         description: 'Pointer to the previous page of results.',
         required: false,
+        allowReserved: true,
         schema: {
           type: 'string',
           minLength: 1,
@@ -105,24 +111,44 @@ export const spec = {
             type: 'string',
           },
         },
+        examples: {
+          'Get name and the entire relations collection': {
+            value: ['metadata.name', 'relations'],
+          },
+          'Get kind, name and namespace': {
+            value: ['kind', 'metadata.name', 'metadata.namespace'],
+          },
+        },
       },
       filter: {
         name: 'filter',
         in: 'query',
         description: 'Filter for just the entities defined by this filter.',
         required: false,
+        allowReserved: true,
         schema: {
           type: 'array',
           items: {
             type: 'string',
           },
         },
+        examples: {
+          'Get groups': {
+            value: ['kind=group'],
+          },
+          'Get orphaned components': {
+            value: [
+              'kind=component,metadata.annotations.backstage.io/orphan=true',
+            ],
+          },
+        },
       },
       offset: {
         name: 'offset',
         in: 'query',
         description: 'Number of records to skip in the query page.',
         required: false,
+        allowReserved: true,
         schema: {
           type: 'integer',
           minimum: 0,
@@ -133,9 +159,10 @@ export const spec = {
         in: 'query',
         description: 'Number of records to return in the response.',
         required: false,
+        allowReserved: true,
         schema: {
           type: 'integer',
-          minimum: 1,
+          minimum: 0,
         },
       },
       orderField: {
@@ -153,6 +180,14 @@ export const spec = {
         },
         explode: true,
         style: 'form',
+        examples: {
+          'Order ascending by name': {
+            value: ['metadata.name,asc'],
+          },
+          'Order descending by owner': {
+            value: ['spec.owner,desc'],
+          },
+        },
       },
     },
     requestBodies: {},
@@ -817,6 +852,18 @@ export const spec = {
           {
             $ref: '#/components/parameters/after',
           },
+          {
+            name: 'order',
+            in: 'query',
+            allowReserved: true,
+            required: false,
+            schema: {
+              type: 'array',
+              items: {
+                type: 'string',
+              },
+            },
+          },
         ],
       },
     },
@@ -989,6 +1036,22 @@ export const spec = {
                   },
                 },
               },
+              examples: {
+                'Fetch Backstage entities': {
+                  value: {
+                    entityRefs: [
+                      'component:default/backstage',
+                      'api:default/backstage',
+                    ],
+                  },
+                },
+                'Fetch annotations for backstage entity': {
+                  value: {
+                    entityRefs: ['component:default/backstage'],
+                    fields: ['metadata.annotations'],
+                  },
+                },
+              },
             },
           },
         },
@@ -1037,6 +1100,7 @@ export const spec = {
             in: 'query',
             description: 'Text search term.',
             required: false,
+            allowReserved: true,
             schema: {
               type: 'string',
             },
@@ -1047,6 +1111,7 @@ export const spec = {
             description:
               'A comma separated list of fields to sort returned results by.',
             required: false,
+            allowReserved: true,
             schema: {
               type: 'array',
               items: {
@@ -1086,8 +1151,20 @@ export const spec = {
             in: 'query',
             name: 'facet',
             required: true,
+            allowReserved: true,
             schema: {
-              type: 'string',
+              type: 'array',
+              items: {
+                type: 'string',
+              },
+            },
+            examples: {
+              'Entities by kind': {
+                value: ['kind'],
+              },
+              'Entities by spec type': {
+                value: ['spec.type'],
+              },
             },
           },
           {
@@ -1138,6 +1215,7 @@ export const spec = {
             in: 'query',
             name: 'dryRun',
             required: false,
+            allowReserved: true,
             schema: {
               type: 'string',
             },
@@ -1223,6 +1301,7 @@ export const spec = {
             in: 'path',
             name: 'id',
             required: true,
+            allowReserved: true,
             schema: {
               type: 'string',
             },
@@ -1248,6 +1327,7 @@ export const spec = {
             in: 'path',
             name: 'id',
             required: true,
+            allowReserved: true,
             schema: {
               type: 'string',
             },
@@ -1292,7 +1372,7 @@ export const spec = {
                     $ref: '#/components/schemas/LocationInput',
                   },
                 },
-                required: ['catalogFileName', 'location'],
+                required: ['location'],
               },
             },
           },
diff --git a/plugins/catalog-backend/src/schema/openapi.yaml b/plugins/catalog-backend/src/schema/openapi.yaml
index 34e21adffd..4db3147a97 100644
--- a/plugins/catalog-backend/src/schema/openapi.yaml
+++ b/plugins/catalog-backend/src/schema/openapi.yaml
@@ -20,24 +20,28 @@ components:
       name: kind
       in: path
       required: true
+      allowReserved: true
       schema:
         type: string
     namespace:
       name: namespace
       in: path
       required: true
+      allowReserved: true
       schema:
         type: string
     name:
       name: name
       in: path
       required: true
+      allowReserved: true
       schema:
         type: string
     uid:
       name: uid
       in: path
       required: true
+      allowReserved: true
       schema:
         type: string
     cursor:
@@ -45,6 +49,7 @@ components:
       in: query
       description: Cursor to a set page of results.
       required: false
+      allowReserved: true
       schema:
         type: string
         minLength: 1
@@ -53,6 +58,7 @@ components:
       in: query
       description: Pointer to the previous page of results.
       required: false
+      allowReserved: true
       schema:
         type: string
         minLength: 1
@@ -66,20 +72,33 @@ components:
         type: array
         items:
           type: string
+      examples:
+        'Get name and the entire relations collection':
+          value: ['metadata.name', 'relations']
+        'Get kind, name and namespace':
+          value: ['kind', 'metadata.name', 'metadata.namespace']
     filter:
       name: filter
       in: query
       description: Filter for just the entities defined by this filter.
       required: false
+      allowReserved: true
       schema:
         type: array
         items:
           type: string
+      examples:
+        'Get groups':
+          value: ['kind=group']
+        'Get orphaned components':
+          value:
+            ['kind=component,metadata.annotations.backstage.io/orphan=true']
     offset:
       name: offset
       in: query
       description: Number of records to skip in the query page.
       required: false
+      allowReserved: true
       schema:
         type: integer
         minimum: 0
@@ -88,9 +107,10 @@ components:
       in: query
       description: Number of records to return in the response.
       required: false
+      allowReserved: true
       schema:
         type: integer
-        minimum: 1
+        minimum: 0
     orderField:
       name: orderField
       in: query
@@ -104,6 +124,11 @@ components:
           description: A two-item tuple of [field, order].
       explode: true
       style: form
+      examples:
+        'Order ascending by name':
+          value: ['metadata.name,asc']
+        'Order descending by owner':
+          value: ['spec.owner,desc']
   requestBodies: {}
   responses: {}
   schemas:
@@ -668,6 +693,14 @@ paths:
         - $ref: '#/components/parameters/filter'
         - $ref: '#/components/parameters/offset'
         - $ref: '#/components/parameters/after'
+        - name: order
+          in: query
+          allowReserved: true
+          required: false
+          schema:
+            type: array
+            items:
+              type: string
   /entities/by-uid/{uid}:
     get:
       operationId: GetEntityByUid
@@ -764,6 +797,15 @@ paths:
                   type: array
                   items:
                     type: string
+            examples:
+              'Fetch Backstage entities':
+                value:
+                  entityRefs:
+                    ['component:default/backstage', 'api:default/backstage']
+              'Fetch annotations for backstage entity':
+                value:
+                  entityRefs: ['component:default/backstage']
+                  fields: ['metadata.annotations']
   /entities/by-query:
     get:
       operationId: GetEntitiesByQuery
@@ -788,12 +830,14 @@ paths:
           in: query
           description: Text search term.
           required: false
+          allowReserved: true
           schema:
             type: string
         - name: fullTextFilterFields
           in: query
           description: A comma separated list of fields to sort returned results by.
           required: false
+          allowReserved: true
           schema:
             type: array
             items:
@@ -818,8 +862,16 @@ paths:
         - in: query
           name: facet
           required: true
+          allowReserved: true
           schema:
-            type: string
+            type: array
+            items:
+              type: string
+          examples:
+            'Entities by kind':
+              value: ['kind']
+            'Entities by spec type':
+              value: ['spec.type']
         - $ref: '#/components/parameters/filter'
   /locations:
     post:
@@ -851,6 +903,7 @@ paths:
         - in: query
           name: dryRun
           required: false
+          allowReserved: true
           schema:
             type: string
       requestBody:
@@ -906,6 +959,7 @@ paths:
         - in: path
           name: id
           required: true
+          allowReserved: true
           schema:
             type: string
     delete:
@@ -921,6 +975,7 @@ paths:
         - in: path
           name: id
           required: true
+          allowReserved: true
           schema:
             type: string
   /analyze-location:
@@ -950,7 +1005,6 @@ paths:
                 location:
                   $ref: '#/components/schemas/LocationInput'
               required:
-                - catalogFileName
                 - location
   /validate-entity:
     post:
diff --git a/plugins/catalog-backend/src/service/CatalogBuilder.ts b/plugins/catalog-backend/src/service/CatalogBuilder.ts
index 9c351a76f2..531bb91dd2 100644
--- a/plugins/catalog-backend/src/service/CatalogBuilder.ts
+++ b/plugins/catalog-backend/src/service/CatalogBuilder.ts
@@ -74,7 +74,7 @@ import { createRouter } from './createRouter';
 import { DefaultRefreshService } from './DefaultRefreshService';
 import { AuthorizedRefreshService } from './AuthorizedRefreshService';
 import { DefaultCatalogRulesEnforcer } from '../ingestion/CatalogRules';
-import { Config } from '@backstage/config';
+import { Config, readDurationFromConfig } from '@backstage/config';
 import { Logger } from 'winston';
 import { connectEntityProviders } from '../processing/connectEntityProviders';
 import { PermissionRuleParams } from '@backstage/plugin-permission-common';
@@ -100,6 +100,7 @@ import { AuthorizedLocationService } from './AuthorizedLocationService';
 import { DefaultProviderDatabase } from '../database/DefaultProviderDatabase';
 import { DefaultCatalogDatabase } from '../database/DefaultCatalogDatabase';
 import { EventBroker } from '@backstage/plugin-events-node';
+import { durationToMilliseconds } from '@backstage/types';
 
 /**
  * This is a duplicate of the alpha `CatalogPermissionRule` type, for use in the stable API.
@@ -160,11 +161,7 @@ export class CatalogBuilder {
     unprocessedEntity: Entity;
     errors: Error[];
   }) => Promise<void> | void;
-  private processingInterval: ProcessingIntervalFunction =
-    createRandomProcessingInterval({
-      minSeconds: 100,
-      maxSeconds: 150,
-    });
+  private processingInterval: ProcessingIntervalFunction;
   private locationAnalyzer: LocationAnalyzer | undefined = undefined;
   private readonly permissionRules: CatalogPermissionRuleInput[];
   private allowedLocationType: string[];
@@ -191,6 +188,10 @@ export class CatalogBuilder {
     this.parser = undefined;
     this.permissionRules = Object.values(catalogPermissionRules);
     this.allowedLocationType = ['url'];
+
+    this.processingInterval = CatalogBuilder.getDefaultProcessingInterval(
+      env.config,
+    );
   }
 
   /**
@@ -422,7 +423,7 @@ export class CatalogBuilder {
   }
 
   /**
-   * Enables the publishing of events for cloflicts in the DefaultProcessingDatabase
+   * Enables the publishing of events for conflicts in the DefaultProcessingDatabase
    */
   setEventBroker(broker: EventBroker): CatalogBuilder {
     this.eventBroker = broker;
@@ -758,4 +759,30 @@ export class CatalogBuilder {
       'https://backstage.io/docs/integrations/azure/org',
     );
   }
+
+  private static getDefaultProcessingInterval(
+    config: Config,
+  ): ProcessingIntervalFunction {
+    const processingIntervalKey = 'catalog.processingInterval';
+
+    if (!config.has(processingIntervalKey)) {
+      return createRandomProcessingInterval({
+        minSeconds: 100,
+        maxSeconds: 150,
+      });
+    }
+
+    const duration = readDurationFromConfig(config, {
+      key: processingIntervalKey,
+    });
+    const seconds = Math.max(
+      1,
+      Math.round(durationToMilliseconds(duration) / 1000),
+    );
+
+    return createRandomProcessingInterval({
+      minSeconds: seconds,
+      maxSeconds: seconds * 1.5,
+    });
+  }
 }
diff --git a/plugins/catalog-backend/src/service/request/parseQueryEntitiesParams.test.ts b/plugins/catalog-backend/src/service/request/parseQueryEntitiesParams.test.ts
index dfcfd58c7e..e11656681a 100644
--- a/plugins/catalog-backend/src/service/request/parseQueryEntitiesParams.test.ts
+++ b/plugins/catalog-backend/src/service/request/parseQueryEntitiesParams.test.ts
@@ -28,11 +28,11 @@ describe('parseQueryEntitiesParams', () => {
       const validRequest = {
         authorizationToken: 'to_not_be_returned',
         fields: ['kind'],
-        limit: '3',
+        limit: 3,
         filter: ['a=1', 'b=2'],
         orderField: ['metadata.name,desc'],
         fullTextFilterTerm: 'query',
-        fullTextFilterFields: 'metadata.name,metadata.namespace',
+        fullTextFilterFields: ['metadata.name', 'metadata.namespace'],
       };
       const parsedObj = parseQueryEntitiesParams(
         validRequest,
@@ -65,9 +65,7 @@ describe('parseQueryEntitiesParams', () => {
       { filter: 3 },
       { orderField: ['metadata.uid,diagonal'] },
       { fields: [4] },
-      { fullTextFilterTerm: [] },
-      { fullTextFilterFields: 3 },
-    ])('should throw if some parameter is not valid %p', params => {
+    ])('should throw if some parameter is not valid %p', (params: any) => {
       expect(() => parseQueryEntitiesParams(params)).toThrow();
     });
   });
@@ -83,7 +81,7 @@ describe('parseQueryEntitiesParams', () => {
       const validRequest = {
         authorizationToken: 'to_not_be_returned',
         fields: ['kind'],
-        limit: '3',
+        limit: 3,
         cursor: encodeCursor(cursor),
       };
       const parsedObj = parseQueryEntitiesParams(
@@ -103,10 +101,10 @@ describe('parseQueryEntitiesParams', () => {
       const validRequest = {
         authorizationToken: 'to_not_be_returned',
         fields: ['kind'],
-        limit: '3',
+        limit: 3,
         cursor: encodeCursor(cursor),
         filter: ['a=1', 'b=2'],
-        orderField: 'orderField,desc',
+        orderField: ['orderField,desc'],
         query: 'query',
       };
       const parsedObj = parseQueryEntitiesParams(
@@ -128,7 +126,7 @@ describe('parseQueryEntitiesParams', () => {
 
     it.each([{ cursor: [] }, { fields: [4] }])(
       'should throw if some parameter is not valid %p',
-      params => {
+      (params: any) => {
         expect(() => parseQueryEntitiesParams(params)).toThrow();
       },
     );
diff --git a/plugins/catalog-backend/src/service/request/parseQueryEntitiesParams.ts b/plugins/catalog-backend/src/service/request/parseQueryEntitiesParams.ts
index 9b55f193b9..b1d5e8dd1f 100644
--- a/plugins/catalog-backend/src/service/request/parseQueryEntitiesParams.ts
+++ b/plugins/catalog-backend/src/service/request/parseQueryEntitiesParams.ts
@@ -20,19 +20,19 @@ import {
   QueryEntitiesRequest,
 } from '../../catalog/types';
 import { decodeCursor } from '../util';
-import { parseStringParam } from './common';
 import { parseEntityFilterParams } from './parseEntityFilterParams';
 import { parseEntityOrderFieldParams } from './parseEntityOrderFieldParams';
 import { parseEntityTransformParams } from './parseEntityTransformParams';
-import { parseFullTextFilterFields } from './parseFullTextFilterFields';
+import { spec } from '../../schema/openapi.generated';
+import { internal } from '@backstage/backend-openapi-utils';
 
 export function parseQueryEntitiesParams(
-  params: Record<string, unknown>,
+  params: internal.QuerySchema<typeof spec, '/entities/by-query', 'get'>,
 ): Omit<QueryEntitiesRequest, 'authorizationToken' | 'limit'> {
   const fields = parseEntityTransformParams(params);
-  const cursor = parseStringParam(params.cursor, 'cursor');
-  if (cursor) {
-    const decodedCursor = decodeCursor(cursor);
+
+  if (params.cursor) {
+    const decodedCursor = decodeCursor(params.cursor);
     const response: Omit<QueryEntitiesCursorRequest, 'authorizationToken'> = {
       cursor: decodedCursor,
       fields,
@@ -41,12 +41,6 @@ export function parseQueryEntitiesParams(
   }
 
   const filter = parseEntityFilterParams(params);
-  const fullTextFilterTerm = parseStringParam(
-    params.fullTextFilterTerm,
-    'fullTextFilterTerm',
-  );
-  const fullTextFilterFields = parseFullTextFilterFields(params);
-
   const orderFields = parseEntityOrderFieldParams(params);
 
   const response: Omit<QueryEntitiesInitialRequest, 'authorizationToken'> = {
@@ -54,8 +48,8 @@ export function parseQueryEntitiesParams(
     filter,
     orderFields,
     fullTextFilter: {
-      term: fullTextFilterTerm || '',
-      fields: fullTextFilterFields,
+      term: params.fullTextFilterTerm || '',
+      fields: params.fullTextFilterFields,
     },
   };
 
diff --git a/plugins/catalog-backend/src/tests/performance/lib/catalogModuleSyntheticLoadEntities.ts b/plugins/catalog-backend/src/tests/performance/lib/catalogModuleSyntheticLoadEntities.ts
index 4d38b28bcf..7925b0b552 100644
--- a/plugins/catalog-backend/src/tests/performance/lib/catalogModuleSyntheticLoadEntities.ts
+++ b/plugins/catalog-backend/src/tests/performance/lib/catalogModuleSyntheticLoadEntities.ts
@@ -14,7 +14,6 @@
  * limitations under the License.
  */
 
-import { createBackendModule } from '@backstage/backend-plugin-api';
 import { Entity } from '@backstage/catalog-model';
 import { LocationSpec } from '@backstage/plugin-catalog-common';
 import {
@@ -26,7 +25,6 @@ import {
   EntityProviderConnection,
   processingResult,
 } from '@backstage/plugin-catalog-node';
-import { catalogProcessingExtensionPoint } from '@backstage/plugin-catalog-node/alpha';
 
 /**
  * Options for a fixed initial load of entities.
@@ -143,12 +141,15 @@ export const common = {
 
 /**
  * The entity provider that drives the initial base entity injection
+ * @internal
  */
-class SyntheticLoadEntitiesProvider implements EntityProvider {
+export class SyntheticLoadEntitiesProvider implements EntityProvider {
   constructor(
     private readonly load: SyntheticLoadOptions,
     private readonly events: SyntheticLoadEvents,
-  ) {}
+  ) {
+    validateSyntheticLoadOptions(load);
+  }
 
   getProviderName(): string {
     return 'SyntheticLoadEntitiesProvider';
@@ -180,9 +181,12 @@ class SyntheticLoadEntitiesProvider implements EntityProvider {
 
 /**
  * Supporting processor for emitting children and relations
+ * @internal
  */
-class SyntheticLoadEntitiesProcessor implements CatalogProcessor {
-  constructor(private readonly load: SyntheticLoadOptions) {}
+export class SyntheticLoadEntitiesProcessor implements CatalogProcessor {
+  constructor(private readonly load: SyntheticLoadOptions) {
+    validateSyntheticLoadOptions(load);
+  }
 
   getProcessorName(): string {
     return 'SyntheticLoadEntitiesProcessor';
@@ -231,27 +235,3 @@ class SyntheticLoadEntitiesProcessor implements CatalogProcessor {
     return entity;
   }
 }
-
-export const catalogModuleSyntheticLoadEntities = createBackendModule(
-  (options: { load: SyntheticLoadOptions; events?: SyntheticLoadEvents }) => ({
-    moduleId: 'syntheticLoadEntities',
-    pluginId: 'catalog',
-    register(reg) {
-      reg.registerInit({
-        deps: {
-          catalog: catalogProcessingExtensionPoint,
-        },
-        async init({ catalog }) {
-          const { load, events = {} } = options;
-
-          validateSyntheticLoadOptions(load);
-          const provider = new SyntheticLoadEntitiesProvider(load, events);
-          const processor = new SyntheticLoadEntitiesProcessor(load);
-
-          catalog.addEntityProvider(provider);
-          catalog.addProcessor(processor);
-        },
-      });
-    },
-  }),
-);
diff --git a/plugins/catalog-backend/src/tests/performance/stitchingPerformance.test.ts b/plugins/catalog-backend/src/tests/performance/stitchingPerformance.test.ts
index 2f32fcd907..e60c0a33d6 100644
--- a/plugins/catalog-backend/src/tests/performance/stitchingPerformance.test.ts
+++ b/plugins/catalog-backend/src/tests/performance/stitchingPerformance.test.ts
@@ -16,16 +16,18 @@
 
 import {
   coreServices,
+  createBackendModule,
   createServiceFactory,
 } from '@backstage/backend-plugin-api';
 import { TestDatabases, startTestBackend } from '@backstage/backend-test-utils';
-import { catalogPlugin } from '@backstage/plugin-catalog-backend/alpha';
+import { catalogProcessingExtensionPoint } from '@backstage/plugin-catalog-node/alpha';
 import { Knex } from 'knex';
 import { applyDatabaseMigrations } from '../../database/migrations';
 import {
   SyntheticLoadEvents,
   SyntheticLoadOptions,
-  catalogModuleSyntheticLoadEntities,
+  SyntheticLoadEntitiesProvider,
+  SyntheticLoadEntitiesProcessor,
 } from './lib/catalogModuleSyntheticLoadEntities';
 import { describePerformanceTest, performanceTraceEnabled } from './lib/env';
 
@@ -177,13 +179,28 @@ describePerformanceTest('stitchingPerformance', () => {
       const tracker = new Tracker(knex, load);
 
       const backend = await startTestBackend({
-        services: [staticDatabase(knex)],
         features: [
-          catalogPlugin(),
-          catalogModuleSyntheticLoadEntities({
-            load,
-            events: tracker.events(),
+          import('@backstage/plugin-catalog-backend/alpha'),
+          createBackendModule({
+            moduleId: 'syntheticLoadEntities',
+            pluginId: 'catalog',
+            register(reg) {
+              reg.registerInit({
+                deps: {
+                  catalog: catalogProcessingExtensionPoint,
+                },
+                async init({ catalog }) {
+                  catalog.addEntityProvider(
+                    new SyntheticLoadEntitiesProvider(load, tracker.events()),
+                  );
+                  catalog.addProcessor(
+                    new SyntheticLoadEntitiesProcessor(load),
+                  );
+                },
+              });
+            },
           }),
+          staticDatabase(knex),
         ],
       });
 
diff --git a/plugins/catalog-common/CHANGELOG.md b/plugins/catalog-common/CHANGELOG.md
index 8fa7f6e886..8de4b1a4e1 100644
--- a/plugins/catalog-common/CHANGELOG.md
+++ b/plugins/catalog-common/CHANGELOG.md
@@ -1,5 +1,23 @@
 # @backstage/plugin-catalog-common
 
+## 1.0.16-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/catalog-model@1.4.2-next.1
+  - @backstage/plugin-permission-common@0.7.8-next.1
+  - @backstage/plugin-search-common@1.2.6-next.1
+
+## 1.0.16-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/catalog-model@1.4.2-next.0
+  - @backstage/plugin-permission-common@0.7.8-next.0
+  - @backstage/plugin-search-common@1.2.6-next.0
+
 ## 1.0.15
 
 ### Patch Changes
diff --git a/plugins/catalog-common/catalog-info.yaml b/plugins/catalog-common/catalog-info.yaml
new file mode 100644
index 0000000000..85ee85917b
--- /dev/null
+++ b/plugins/catalog-common/catalog-info.yaml
@@ -0,0 +1,10 @@
+apiVersion: backstage.io/v1alpha1
+kind: Component
+metadata:
+  name: backstage-plugin-catalog-common
+  title: '@backstage/plugin-catalog-common'
+  description: Common functionalities for the catalog plugin
+spec:
+  lifecycle: production
+  type: backstage-common-library
+  owner: catalog-maintainers
diff --git a/plugins/catalog-common/package.json b/plugins/catalog-common/package.json
index b4a2b75420..8c4955d7f1 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.15",
+  "version": "1.0.16-next.1",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
@@ -35,6 +35,7 @@
   "keywords": [
     "backstage"
   ],
+  "sideEffects": false,
   "scripts": {
     "build": "backstage-cli package build",
     "lint": "backstage-cli package lint",
diff --git a/plugins/catalog-customized/CHANGELOG.md b/plugins/catalog-customized/CHANGELOG.md
index a488e91148..ef9df78bb8 100644
--- a/plugins/catalog-customized/CHANGELOG.md
+++ b/plugins/catalog-customized/CHANGELOG.md
@@ -1,5 +1,45 @@
 # @internal/plugin-catalog-customized
 
+## 0.0.14-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog@1.13.0-next.2
+  - @backstage/plugin-catalog-react@1.8.4-next.2
+
+## 0.0.14-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.8.4-next.1
+  - @backstage/plugin-catalog@1.12.5-next.1
+
+## 0.0.14-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog@1.12.4-next.0
+  - @backstage/plugin-catalog-react@1.8.3-next.0
+
+## 0.0.13
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog@1.12.1
+  - @backstage/plugin-catalog-react@1.8.1
+
+## 0.0.13-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.8.1-next.1
+  - @backstage/plugin-catalog@1.12.1-next.2
+
 ## 0.0.13-next.1
 
 ### Patch Changes
diff --git a/plugins/catalog-customized/catalog-info.yaml b/plugins/catalog-customized/catalog-info.yaml
new file mode 100644
index 0000000000..1a6d0e0a00
--- /dev/null
+++ b/plugins/catalog-customized/catalog-info.yaml
@@ -0,0 +1,12 @@
+apiVersion: backstage.io/v1alpha1
+kind: Component
+metadata:
+  name: internal-plugin-catalog-customized
+  title: '@internal/plugin-catalog-customized'
+  description: >-
+    The internal Backstage Customizable plugin for browsing the Backstage
+    catalog
+spec:
+  lifecycle: experimental
+  type: backstage-frontend-plugin
+  owner: catalog-maintainers
diff --git a/plugins/catalog-customized/package.json b/plugins/catalog-customized/package.json
index c849e6c2a3..3628844481 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.13-next.1",
+  "version": "0.0.14-next.2",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
@@ -23,6 +23,7 @@
   "keywords": [
     "backstage"
   ],
+  "sideEffects": false,
   "scripts": {
     "build": "backstage-cli package build",
     "start": "backstage-cli package start",
diff --git a/plugins/catalog-graph/CHANGELOG.md b/plugins/catalog-graph/CHANGELOG.md
index 118600f318..80572558eb 100644
--- a/plugins/catalog-graph/CHANGELOG.md
+++ b/plugins/catalog-graph/CHANGELOG.md
@@ -1,5 +1,68 @@
 # @backstage/plugin-catalog-graph
 
+## 0.2.36-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.13.5-next.2
+  - @backstage/core-plugin-api@1.6.0-next.2
+  - @backstage/plugin-catalog-react@1.8.4-next.2
+  - @backstage/catalog-model@1.4.2-next.1
+  - @backstage/catalog-client@1.4.4-next.1
+  - @backstage/theme@0.4.1
+  - @backstage/types@1.1.0
+
+## 0.2.36-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.8.4-next.1
+  - @backstage/core-components@0.13.5-next.1
+  - @backstage/catalog-model@1.4.2-next.0
+  - @backstage/core-plugin-api@1.6.0-next.1
+  - @backstage/catalog-client@1.4.4-next.0
+  - @backstage/theme@0.4.1
+  - @backstage/types@1.1.0
+
+## 0.2.35-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-plugin-api@1.6.0-next.0
+  - @backstage/core-components@0.13.5-next.0
+  - @backstage/catalog-client@1.4.3
+  - @backstage/catalog-model@1.4.1
+  - @backstage/theme@0.4.1
+  - @backstage/types@1.1.0
+  - @backstage/plugin-catalog-react@1.8.3-next.0
+
+## 0.2.33
+
+### Patch Changes
+
+- 64ee2c0c7ca5: Propagate entity spec to EntityNode so that spec info such as type can be used for graph node customization
+- 62dc7a2b1ad1: Added maximum depth parameter to the catalogGraphParams in CatalogGraphCard.
+- 12a8c94eda8d: Add package repository and homepage metadata
+- Updated dependencies
+  - @backstage/core-components@0.13.4
+  - @backstage/plugin-catalog-react@1.8.1
+  - @backstage/core-plugin-api@1.5.3
+  - @backstage/catalog-client@1.4.3
+  - @backstage/catalog-model@1.4.1
+  - @backstage/theme@0.4.1
+  - @backstage/types@1.1.0
+
+## 0.2.33-next.2
+
+### Patch Changes
+
+- 62dc7a2b1ad1: Added maximum depth parameter to the catalogGraphParams in CatalogGraphCard.
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.8.1-next.1
+
 ## 0.2.33-next.1
 
 ### Patch Changes
diff --git a/plugins/catalog-graph/api-report.md b/plugins/catalog-graph/api-report.md
index 80578db6ed..ce56245c49 100644
--- a/plugins/catalog-graph/api-report.md
+++ b/plugins/catalog-graph/api-report.md
@@ -11,8 +11,10 @@ import { DependencyGraphTypes } from '@backstage/core-components';
 import { ExternalRouteRef } from '@backstage/core-plugin-api';
 import { InfoCardVariants } from '@backstage/core-components';
 import { JsonObject } from '@backstage/types';
+import { JSX as JSX_2 } from 'react';
 import { MouseEvent as MouseEvent_2 } from 'react';
 import { MouseEventHandler } from 'react';
+import { default as React_2 } from 'react';
 import { RouteRef } from '@backstage/core-plugin-api';
 
 // @public
@@ -35,7 +37,7 @@ export const CatalogGraphPage: (
         }
       | undefined;
   } & Partial<EntityRelationsGraphProps>,
-) => JSX.Element;
+) => JSX_2.Element;
 
 // @public
 export const catalogGraphPlugin: BackstagePlugin<
@@ -73,7 +75,7 @@ export const EntityCatalogGraphCard: (
     height?: number | undefined;
     title?: string | undefined;
   },
-) => JSX.Element;
+) => JSX_2.Element;
 
 // @public
 export type EntityEdge = DependencyGraphTypes.DependencyEdge<EntityEdgeData>;
@@ -102,7 +104,7 @@ export type EntityNodeData = {
 // @public
 export const EntityRelationsGraph: (
   props: EntityRelationsGraphProps,
-) => JSX.Element;
+) => React_2.JSX.Element;
 
 // @public (undocumented)
 export type EntityRelationsGraphProps = {
diff --git a/plugins/catalog-graph/catalog-info.yaml b/plugins/catalog-graph/catalog-info.yaml
new file mode 100644
index 0000000000..6dda99634b
--- /dev/null
+++ b/plugins/catalog-graph/catalog-info.yaml
@@ -0,0 +1,9 @@
+apiVersion: backstage.io/v1alpha1
+kind: Component
+metadata:
+  name: backstage-plugin-catalog-graph
+  title: '@backstage/plugin-catalog-graph'
+spec:
+  lifecycle: experimental
+  type: backstage-frontend-plugin
+  owner: sda-se-reviewers
diff --git a/plugins/catalog-graph/package.json b/plugins/catalog-graph/package.json
index 0e8f891dab..5c339c2d35 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.33-next.1",
+  "version": "0.2.36-next.2",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
@@ -18,6 +18,7 @@
     "url": "https://github.com/backstage/backstage",
     "directory": "plugins/catalog-graph"
   },
+  "sideEffects": false,
   "scripts": {
     "build": "backstage-cli package build",
     "start": "backstage-cli package start",
diff --git a/plugins/catalog-graph/src/components/CatalogGraphCard/CatalogGraphCard.test.tsx b/plugins/catalog-graph/src/components/CatalogGraphCard/CatalogGraphCard.test.tsx
index adee03e298..cdd55e300f 100644
--- a/plugins/catalog-graph/src/components/CatalogGraphCard/CatalogGraphCard.test.tsx
+++ b/plugins/catalog-graph/src/components/CatalogGraphCard/CatalogGraphCard.test.tsx
@@ -133,7 +133,7 @@ describe('<CatalogGraphCard/>', () => {
     expect(button).toBeInTheDocument();
     expect(button.closest('a')).toHaveAttribute(
       'href',
-      '/catalog-graph?rootEntityRefs%5B%5D=b%3Ad%2Fc&unidirectional=true&mergeRelations=true&direction=LR',
+      '/catalog-graph?rootEntityRefs%5B%5D=b%3Ad%2Fc&maxDepth=1&unidirectional=true&mergeRelations=true&direction=LR',
     );
   });
 
@@ -157,7 +157,7 @@ describe('<CatalogGraphCard/>', () => {
     expect(button).toBeInTheDocument();
     expect(button.closest('a')).toHaveAttribute(
       'href',
-      '/catalog-graph?rootEntityRefs%5B%5D=b%3Ad%2Fc&unidirectional=true&mergeRelations=false&direction=LR',
+      '/catalog-graph?rootEntityRefs%5B%5D=b%3Ad%2Fc&maxDepth=2&unidirectional=true&mergeRelations=false&direction=LR',
     );
   });
 
diff --git a/plugins/catalog-graph/src/components/CatalogGraphCard/CatalogGraphCard.tsx b/plugins/catalog-graph/src/components/CatalogGraphCard/CatalogGraphCard.tsx
index ae4ad850a4..7976fa66bb 100644
--- a/plugins/catalog-graph/src/components/CatalogGraphCard/CatalogGraphCard.tsx
+++ b/plugins/catalog-graph/src/components/CatalogGraphCard/CatalogGraphCard.tsx
@@ -108,6 +108,7 @@ export const CatalogGraphCard = (
   const catalogGraphParams = qs.stringify(
     {
       rootEntityRefs: [stringifyEntityRef(entity)],
+      maxDepth: maxDepth,
       unidirectional,
       mergeRelations,
       selectedKinds: kinds,
diff --git a/plugins/catalog-graphql/CHANGELOG.md b/plugins/catalog-graphql/CHANGELOG.md
index 0ce6148bc2..6726bf5126 100644
--- a/plugins/catalog-graphql/CHANGELOG.md
+++ b/plugins/catalog-graphql/CHANGELOG.md
@@ -1,5 +1,23 @@
 # @backstage/plugin-catalog-graphql
 
+## 0.3.23-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config@1.1.0-next.1
+  - @backstage/catalog-model@1.4.2-next.1
+  - @backstage/types@1.1.0
+
+## 0.3.23-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config@1.1.0-next.0
+  - @backstage/catalog-model@1.4.2-next.0
+  - @backstage/types@1.1.0
+
 ## 0.3.22
 
 ### Patch Changes
diff --git a/plugins/catalog-graphql/catalog-info.yaml b/plugins/catalog-graphql/catalog-info.yaml
new file mode 100644
index 0000000000..202acc8c95
--- /dev/null
+++ b/plugins/catalog-graphql/catalog-info.yaml
@@ -0,0 +1,10 @@
+apiVersion: backstage.io/v1alpha1
+kind: Component
+metadata:
+  name: backstage-plugin-catalog-graphql
+  title: '@backstage/plugin-catalog-graphql'
+  description: An experimental Backstage catalog GraphQL module
+spec:
+  lifecycle: experimental
+  type: backstage-backend-plugin
+  owner: catalog-maintainers
diff --git a/plugins/catalog-graphql/package.json b/plugins/catalog-graphql/package.json
index 0b4bebc0f7..3daf62470a 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.22",
+  "version": "0.3.23-next.1",
   "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 139c8b0615..77ea442018 100644
--- a/plugins/catalog-import/CHANGELOG.md
+++ b/plugins/catalog-import/CHANGELOG.md
@@ -1,5 +1,77 @@
 # @backstage/plugin-catalog-import
 
+## 0.9.14-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/integration-react@1.1.19-next.2
+  - @backstage/core-components@0.13.5-next.2
+  - @backstage/core-plugin-api@1.6.0-next.2
+  - @backstage/config@1.1.0-next.1
+  - @backstage/plugin-catalog-react@1.8.4-next.2
+  - @backstage/integration@1.7.0-next.2
+  - @backstage/catalog-model@1.4.2-next.1
+  - @backstage/catalog-client@1.4.4-next.1
+  - @backstage/errors@1.2.1
+  - @backstage/plugin-catalog-common@1.0.16-next.1
+
+## 0.9.14-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.8.4-next.1
+  - @backstage/core-components@0.13.5-next.1
+  - @backstage/config@1.1.0-next.0
+  - @backstage/integration@1.7.0-next.1
+  - @backstage/integration-react@1.1.19-next.1
+  - @backstage/catalog-model@1.4.2-next.0
+  - @backstage/core-plugin-api@1.6.0-next.1
+  - @backstage/catalog-client@1.4.4-next.0
+  - @backstage/plugin-catalog-common@1.0.16-next.0
+  - @backstage/errors@1.2.1
+
+## 0.9.13-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/integration-react@1.1.18-next.0
+  - @backstage/integration@1.7.0-next.0
+  - @backstage/core-plugin-api@1.6.0-next.0
+  - @backstage/core-components@0.13.5-next.0
+  - @backstage/catalog-client@1.4.3
+  - @backstage/catalog-model@1.4.1
+  - @backstage/config@1.0.8
+  - @backstage/errors@1.2.1
+  - @backstage/plugin-catalog-common@1.0.15
+  - @backstage/plugin-catalog-react@1.8.3-next.0
+
+## 0.9.11
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/integration-react@1.1.16
+  - @backstage/integration@1.6.0
+  - @backstage/core-components@0.13.4
+  - @backstage/plugin-catalog-react@1.8.1
+  - @backstage/core-plugin-api@1.5.3
+  - @backstage/catalog-client@1.4.3
+  - @backstage/catalog-model@1.4.1
+  - @backstage/config@1.0.8
+  - @backstage/errors@1.2.1
+  - @backstage/plugin-catalog-common@1.0.15
+
+## 0.9.11-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.8.1-next.1
+  - @backstage/integration-react@1.1.16-next.1
+
 ## 0.9.11-next.1
 
 ### Patch Changes
diff --git a/plugins/catalog-import/api-report.md b/plugins/catalog-import/api-report.md
index b4c8e854aa..f507967d37 100644
--- a/plugins/catalog-import/api-report.md
+++ b/plugins/catalog-import/api-report.md
@@ -16,6 +16,7 @@ import { Entity } from '@backstage/catalog-model';
 import { FieldErrors } from 'react-hook-form';
 import { IdentityApi } from '@backstage/core-plugin-api';
 import { InfoCardVariants } from '@backstage/core-components';
+import { JSX as JSX_2 } from 'react';
 import { default as React_2 } from 'react';
 import { RouteRef } from '@backstage/core-plugin-api';
 import { ScmAuthApi } from '@backstage/integration-react';
@@ -46,7 +47,7 @@ export type AnalyzeResult =
 // @public
 export const AutocompleteTextField: <TFieldValue extends string>(
   props: AutocompleteTextFieldProps<TFieldValue>,
-) => JSX.Element;
+) => React_2.JSX.Element;
 
 // @public
 export interface AutocompleteTextFieldProps<TFieldValue extends string> {
@@ -126,7 +127,7 @@ export class CatalogImportClient implements CatalogImportApi {
 }
 
 // @public
-export const CatalogImportPage: () => JSX.Element;
+export const CatalogImportPage: () => JSX_2.Element;
 
 // @public
 const catalogImportPlugin: BackstagePlugin<
@@ -148,12 +149,12 @@ export function defaultGenerateStepper(
 ): StepperProvider;
 
 // @public
-export const DefaultImportPage: () => JSX.Element;
+export const DefaultImportPage: () => React_2.JSX.Element;
 
 // @public
 export const EntityListComponent: (
   props: EntityListComponentProps,
-) => JSX.Element;
+) => React_2.JSX.Element;
 
 // @public
 export interface EntityListComponentProps {
@@ -182,7 +183,9 @@ export type ImportFlows =
   | 'no-location';
 
 // @public
-export const ImportInfoCard: (props: ImportInfoCardProps) => JSX.Element;
+export const ImportInfoCard: (
+  props: ImportInfoCardProps,
+) => React_2.JSX.Element;
 
 // @public
 export interface ImportInfoCardProps {
@@ -205,7 +208,7 @@ export type ImportState = State & {
 };
 
 // @public
-export const ImportStepper: (props: ImportStepperProps) => JSX.Element;
+export const ImportStepper: (props: ImportStepperProps) => React_2.JSX.Element;
 
 // @public
 export interface ImportStepperProps {
@@ -223,7 +226,7 @@ export interface ImportStepperProps {
 // @public
 export const PreparePullRequestForm: <TFieldValues extends Record<string, any>>(
   props: PreparePullRequestFormProps<TFieldValues>,
-) => JSX.Element;
+) => React_2.JSX.Element;
 
 // @public
 export type PreparePullRequestFormProps<
@@ -266,7 +269,7 @@ export type PrepareResult =
 // @public
 export const PreviewCatalogInfoComponent: (
   props: PreviewCatalogInfoComponentProps,
-) => JSX.Element;
+) => React_2.JSX.Element;
 
 // @public
 export interface PreviewCatalogInfoComponentProps {
@@ -284,7 +287,7 @@ export interface PreviewCatalogInfoComponentProps {
 // @public
 export const PreviewPullRequestComponent: (
   props: PreviewPullRequestComponentProps,
-) => JSX.Element;
+) => React_2.JSX.Element;
 
 // @public
 export interface PreviewPullRequestComponentProps {
@@ -302,7 +305,7 @@ export interface PreviewPullRequestComponentProps {
 // @public
 export const StepInitAnalyzeUrl: (
   props: StepInitAnalyzeUrlProps,
-) => JSX.Element;
+) => React_2.JSX.Element;
 
 // @public
 export interface StepInitAnalyzeUrlProps {
@@ -326,7 +329,7 @@ export interface StepInitAnalyzeUrlProps {
 // @public
 export const StepPrepareCreatePullRequest: (
   props: StepPrepareCreatePullRequestProps,
-) => JSX.Element;
+) => React_2.JSX.Element;
 
 // @public
 export interface StepPrepareCreatePullRequestProps {
diff --git a/plugins/catalog-import/catalog-info.yaml b/plugins/catalog-import/catalog-info.yaml
new file mode 100644
index 0000000000..763dec9c45
--- /dev/null
+++ b/plugins/catalog-import/catalog-info.yaml
@@ -0,0 +1,10 @@
+apiVersion: backstage.io/v1alpha1
+kind: Component
+metadata:
+  name: backstage-plugin-catalog-import
+  title: '@backstage/plugin-catalog-import'
+  description: A Backstage plugin the helps you import entities into your catalog
+spec:
+  lifecycle: experimental
+  type: backstage-frontend-plugin
+  owner: catalog-maintainers
diff --git a/plugins/catalog-import/package.json b/plugins/catalog-import/package.json
index 55d596c955..2cdc0fc786 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.11-next.1",
+  "version": "0.9.14-next.2",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
@@ -22,6 +22,7 @@
   "keywords": [
     "backstage"
   ],
+  "sideEffects": false,
   "scripts": {
     "build": "backstage-cli package build",
     "start": "backstage-cli package start",
diff --git a/plugins/catalog-node/CHANGELOG.md b/plugins/catalog-node/CHANGELOG.md
index 6299cd2424..74e0208707 100644
--- a/plugins/catalog-node/CHANGELOG.md
+++ b/plugins/catalog-node/CHANGELOG.md
@@ -1,5 +1,61 @@
 # @backstage/plugin-catalog-node
 
+## 1.4.4-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@0.6.3-next.2
+  - @backstage/catalog-model@1.4.2-next.1
+  - @backstage/catalog-client@1.4.4-next.1
+  - @backstage/errors@1.2.1
+  - @backstage/types@1.1.0
+  - @backstage/plugin-catalog-common@1.0.16-next.1
+
+## 1.4.4-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@0.6.3-next.1
+  - @backstage/catalog-model@1.4.2-next.0
+  - @backstage/catalog-client@1.4.4-next.0
+  - @backstage/plugin-catalog-common@1.0.16-next.0
+  - @backstage/errors@1.2.1
+  - @backstage/types@1.1.0
+
+## 1.4.3-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@0.6.2-next.0
+  - @backstage/catalog-client@1.4.3
+  - @backstage/catalog-model@1.4.1
+  - @backstage/errors@1.2.1
+  - @backstage/types@1.1.0
+  - @backstage/plugin-catalog-common@1.0.15
+
+## 1.4.1
+
+### Patch Changes
+
+- 12a8c94eda8d: Add package repository and homepage metadata
+- Updated dependencies
+  - @backstage/backend-plugin-api@0.6.0
+  - @backstage/catalog-client@1.4.3
+  - @backstage/catalog-model@1.4.1
+  - @backstage/errors@1.2.1
+  - @backstage/types@1.1.0
+  - @backstage/plugin-catalog-common@1.0.15
+
+## 1.4.1-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@0.6.0-next.2
+
 ## 1.4.1-next.1
 
 ### Patch Changes
diff --git a/plugins/catalog-node/catalog-info.yaml b/plugins/catalog-node/catalog-info.yaml
new file mode 100644
index 0000000000..0dd6686eba
--- /dev/null
+++ b/plugins/catalog-node/catalog-info.yaml
@@ -0,0 +1,10 @@
+apiVersion: backstage.io/v1alpha1
+kind: Component
+metadata:
+  name: backstage-plugin-catalog-node
+  title: '@backstage/plugin-catalog-node'
+  description: The plugin-catalog-node module for @backstage/plugin-catalog-backend
+spec:
+  lifecycle: production
+  type: backstage-node-library
+  owner: catalog-maintainers
diff --git a/plugins/catalog-node/package.json b/plugins/catalog-node/package.json
index 5a10c9e000..627ed88823 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.4.1-next.1",
+  "version": "1.4.4-next.2",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
diff --git a/plugins/catalog-react/CHANGELOG.md b/plugins/catalog-react/CHANGELOG.md
index 6ae43f297c..9970fc1754 100644
--- a/plugins/catalog-react/CHANGELOG.md
+++ b/plugins/catalog-react/CHANGELOG.md
@@ -1,5 +1,86 @@
 # @backstage/plugin-catalog-react
 
+## 1.8.4-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.13.5-next.2
+  - @backstage/core-plugin-api@1.6.0-next.2
+  - @backstage/plugin-permission-react@0.4.15-next.2
+  - @backstage/integration@1.7.0-next.2
+  - @backstage/catalog-model@1.4.2-next.1
+  - @backstage/plugin-permission-common@0.7.8-next.1
+  - @backstage/catalog-client@1.4.4-next.1
+  - @backstage/errors@1.2.1
+  - @backstage/theme@0.4.1
+  - @backstage/types@1.1.0
+  - @backstage/version-bridge@1.0.4
+  - @backstage/plugin-catalog-common@1.0.16-next.1
+
+## 1.8.4-next.1
+
+### Patch Changes
+
+- bd817209ddd7: Export the `EntityAutocompletePicker` component.
+- 7029ba1ce0af: Added delete alert popup when user delete the entity
+- Updated dependencies
+  - @backstage/core-components@0.13.5-next.1
+  - @backstage/integration@1.7.0-next.1
+  - @backstage/catalog-model@1.4.2-next.0
+  - @backstage/core-plugin-api@1.6.0-next.1
+  - @backstage/plugin-permission-common@0.7.8-next.0
+  - @backstage/plugin-permission-react@0.4.15-next.1
+  - @backstage/catalog-client@1.4.4-next.0
+  - @backstage/plugin-catalog-common@1.0.16-next.0
+  - @backstage/errors@1.2.1
+  - @backstage/theme@0.4.1
+  - @backstage/types@1.1.0
+  - @backstage/version-bridge@1.0.4
+
+## 1.8.3-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/integration@1.7.0-next.0
+  - @backstage/core-plugin-api@1.6.0-next.0
+  - @backstage/core-components@0.13.5-next.0
+  - @backstage/catalog-client@1.4.3
+  - @backstage/catalog-model@1.4.1
+  - @backstage/errors@1.2.1
+  - @backstage/theme@0.4.1
+  - @backstage/types@1.1.0
+  - @backstage/version-bridge@1.0.4
+  - @backstage/plugin-catalog-common@1.0.15
+  - @backstage/plugin-permission-common@0.7.7
+  - @backstage/plugin-permission-react@0.4.15-next.0
+
+## 1.8.1
+
+### Patch Changes
+
+- aa3feedce10a: Allow specifying screen size when catalog filters are hidden in drawer
+- Updated dependencies
+  - @backstage/integration@1.6.0
+  - @backstage/core-components@0.13.4
+  - @backstage/core-plugin-api@1.5.3
+  - @backstage/catalog-client@1.4.3
+  - @backstage/catalog-model@1.4.1
+  - @backstage/errors@1.2.1
+  - @backstage/theme@0.4.1
+  - @backstage/types@1.1.0
+  - @backstage/version-bridge@1.0.4
+  - @backstage/plugin-catalog-common@1.0.15
+  - @backstage/plugin-permission-common@0.7.7
+  - @backstage/plugin-permission-react@0.4.14
+
+## 1.8.1-next.1
+
+### Patch Changes
+
+- aa3feedce10a: Allow specifying screen size when catalog filters are hidden in drawer
+
 ## 1.8.1-next.0
 
 ### Patch Changes
diff --git a/plugins/catalog-react/api-report.md b/plugins/catalog-react/api-report.md
index 9bf87778dd..a72df6bb3d 100644
--- a/plugins/catalog-react/api-report.md
+++ b/plugins/catalog-react/api-report.md
@@ -3,8 +3,6 @@
 > Do not edit this file. It is a report generated by [API Extractor](https://api-extractor.com/).
 
 ```ts
-/// <reference types="react" />
-
 import { ApiRef } from '@backstage/core-plugin-api';
 import { CATALOG_FILTER_EXISTS } from '@backstage/catalog-client';
 import { CatalogApi } from '@backstage/catalog-client';
@@ -26,11 +24,21 @@ import { StyleRules } from '@material-ui/core/styles/withStyles';
 import { SystemEntity } from '@backstage/catalog-model';
 import { TableColumn } from '@backstage/core-components';
 import { TableOptions } from '@backstage/core-components';
+import { TextFieldProps } from '@material-ui/core';
+
+// @public (undocumented)
+export type AllowedEntityFilters<T extends DefaultEntityFilters> = {
+  [K in keyof T]-?: NonNullable<T[K]> extends EntityFilter & {
+    values: string[];
+  }
+    ? K
+    : never;
+}[keyof T];
 
 // @public
 export const AsyncEntityProvider: (
   props: AsyncEntityProviderProps,
-) => JSX.Element;
+) => React_2.JSX.Element;
 
 // @public
 export interface AsyncEntityProviderProps {
@@ -62,9 +70,15 @@ export const catalogApiRef: ApiRef<CatalogApi>;
 
 // @public (undocumented)
 export const CatalogFilterLayout: {
-  (props: { children: React_2.ReactNode }): JSX.Element;
-  Filters: (props: { children: React_2.ReactNode }) => JSX.Element;
-  Content: (props: { children: React_2.ReactNode }) => JSX.Element;
+  (props: { children: React_2.ReactNode }): React_2.JSX.Element;
+  Filters: (props: {
+    children: React_2.ReactNode;
+    options?: {
+      drawerBreakpoint?: 'xs' | 'sm' | 'md' | 'lg' | 'xl' | number;
+      drawerAnchor?: 'left' | 'right' | 'top' | 'bottom';
+    };
+  }) => React_2.JSX.Element;
+  Content: (props: { children: React_2.ReactNode }) => React_2.JSX.Element;
 };
 
 // @public (undocumented)
@@ -138,6 +152,28 @@ export type DefaultEntityFilters = {
   namespace?: EntityNamespaceFilter;
 };
 
+// @public (undocumented)
+export function EntityAutocompletePicker<
+  T extends DefaultEntityFilters = DefaultEntityFilters,
+  Name extends AllowedEntityFilters<T> = AllowedEntityFilters<T>,
+>(props: EntityAutocompletePickerProps<T, Name>): React_2.JSX.Element | null;
+
+// @public (undocumented)
+export type EntityAutocompletePickerProps<
+  T extends DefaultEntityFilters = DefaultEntityFilters,
+  Name extends AllowedEntityFilters<T> = AllowedEntityFilters<T>,
+> = {
+  label: string;
+  name: Name;
+  path: string;
+  showCounts?: boolean;
+  Filter: {
+    new (values: string[]): NonNullable<T[Name]>;
+  };
+  InputProps?: TextFieldProps;
+  initialSelectedOptions?: string[];
+};
+
 // @public
 export class EntityErrorFilter implements EntityFilter {
   constructor(value: boolean);
@@ -171,7 +207,7 @@ export class EntityKindFilter implements EntityFilter {
 // @public (undocumented)
 export const EntityKindPicker: (
   props: EntityKindPickerProps,
-) => JSX.Element | null;
+) => React_2.JSX.Element | null;
 
 // @public
 export interface EntityKindPickerProps {
@@ -196,7 +232,7 @@ export class EntityLifecycleFilter implements EntityFilter {
 // @public (undocumented)
 export const EntityLifecyclePicker: (props: {
   initialFilter?: string[];
-}) => JSX.Element;
+}) => React_2.JSX.Element;
 
 // @public
 export const EntityListContext: React_2.Context<
@@ -223,7 +259,7 @@ export type EntityListContextProps<
 // @public
 export const EntityListProvider: <EntityFilters extends DefaultEntityFilters>(
   props: PropsWithChildren<{}>,
-) => JSX.Element;
+) => React_2.JSX.Element;
 
 // @public (undocumented)
 export type EntityLoadingStatus<TEntity extends Entity = Entity> = {
@@ -245,7 +281,7 @@ export class EntityNamespaceFilter implements EntityFilter {
 }
 
 // @public (undocumented)
-export const EntityNamespacePicker: () => JSX.Element;
+export const EntityNamespacePicker: () => React_2.JSX.Element;
 
 // @public
 export class EntityOrphanFilter implements EntityFilter {
@@ -269,7 +305,7 @@ export class EntityOwnerFilter implements EntityFilter {
 // @public (undocumented)
 export const EntityOwnerPicker: (
   props?: EntityOwnerPickerProps,
-) => JSX.Element | null;
+) => React_2.JSX.Element | null;
 
 // @public (undocumented)
 export type EntityOwnerPickerProps = {
@@ -279,7 +315,7 @@ export type EntityOwnerPickerProps = {
 // @public
 export const EntityPeekAheadPopover: (
   props: EntityPeekAheadPopoverProps,
-) => JSX.Element;
+) => React_2.JSX.Element;
 
 // @public
 export type EntityPeekAheadPopoverProps = PropsWithChildren<{
@@ -288,10 +324,12 @@ export type EntityPeekAheadPopoverProps = PropsWithChildren<{
 }>;
 
 // @public (undocumented)
-export const EntityProcessingStatusPicker: () => JSX.Element;
+export const EntityProcessingStatusPicker: () => React_2.JSX.Element;
 
 // @public
-export const EntityProvider: (props: EntityProviderProps) => JSX.Element;
+export const EntityProvider: (
+  props: EntityProviderProps,
+) => React_2.JSX.Element;
 
 // @public
 export interface EntityProviderProps {
@@ -315,7 +353,7 @@ export type EntityRefLinkProps = {
 // @public
 export function EntityRefLinks<
   TRef extends string | CompoundEntityRef | Entity,
->(props: EntityRefLinksProps<TRef>): JSX.Element;
+>(props: EntityRefLinksProps<TRef>): React_2.JSX.Element;
 
 // @public
 export type EntityRefLinksProps<
@@ -351,7 +389,7 @@ export const entityRouteRef: RouteRef<{
 }>;
 
 // @public
-export const EntitySearchBar: () => JSX.Element;
+export const EntitySearchBar: () => React_2.JSX.Element;
 
 // @public (undocumented)
 export type EntitySourceLocation = {
@@ -361,7 +399,7 @@ export type EntitySourceLocation = {
 
 // @public
 export const EntityTable: {
-  <T extends Entity>(props: EntityTableProps<T>): JSX.Element;
+  <T extends Entity>(props: EntityTableProps<T>): React_2.JSX.Element;
   columns: Readonly<{
     createEntityRefColumn<T_1 extends Entity>(options: {
       defaultKind?: string | undefined;
@@ -415,7 +453,9 @@ export class EntityTagFilter implements EntityFilter {
 }
 
 // @public (undocumented)
-export const EntityTagPicker: (props: EntityTagPickerProps) => JSX.Element;
+export const EntityTagPicker: (
+  props: EntityTagPickerProps,
+) => React_2.JSX.Element;
 
 // @public (undocumented)
 export type EntityTagPickerProps = {
@@ -447,7 +487,7 @@ export class EntityTypeFilter implements EntityFilter {
 // @public (undocumented)
 export const EntityTypePicker: (
   props: EntityTypePickerProps,
-) => JSX.Element | null;
+) => React_2.JSX.Element | null;
 
 // @public
 export interface EntityTypePickerProps {
@@ -458,7 +498,9 @@ export interface EntityTypePickerProps {
 }
 
 // @public
-export const FavoriteEntity: (props: FavoriteEntityProps) => JSX.Element;
+export const FavoriteEntity: (
+  props: FavoriteEntityProps,
+) => React_2.JSX.Element;
 
 // @public (undocumented)
 export type FavoriteEntityProps = ComponentProps<typeof IconButton> & {
@@ -494,7 +536,7 @@ export function InspectEntityDialog(props: {
   open: boolean;
   entity: Entity;
   onClose: () => void;
-}): JSX.Element | null;
+}): React_2.JSX.Element | null;
 
 // @public (undocumented)
 export function MockEntityListContextProvider<
@@ -503,7 +545,7 @@ export function MockEntityListContextProvider<
   props: PropsWithChildren<{
     value?: Partial<EntityListContextProps<T>>;
   }>,
-): JSX.Element;
+): React_2.JSX.Element;
 
 // @public
 export class MockStarredEntitiesApi implements StarredEntitiesApi {
@@ -525,7 +567,7 @@ export const starredEntitiesApiRef: ApiRef<StarredEntitiesApi>;
 // @public (undocumented)
 export const UnregisterEntityDialog: (
   props: UnregisterEntityDialogProps,
-) => JSX.Element;
+) => React_2.JSX.Element;
 
 // @public (undocumented)
 export type UnregisterEntityDialogProps = {
@@ -601,7 +643,9 @@ export class UserListFilter implements EntityFilter {
 export type UserListFilterKind = 'owned' | 'starred' | 'all';
 
 // @public (undocumented)
-export const UserListPicker: (props: UserListPickerProps) => JSX.Element;
+export const UserListPicker: (
+  props: UserListPickerProps,
+) => React_2.JSX.Element;
 
 // @public (undocumented)
 export type UserListPickerProps = {
diff --git a/plugins/catalog-react/catalog-info.yaml b/plugins/catalog-react/catalog-info.yaml
new file mode 100644
index 0000000000..0fcfcbfb8e
--- /dev/null
+++ b/plugins/catalog-react/catalog-info.yaml
@@ -0,0 +1,12 @@
+apiVersion: backstage.io/v1alpha1
+kind: Component
+metadata:
+  name: backstage-plugin-catalog-react
+  title: '@backstage/plugin-catalog-react'
+  description: >-
+    A frontend library that helps other Backstage plugins interact with the
+    catalog
+spec:
+  lifecycle: production
+  type: backstage-web-library
+  owner: catalog-maintainers
diff --git a/plugins/catalog-react/package.json b/plugins/catalog-react/package.json
index 67a3409830..f1858b024d 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.8.1-next.0",
+  "version": "1.8.4-next.2",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
@@ -35,6 +35,7 @@
   "keywords": [
     "backstage"
   ],
+  "sideEffects": false,
   "scripts": {
     "build": "backstage-cli package build",
     "lint": "backstage-cli package lint",
diff --git a/plugins/catalog-react/src/components/CatalogFilterLayout/CatalogFilterLayout.tsx b/plugins/catalog-react/src/components/CatalogFilterLayout/CatalogFilterLayout.tsx
index 751eb35f1d..1a1404edf2 100644
--- a/plugins/catalog-react/src/components/CatalogFilterLayout/CatalogFilterLayout.tsx
+++ b/plugins/catalog-react/src/components/CatalogFilterLayout/CatalogFilterLayout.tsx
@@ -28,14 +28,20 @@ import FilterListIcon from '@material-ui/icons/FilterList';
 import { BackstageTheme } from '@backstage/theme';
 
 /** @public */
-export const Filters = (props: { children: React.ReactNode }) => {
-  const isMidSizeScreen = useMediaQuery<BackstageTheme>(theme =>
-    theme.breakpoints.down('md'),
+export const Filters = (props: {
+  children: React.ReactNode;
+  options?: {
+    drawerBreakpoint?: 'xs' | 'sm' | 'md' | 'lg' | 'xl' | number;
+    drawerAnchor?: 'left' | 'right' | 'top' | 'bottom';
+  };
+}) => {
+  const isScreenSmallerThanBreakpoint = useMediaQuery<BackstageTheme>(theme =>
+    theme.breakpoints.down(props.options?.drawerBreakpoint ?? 'md'),
   );
   const theme = useTheme<BackstageTheme>();
   const [filterDrawerOpen, setFilterDrawerOpen] = useState<boolean>(false);
 
-  return isMidSizeScreen ? (
+  return isScreenSmallerThanBreakpoint ? (
     <>
       <Button
         style={{ marginTop: theme.spacing(1), marginLeft: theme.spacing(1) }}
@@ -47,7 +53,7 @@ export const Filters = (props: { children: React.ReactNode }) => {
       <Drawer
         open={filterDrawerOpen}
         onClose={() => setFilterDrawerOpen(false)}
-        anchor="left"
+        anchor={props.options?.drawerAnchor ?? 'left'}
         disableAutoFocus
         keepMounted
         variant="temporary"
diff --git a/plugins/catalog-react/src/components/EntityAutocompletePicker/EntityAutocompletePicker.tsx b/plugins/catalog-react/src/components/EntityAutocompletePicker/EntityAutocompletePicker.tsx
index b6de85937d..3eaba51909 100644
--- a/plugins/catalog-react/src/components/EntityAutocompletePicker/EntityAutocompletePicker.tsx
+++ b/plugins/catalog-react/src/components/EntityAutocompletePicker/EntityAutocompletePicker.tsx
@@ -29,20 +29,15 @@ import {
 } from '../../hooks/useEntityListProvider';
 import { EntityFilter } from '../../types';
 
-type KeysMatchingCondition<T, V, K> = T extends V ? K : never;
-type KeysMatching<T, V> = {
-  [K in keyof T]-?: KeysMatchingCondition<T[K], V, K>;
+/** @public */
+export type AllowedEntityFilters<T extends DefaultEntityFilters> = {
+  [K in keyof T]-?: NonNullable<T[K]> extends EntityFilter & {
+    values: string[];
+  }
+    ? K
+    : never;
 }[keyof T];
 
-type AllowedEntityFilters<T extends DefaultEntityFilters> = KeysMatching<
-  T,
-  EntityFilter & { values: string[] }
->;
-
-interface ConstructableFilter<T> {
-  new (values: string[]): T;
-}
-
 /** @public */
 export type EntityAutocompletePickerProps<
   T extends DefaultEntityFilters = DefaultEntityFilters,
@@ -52,7 +47,7 @@ export type EntityAutocompletePickerProps<
   name: Name;
   path: string;
   showCounts?: boolean;
-  Filter: ConstructableFilter<NonNullable<T[Name]>>;
+  Filter: { new (values: string[]): NonNullable<T[Name]> };
   InputProps?: TextFieldProps;
   initialSelectedOptions?: string[];
 };
diff --git a/plugins/catalog-react/src/components/EntityAutocompletePicker/index.ts b/plugins/catalog-react/src/components/EntityAutocompletePicker/index.ts
index 10ce0123b7..684e7cef55 100644
--- a/plugins/catalog-react/src/components/EntityAutocompletePicker/index.ts
+++ b/plugins/catalog-react/src/components/EntityAutocompletePicker/index.ts
@@ -15,4 +15,7 @@
  */
 
 export { EntityAutocompletePicker } from './EntityAutocompletePicker';
-export type { EntityAutocompletePickerProps } from './EntityAutocompletePicker';
+export type {
+  EntityAutocompletePickerProps,
+  AllowedEntityFilters,
+} from './EntityAutocompletePicker';
diff --git a/plugins/catalog-react/src/components/EntityProcessingStatusPicker/index.ts b/plugins/catalog-react/src/components/EntityProcessingStatusPicker/index.ts
index 55daeaecc0..8c1471b5ad 100644
--- a/plugins/catalog-react/src/components/EntityProcessingStatusPicker/index.ts
+++ b/plugins/catalog-react/src/components/EntityProcessingStatusPicker/index.ts
@@ -13,5 +13,5 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-export { EntityProcessingStatusPicker as EntityProcessingStatusPicker } from './EntityProcessingStatusPicker';
+export { EntityProcessingStatusPicker } from './EntityProcessingStatusPicker';
 export type { CatalogReactEntityProcessingStatusPickerClassKey } from './EntityProcessingStatusPicker';
diff --git a/plugins/catalog-react/src/components/UnregisterEntityDialog/UnregisterEntityDialog.test.tsx b/plugins/catalog-react/src/components/UnregisterEntityDialog/UnregisterEntityDialog.test.tsx
index baa4b3732c..7f139854f6 100644
--- a/plugins/catalog-react/src/components/UnregisterEntityDialog/UnregisterEntityDialog.test.tsx
+++ b/plugins/catalog-react/src/components/UnregisterEntityDialog/UnregisterEntityDialog.test.tsx
@@ -48,6 +48,10 @@ describe('UnregisterEntityDialog', () => {
     },
   };
 
+  beforeEach(() => {
+    jest.spyOn(alertApi, 'post').mockImplementation(() => {});
+  });
+
   const entity = {
     apiVersion: 'backstage.io/v1alpha1',
     kind: 'Component',
@@ -346,6 +350,11 @@ describe('UnregisterEntityDialog', () => {
     await waitFor(() => {
       expect(deleteEntity).toHaveBeenCalled();
       expect(onConfirm).toHaveBeenCalled();
+      expect(alertApi.post).toHaveBeenCalledWith({
+        message: 'Removed entity n',
+        severity: 'success',
+        display: 'transient',
+      });
     });
   });
 });
diff --git a/plugins/catalog-react/src/components/UnregisterEntityDialog/UnregisterEntityDialog.tsx b/plugins/catalog-react/src/components/UnregisterEntityDialog/UnregisterEntityDialog.tsx
index 6c4984129e..56689c71ce 100644
--- a/plugins/catalog-react/src/components/UnregisterEntityDialog/UnregisterEntityDialog.tsx
+++ b/plugins/catalog-react/src/components/UnregisterEntityDialog/UnregisterEntityDialog.tsx
@@ -85,7 +85,13 @@ const Contents = ({
         setBusy(true);
         try {
           await state.deleteEntity();
+          const entityName = entity.metadata.title ?? entity.metadata.name;
           onConfirm();
+          alertApi.post({
+            message: `Removed entity ${entityName}`,
+            severity: 'success',
+            display: 'transient',
+          });
         } catch (err) {
           assertError(err);
           alertApi.post({ message: err.message });
@@ -94,7 +100,7 @@ const Contents = ({
         }
       }
     },
-    [alertApi, onConfirm, state],
+    [alertApi, onConfirm, state, entity],
   );
 
   const DialogActionsPanel = () => (
diff --git a/plugins/catalog-react/src/components/index.ts b/plugins/catalog-react/src/components/index.ts
index 6d8aa393ed..f77d13d2d3 100644
--- a/plugins/catalog-react/src/components/index.ts
+++ b/plugins/catalog-react/src/components/index.ts
@@ -30,3 +30,4 @@ export * from './UnregisterEntityDialog';
 export * from './UserListPicker';
 export * from './EntityProcessingStatusPicker';
 export * from './EntityNamespacePicker';
+export * from './EntityAutocompletePicker';
diff --git a/plugins/catalog-unprocessed-entities/CHANGELOG.md b/plugins/catalog-unprocessed-entities/CHANGELOG.md
index 03f4ecc8fa..db6b14af55 100644
--- a/plugins/catalog-unprocessed-entities/CHANGELOG.md
+++ b/plugins/catalog-unprocessed-entities/CHANGELOG.md
@@ -1,5 +1,51 @@
 # @backstage/plugin-catalog-unprocessed-entities
 
+## 0.1.3-next.2
+
+### Patch Changes
+
+- 8cec7664e146: Removed `@types/node` dependency
+- Updated dependencies
+  - @backstage/core-components@0.13.5-next.2
+  - @backstage/core-plugin-api@1.6.0-next.2
+  - @backstage/catalog-model@1.4.2-next.1
+  - @backstage/errors@1.2.1
+  - @backstage/theme@0.4.1
+
+## 0.1.3-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.13.5-next.1
+  - @backstage/catalog-model@1.4.2-next.0
+  - @backstage/core-plugin-api@1.6.0-next.1
+  - @backstage/errors@1.2.1
+  - @backstage/theme@0.4.1
+
+## 0.1.3-next.0
+
+### Patch Changes
+
+- 482bb5c0bbf8: Moved `@types/react` to be a regular dependency
+- Updated dependencies
+  - @backstage/core-plugin-api@1.6.0-next.0
+  - @backstage/core-components@0.13.5-next.0
+  - @backstage/catalog-model@1.4.1
+  - @backstage/errors@1.2.1
+  - @backstage/theme@0.4.1
+
+## 0.1.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.13.4
+  - @backstage/core-plugin-api@1.5.3
+  - @backstage/catalog-model@1.4.1
+  - @backstage/errors@1.2.1
+  - @backstage/theme@0.4.1
+
 ## 0.1.2-next.0
 
 ### Patch Changes
diff --git a/plugins/catalog-unprocessed-entities/api-report.md b/plugins/catalog-unprocessed-entities/api-report.md
index 0ccf9716f2..3ded42785a 100644
--- a/plugins/catalog-unprocessed-entities/api-report.md
+++ b/plugins/catalog-unprocessed-entities/api-report.md
@@ -8,6 +8,8 @@
 import { ApiRef } from '@backstage/core-plugin-api';
 import { BackstagePlugin } from '@backstage/core-plugin-api';
 import { Entity } from '@backstage/catalog-model';
+import { JSX as JSX_2 } from 'react';
+import { default as React_2 } from 'react';
 import { RouteRef } from '@backstage/core-plugin-api';
 
 // @public
@@ -25,7 +27,7 @@ export type CatalogUnprocessedEntitiesApiResponse = {
 };
 
 // @public
-export const CatalogUnprocessedEntitiesPage: () => JSX.Element;
+export const CatalogUnprocessedEntitiesPage: () => JSX_2.Element;
 
 // @public
 export const catalogUnprocessedEntitiesPlugin: BackstagePlugin<
@@ -37,7 +39,7 @@ export const catalogUnprocessedEntitiesPlugin: BackstagePlugin<
 >;
 
 // @public (undocumented)
-export const UnprocessedEntitiesContent: () => JSX.Element;
+export const UnprocessedEntitiesContent: () => React_2.JSX.Element;
 
 // @public
 export type UnprocessedEntity = {
diff --git a/plugins/catalog-unprocessed-entities/catalog-info.yaml b/plugins/catalog-unprocessed-entities/catalog-info.yaml
new file mode 100644
index 0000000000..8be164f111
--- /dev/null
+++ b/plugins/catalog-unprocessed-entities/catalog-info.yaml
@@ -0,0 +1,9 @@
+apiVersion: backstage.io/v1alpha1
+kind: Component
+metadata:
+  name: backstage-plugin-catalog-unprocessed-entities
+  title: '@backstage/plugin-catalog-unprocessed-entities'
+spec:
+  lifecycle: experimental
+  type: backstage-frontend-plugin
+  owner: catalog-maintainers
diff --git a/plugins/catalog-unprocessed-entities/package.json b/plugins/catalog-unprocessed-entities/package.json
index ff09e9e7f5..786fbbcb90 100644
--- a/plugins/catalog-unprocessed-entities/package.json
+++ b/plugins/catalog-unprocessed-entities/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-catalog-unprocessed-entities",
-  "version": "0.1.2-next.0",
+  "version": "0.1.3-next.2",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
@@ -18,6 +18,7 @@
     "url": "https://github.com/backstage/backstage",
     "directory": "plugins/catalog-unprocessed-entities"
   },
+  "sideEffects": false,
   "scripts": {
     "start": "backstage-cli package start",
     "build": "backstage-cli package build",
@@ -36,6 +37,7 @@
     "@material-ui/core": "^4.9.13",
     "@material-ui/icons": "^4.9.1",
     "@material-ui/lab": "^4.0.0-alpha.60",
+    "@types/react": "^16.13.1 || ^17.0.0",
     "react-use": "^17.2.4"
   },
   "peerDependencies": {
@@ -51,7 +53,6 @@
     "@testing-library/jest-dom": "^5.10.1",
     "@testing-library/react": "^12.1.3",
     "@testing-library/user-event": "^14.0.0",
-    "@types/node": "*",
     "msw": "^1.0.0"
   },
   "files": [
diff --git a/plugins/catalog/CHANGELOG.md b/plugins/catalog/CHANGELOG.md
index 88d0651a03..cd8834f13a 100644
--- a/plugins/catalog/CHANGELOG.md
+++ b/plugins/catalog/CHANGELOG.md
@@ -1,5 +1,97 @@
 # @backstage/plugin-catalog
 
+## 1.13.0-next.2
+
+### Minor Changes
+
+- e44f45ac4515: This change allows a new annotation of `backstage.io/techdocs-entity` this ref allows you to reference another entity for its TechDocs. This allows you have a single TechDoc for all items in a system, for example you might have a frontend and a backend in the same repo. This would allow you to have TechDocs build under a `System` entity while referencing the system e.g.: `backstage.io/techdocs-entity: system:default/example` that will show the systems docs in both the TechDocs button and the TechDocs tab without needing to do duplicate builds and filling the TechDocs page with garbage.
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/integration-react@1.1.19-next.2
+  - @backstage/core-components@0.13.5-next.2
+  - @backstage/core-plugin-api@1.6.0-next.2
+  - @backstage/plugin-catalog-react@1.8.4-next.2
+  - @backstage/plugin-search-react@1.7.0-next.2
+  - @backstage/catalog-model@1.4.2-next.1
+  - @backstage/catalog-client@1.4.4-next.1
+  - @backstage/errors@1.2.1
+  - @backstage/theme@0.4.1
+  - @backstage/types@1.1.0
+  - @backstage/plugin-catalog-common@1.0.16-next.1
+  - @backstage/plugin-scaffolder-common@1.4.1-next.1
+  - @backstage/plugin-search-common@1.2.6-next.1
+
+## 1.12.5-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.8.4-next.1
+  - @backstage/core-components@0.13.5-next.1
+  - @backstage/plugin-search-react@1.7.0-next.1
+  - @backstage/integration-react@1.1.19-next.1
+  - @backstage/catalog-model@1.4.2-next.0
+  - @backstage/core-plugin-api@1.6.0-next.1
+  - @backstage/catalog-client@1.4.4-next.0
+  - @backstage/plugin-catalog-common@1.0.16-next.0
+  - @backstage/plugin-scaffolder-common@1.4.1-next.0
+  - @backstage/errors@1.2.1
+  - @backstage/theme@0.4.1
+  - @backstage/types@1.1.0
+  - @backstage/plugin-search-common@1.2.6-next.0
+
+## 1.12.4-next.0
+
+### Patch Changes
+
+- 832eef72485b: Added title to props for `Has<kind>Cards`.
+- 163a41035e42: Fixed an issue where `EntitySwitch` was preventing the display of entity errors.
+- Updated dependencies
+  - @backstage/integration-react@1.1.18-next.0
+  - @backstage/core-plugin-api@1.6.0-next.0
+  - @backstage/core-components@0.13.5-next.0
+  - @backstage/catalog-client@1.4.3
+  - @backstage/catalog-model@1.4.1
+  - @backstage/errors@1.2.1
+  - @backstage/theme@0.4.1
+  - @backstage/types@1.1.0
+  - @backstage/plugin-catalog-common@1.0.15
+  - @backstage/plugin-catalog-react@1.8.3-next.0
+  - @backstage/plugin-scaffolder-common@1.4.0
+  - @backstage/plugin-search-common@1.2.5
+  - @backstage/plugin-search-react@1.6.5-next.0
+
+## 1.12.1
+
+### Patch Changes
+
+- 3d86be999fdf: Prefer simple `theme.spacing` without string interpolation
+- 136cea792bd4: Fixed an issue causing `EntitySwitch` to unmount its children once entity refresh was invoked
+- Updated dependencies
+  - @backstage/integration-react@1.1.16
+  - @backstage/core-components@0.13.4
+  - @backstage/plugin-catalog-react@1.8.1
+  - @backstage/plugin-scaffolder-common@1.4.0
+  - @backstage/core-plugin-api@1.5.3
+  - @backstage/plugin-search-react@1.6.4
+  - @backstage/catalog-client@1.4.3
+  - @backstage/catalog-model@1.4.1
+  - @backstage/errors@1.2.1
+  - @backstage/theme@0.4.1
+  - @backstage/types@1.1.0
+  - @backstage/plugin-catalog-common@1.0.15
+  - @backstage/plugin-search-common@1.2.5
+
+## 1.12.1-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.8.1-next.1
+  - @backstage/integration-react@1.1.16-next.1
+
 ## 1.12.1-next.1
 
 ### Patch Changes
diff --git a/plugins/catalog/api-report.md b/plugins/catalog/api-report.md
index fb067150be..c8956dcbe8 100644
--- a/plugins/catalog/api-report.md
+++ b/plugins/catalog/api-report.md
@@ -15,6 +15,7 @@ import { ExternalRouteRef } from '@backstage/core-plugin-api';
 import { IconComponent } from '@backstage/core-plugin-api';
 import { IndexableDocument } from '@backstage/plugin-search-common';
 import { InfoCardVariants } from '@backstage/core-components';
+import { JSX as JSX_2 } from 'react';
 import { Observable } from '@backstage/types';
 import { Overrides } from '@material-ui/core/styles/overrides';
 import { default as React_2 } from 'react';
@@ -39,7 +40,7 @@ export interface AboutCardProps {
 }
 
 // @public (undocumented)
-export function AboutContent(props: AboutContentProps): JSX.Element;
+export function AboutContent(props: AboutContentProps): React_2.JSX.Element;
 
 // @public
 export interface AboutContentProps {
@@ -48,7 +49,7 @@ export interface AboutContentProps {
 }
 
 // @public (undocumented)
-export function AboutField(props: AboutFieldProps): JSX.Element;
+export function AboutField(props: AboutFieldProps): React_2.JSX.Element;
 
 // @public
 export interface AboutFieldProps {
@@ -79,7 +80,9 @@ export const CatalogEntityPage: () => JSX.Element;
 export const CatalogIndexPage: (props: DefaultCatalogPageProps) => JSX.Element;
 
 // @public @deprecated (undocumented)
-export function CatalogKindHeader(props: CatalogKindHeaderProps): JSX.Element;
+export function CatalogKindHeader(
+  props: CatalogKindHeaderProps,
+): React_2.JSX.Element;
 
 // @public
 export interface CatalogKindHeaderProps {
@@ -137,7 +140,7 @@ export interface CatalogSearchResultListItemProps {
 
 // @public (undocumented)
 export const CatalogTable: {
-  (props: CatalogTableProps): JSX.Element;
+  (props: CatalogTableProps): React_2.JSX.Element;
   columns: Readonly<{
     createNameColumn(
       options?:
@@ -303,7 +306,7 @@ export const EntityHasSubcomponentsCard: (
 export const EntityHasSystemsCard: (props: HasSystemsCardProps) => JSX.Element;
 
 // @public (undocumented)
-export const EntityLabelsCard: (props: EntityLabelsCardProps) => JSX.Element;
+export const EntityLabelsCard: (props: EntityLabelsCardProps) => JSX_2.Element;
 
 // @public (undocumented)
 export interface EntityLabelsCardProps {
@@ -315,7 +318,7 @@ export interface EntityLabelsCardProps {
 
 // @public
 export const EntityLayout: {
-  (props: EntityLayoutProps): JSX.Element;
+  (props: EntityLayoutProps): React_2.JSX.Element;
   Route: (props: EntityLayoutRouteProps) => null;
 };
 
@@ -350,7 +353,7 @@ export type EntityLayoutRouteProps = {
 };
 
 // @public (undocumented)
-export const EntityLinksCard: (props: EntityLinksCardProps) => JSX.Element;
+export const EntityLinksCard: (props: EntityLinksCardProps) => JSX_2.Element;
 
 // @public (undocumented)
 export interface EntityLinksCardProps {
@@ -366,10 +369,10 @@ export type EntityLinksEmptyStateClassKey = 'code';
 // @public @deprecated (undocumented)
 export const EntityListContainer: (props: {
   children: ReactNode;
-}) => JSX.Element;
+}) => JSX_2.Element;
 
 // @public
-export function EntityOrphanWarning(): JSX.Element;
+export function EntityOrphanWarning(): React_2.JSX.Element;
 
 // @public (undocumented)
 export interface EntityPredicates {
@@ -380,14 +383,14 @@ export interface EntityPredicates {
 }
 
 // @public
-export function EntityProcessingErrorsPanel(): JSX.Element | null;
+export function EntityProcessingErrorsPanel(): React_2.JSX.Element | null;
 
 // @public
-export function EntityRelationWarning(): JSX.Element | null;
+export function EntityRelationWarning(): React_2.JSX.Element | null;
 
 // @public (undocumented)
 export const EntitySwitch: {
-  (props: EntitySwitchProps): JSX.Element;
+  (props: EntitySwitchProps): React_2.JSX.Element;
   Case: (_props: EntitySwitchCaseProps) => null;
 };
 
@@ -413,7 +416,22 @@ export interface EntitySwitchProps {
 }
 
 // @public @deprecated (undocumented)
-export const FilterContainer: (props: { children: ReactNode }) => JSX.Element;
+export const FilterContainer: (props: {
+  children: ReactNode;
+  options?:
+    | {
+        drawerBreakpoint?:
+          | number
+          | 'xs'
+          | 'sm'
+          | 'md'
+          | 'lg'
+          | 'xl'
+          | undefined;
+        drawerAnchor?: 'left' | 'top' | 'bottom' | 'right' | undefined;
+      }
+    | undefined;
+}) => JSX_2.Element;
 
 // @public @deprecated (undocumented)
 export const FilteredEntityLayout: (props: {
@@ -430,6 +448,8 @@ export function hasCatalogProcessingErrors(
 
 // @public (undocumented)
 export interface HasComponentsCardProps {
+  // (undocumented)
+  title?: string;
   // (undocumented)
   variant?: InfoCardVariants;
 }
@@ -447,6 +467,8 @@ export function hasRelationWarnings(
 
 // @public (undocumented)
 export interface HasResourcesCardProps {
+  // (undocumented)
+  title?: string;
   // (undocumented)
   variant?: InfoCardVariants;
 }
@@ -456,11 +478,15 @@ export interface HasSubcomponentsCardProps {
   // (undocumented)
   tableOptions?: TableOptions;
   // (undocumented)
+  title?: string;
+  // (undocumented)
   variant?: InfoCardVariants;
 }
 
 // @public (undocumented)
 export interface HasSystemsCardProps {
+  // (undocumented)
+  title?: string;
   // (undocumented)
   variant?: InfoCardVariants;
 }
diff --git a/plugins/catalog/catalog-info.yaml b/plugins/catalog/catalog-info.yaml
new file mode 100644
index 0000000000..5a20949214
--- /dev/null
+++ b/plugins/catalog/catalog-info.yaml
@@ -0,0 +1,10 @@
+apiVersion: backstage.io/v1alpha1
+kind: Component
+metadata:
+  name: backstage-plugin-catalog
+  title: '@backstage/plugin-catalog'
+  description: The Backstage plugin for browsing the Backstage catalog
+spec:
+  lifecycle: production
+  type: backstage-frontend-plugin
+  owner: catalog-maintainers
diff --git a/plugins/catalog/package.json b/plugins/catalog/package.json
index a27cb26f77..ba82b890e2 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.12.1-next.1",
+  "version": "1.13.0-next.2",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
@@ -22,6 +22,7 @@
   "keywords": [
     "backstage"
   ],
+  "sideEffects": false,
   "scripts": {
     "build": "backstage-cli package build",
     "start": "backstage-cli package start",
diff --git a/plugins/catalog/src/components/AboutCard/AboutCard.test.tsx b/plugins/catalog/src/components/AboutCard/AboutCard.test.tsx
index e8d2657e9f..1679e2ddf5 100644
--- a/plugins/catalog/src/components/AboutCard/AboutCard.test.tsx
+++ b/plugins/catalog/src/components/AboutCard/AboutCard.test.tsx
@@ -14,24 +14,25 @@
  * limitations under the License.
  */
 
-import { RELATION_OWNED_BY } from '@backstage/catalog-model';
-import { ConfigReader } from '@backstage/core-app-api';
+import {
+  CatalogApi,
+  EntityProvider,
+  catalogApiRef,
+  entityRouteRef,
+} from '@backstage/plugin-catalog-react';
 import {
   ScmIntegrationsApi,
   scmIntegrationsApiRef,
 } from '@backstage/integration-react';
-import {
-  catalogApiRef,
-  EntityProvider,
-  CatalogApi,
-  entityRouteRef,
-} from '@backstage/plugin-catalog-react';
-import { renderInTestApp, TestApiProvider } from '@backstage/test-utils';
-import userEvent from '@testing-library/user-event';
-import { screen } from '@testing-library/react';
-import React from 'react';
+import { TestApiProvider, renderInTestApp } from '@backstage/test-utils';
 import { createFromTemplateRouteRef, viewTechDocRouteRef } from '../../routes';
+
 import { AboutCard } from './AboutCard';
+import { ConfigReader } from '@backstage/core-app-api';
+import { RELATION_OWNED_BY } from '@backstage/catalog-model';
+import React from 'react';
+import { screen } from '@testing-library/react';
+import userEvent from '@testing-library/user-event';
 
 describe('<AboutCard />', () => {
   const catalogApi: jest.Mocked<CatalogApi> = {
@@ -347,6 +348,62 @@ describe('<AboutCard />', () => {
     ).not.toBeInTheDocument();
   });
 
+  it('renders techdocs lin when 3rdparty', async () => {
+    const entity = {
+      apiVersion: 'v1',
+      kind: 'Component',
+      metadata: {
+        name: 'software',
+        annotations: {
+          'backstage.io/techdocs-entity': 'system:default/example',
+        },
+      },
+      spec: {
+        owner: 'guest',
+        type: 'service',
+        lifecycle: 'production',
+      },
+    };
+
+    await renderInTestApp(
+      <TestApiProvider
+        apis={[
+          [
+            scmIntegrationsApiRef,
+            ScmIntegrationsApi.fromConfig(
+              new ConfigReader({
+                integrations: {
+                  github: [
+                    {
+                      host: 'github.com',
+                      token: '...',
+                    },
+                  ],
+                },
+              }),
+            ),
+          ],
+          [catalogApiRef, catalogApi],
+        ]}
+      >
+        <EntityProvider entity={entity}>
+          <AboutCard />
+        </EntityProvider>
+      </TestApiProvider>,
+      {
+        mountedRoutes: {
+          '/docs/:namespace/:kind/:name': viewTechDocRouteRef,
+          '/catalog/:namespace/:kind/:name': entityRouteRef,
+        },
+      },
+    );
+
+    expect(screen.getByText('View TechDocs').closest('a')).toHaveAttribute(
+      'href',
+      '/docs/default/system/example',
+    );
+  });
+
   it('renders techdocs link', async () => {
     const entity = {
       apiVersion: 'v1',
diff --git a/plugins/catalog/src/components/AboutCard/AboutCard.tsx b/plugins/catalog/src/components/AboutCard/AboutCard.tsx
index 06cc020e51..34aa463c39 100644
--- a/plugins/catalog/src/components/AboutCard/AboutCard.tsx
+++ b/plugins/catalog/src/components/AboutCard/AboutCard.tsx
@@ -16,32 +16,10 @@
 import {
   ANNOTATION_EDIT_URL,
   ANNOTATION_LOCATION,
+  CompoundEntityRef,
   DEFAULT_NAMESPACE,
   stringifyEntityRef,
 } from '@backstage/catalog-model';
-import {
-  HeaderIconLinkRow,
-  IconLinkVerticalProps,
-  InfoCardVariants,
-  Link,
-} from '@backstage/core-components';
-import {
-  alertApiRef,
-  errorApiRef,
-  useApi,
-  useApp,
-  useRouteRef,
-} from '@backstage/core-plugin-api';
-import {
-  ScmIntegrationIcon,
-  scmIntegrationsApiRef,
-} from '@backstage/integration-react';
-import {
-  catalogApiRef,
-  getEntitySourceLocation,
-  useEntity,
-} from '@backstage/plugin-catalog-react';
-import { isTemplateEntityV1beta3 } from '@backstage/plugin-scaffolder-common';
 import {
   Card,
   CardContent,
@@ -50,14 +28,42 @@ import {
   IconButton,
   makeStyles,
 } from '@material-ui/core';
-import CreateComponentIcon from '@material-ui/icons/AddCircleOutline';
+import {
+  HeaderIconLinkRow,
+  IconLinkVerticalProps,
+  InfoCardVariants,
+  Link,
+} from '@backstage/core-components';
+import React, { useCallback } from 'react';
+import {
+  ScmIntegrationIcon,
+  scmIntegrationsApiRef,
+} from '@backstage/integration-react';
+import {
+  alertApiRef,
+  errorApiRef,
+  useApi,
+  useApp,
+  useRouteRef,
+} from '@backstage/core-plugin-api';
+import {
+  catalogApiRef,
+  getEntitySourceLocation,
+  useEntity,
+} from '@backstage/plugin-catalog-react';
+import { createFromTemplateRouteRef, viewTechDocRouteRef } from '../../routes';
+
+import { AboutContent } from './AboutContent';
 import CachedIcon from '@material-ui/icons/Cached';
+import CreateComponentIcon from '@material-ui/icons/AddCircleOutline';
 import DocsIcon from '@material-ui/icons/Description';
 import EditIcon from '@material-ui/icons/Edit';
-import React, { useCallback } from 'react';
+import { isTemplateEntityV1beta3 } from '@backstage/plugin-scaffolder-common';
+import { parseEntityRef } from '@backstage/catalog-model';
 
-import { createFromTemplateRouteRef, viewTechDocRouteRef } from '../../routes';
-import { AboutContent } from './AboutContent';
+const TECHDOCS_ANNOTATION = 'backstage.io/techdocs-ref';
+
+const TECHDOCS_EXTERNAL_ANNOTATION = 'backstage.io/techdocs-entity';
 
 const useStyles = makeStyles({
   gridItemCard: {
@@ -110,6 +116,19 @@ export function AboutCard(props: AboutCardProps) {
   const entityMetadataEditUrl =
     entity.metadata.annotations?.[ANNOTATION_EDIT_URL];
 
+  let techdocsRef: CompoundEntityRef | undefined;
+
+  if (entity.metadata.annotations?.[TECHDOCS_EXTERNAL_ANNOTATION]) {
+    try {
+      techdocsRef = parseEntityRef(
+        entity.metadata.annotations?.[TECHDOCS_EXTERNAL_ANNOTATION],
+      );
+      // not a fan of this but we don't care if the parseEntityRef fails
+    } catch {
+      techdocsRef = undefined;
+    }
+  }
+
   const viewInSource: IconLinkVerticalProps = {
     label: 'View Source',
     disabled: !entitySourceLocation,
@@ -119,16 +138,24 @@ export function AboutCard(props: AboutCardProps) {
   const viewInTechDocs: IconLinkVerticalProps = {
     label: 'View TechDocs',
     disabled:
-      !entity.metadata.annotations?.['backstage.io/techdocs-ref'] ||
-      !viewTechdocLink,
+      !(
+        entity.metadata.annotations?.[TECHDOCS_ANNOTATION] ||
+        entity.metadata.annotations?.[TECHDOCS_EXTERNAL_ANNOTATION]
+      ) || !viewTechdocLink,
     icon: <DocsIcon />,
     href:
       viewTechdocLink &&
-      viewTechdocLink({
-        namespace: entity.metadata.namespace || DEFAULT_NAMESPACE,
-        kind: entity.kind,
-        name: entity.metadata.name,
-      }),
+      (techdocsRef
+        ? viewTechdocLink({
+            namespace: techdocsRef.namespace || DEFAULT_NAMESPACE,
+            kind: techdocsRef.kind,
+            name: techdocsRef.name,
+          })
+        : viewTechdocLink({
+            namespace: entity.metadata.namespace || DEFAULT_NAMESPACE,
+            kind: entity.kind,
+            name: entity.metadata.name,
+          })),
   };
 
   const subHeaderLinks = [viewInSource, viewInTechDocs];
diff --git a/plugins/catalog/src/components/EntitySwitch/EntitySwitch.test.tsx b/plugins/catalog/src/components/EntitySwitch/EntitySwitch.test.tsx
index 13e214d823..d9998b0ca5 100644
--- a/plugins/catalog/src/components/EntitySwitch/EntitySwitch.test.tsx
+++ b/plugins/catalog/src/components/EntitySwitch/EntitySwitch.test.tsx
@@ -19,8 +19,8 @@ import {
   AsyncEntityProvider,
   EntityProvider,
 } from '@backstage/plugin-catalog-react';
-import { render, screen } from '@testing-library/react';
-import React from 'react';
+import { render, screen, waitFor } from '@testing-library/react';
+import React, { useEffect } from 'react';
 import { isKind } from './conditions';
 import { EntitySwitch } from './EntitySwitch';
 import { featureFlagsApiRef } from '@backstage/core-plugin-api';
@@ -35,6 +35,124 @@ const Wrapper = ({ children }: { children?: React.ReactNode }) => (
 );
 
 describe('EntitySwitch', () => {
+  it('should render only the first match', () => {
+    const content = (
+      <EntitySwitch>
+        <EntitySwitch.Case if={isKind('component')} children="A" />
+        <EntitySwitch.Case if={isKind('component')} children="B" />
+        <EntitySwitch.Case children="C" />
+      </EntitySwitch>
+    );
+
+    render(
+      <Wrapper>
+        <EntityProvider
+          entity={{ metadata: { name: 'mock' }, kind: 'component' } as Entity}
+        >
+          {content}
+        </EntityProvider>
+      </Wrapper>,
+    );
+
+    expect(screen.getByText('A')).toBeInTheDocument();
+    expect(screen.queryByText('B')).not.toBeInTheDocument();
+    expect(screen.queryByText('C')).not.toBeInTheDocument();
+  });
+
+  it('should render the default case if entity is not found', () => {
+    const content = (
+      <EntitySwitch>
+        <EntitySwitch.Case if={isKind('component')} children="A" />
+        <EntitySwitch.Case if={isKind('api')} children="B" />
+        <EntitySwitch.Case children="C" />
+      </EntitySwitch>
+    );
+
+    render(
+      <Wrapper>
+        <AsyncEntityProvider entity={undefined} loading={false}>
+          {content}
+        </AsyncEntityProvider>
+      </Wrapper>,
+    );
+
+    expect(screen.queryByText('A')).not.toBeInTheDocument();
+    expect(screen.queryByText('B')).not.toBeInTheDocument();
+    expect(screen.queryByText('C')).toBeInTheDocument();
+  });
+
+  it(`shouldn't render any children if entity is loading and no entity exists in the context`, () => {
+    const content = (
+      <EntitySwitch>
+        <EntitySwitch.Case if={isKind('component')} children="A" />
+        <EntitySwitch.Case if={isKind('api')} children="B" />
+        <EntitySwitch.Case children="C" />
+      </EntitySwitch>
+    );
+
+    render(
+      <Wrapper>
+        <AsyncEntityProvider entity={undefined} loading>
+          {content}
+        </AsyncEntityProvider>
+      </Wrapper>,
+    );
+
+    expect(screen.queryByText('A')).not.toBeInTheDocument();
+    expect(screen.queryByText('B')).not.toBeInTheDocument();
+    expect(screen.queryByText('C')).not.toBeInTheDocument();
+  });
+
+  it('should render the fallback if no cases are matching', () => {
+    const content = (
+      <EntitySwitch>
+        <EntitySwitch.Case if={isKind('system')} children="A" />
+        <EntitySwitch.Case if={isKind('api')} children="B" />
+        <EntitySwitch.Case children="C" />
+      </EntitySwitch>
+    );
+
+    render(
+      <Wrapper>
+        <EntityProvider
+          entity={{ metadata: { name: 'mock' }, kind: 'component' } as Entity}
+        >
+          {content}
+        </EntityProvider>
+      </Wrapper>,
+    );
+
+    expect(screen.queryByText('A')).not.toBeInTheDocument();
+    expect(screen.queryByText('B')).not.toBeInTheDocument();
+    expect(screen.getByText('C')).toBeInTheDocument();
+  });
+
+  it('should render only the first fallback in case no cases are matching', () => {
+    const content = (
+      <EntitySwitch>
+        <EntitySwitch.Case if={isKind('system')} children="A" />
+        <EntitySwitch.Case if={isKind('api')} children="B" />
+        <EntitySwitch.Case children="C" />
+        <EntitySwitch.Case children="D" />
+      </EntitySwitch>
+    );
+
+    render(
+      <Wrapper>
+        <EntityProvider
+          entity={{ metadata: { name: 'mock' }, kind: 'component' } as Entity}
+        >
+          {content}
+        </EntityProvider>
+      </Wrapper>,
+    );
+
+    expect(screen.queryByText('A')).not.toBeInTheDocument();
+    expect(screen.queryByText('B')).not.toBeInTheDocument();
+    expect(screen.getByText('C')).toBeInTheDocument();
+    expect(screen.queryByText('D')).not.toBeInTheDocument();
+  });
+
   it('should switch child when entity switches', () => {
     const content = (
       <EntitySwitch>
@@ -96,7 +214,7 @@ describe('EntitySwitch', () => {
 
     expect(screen.queryByText('A')).not.toBeInTheDocument();
     expect(screen.queryByText('B')).not.toBeInTheDocument();
-    expect(screen.getByText('C')).toBeInTheDocument();
+    expect(screen.queryByText('C')).toBeInTheDocument();
   });
 
   it('should switch child when filters switch', () => {
@@ -209,6 +327,97 @@ describe('EntitySwitch', () => {
     expect(screen.queryByText('B')).not.toBeInTheDocument();
   });
 
+  it('should display the children in case entity is available and loading is true', () => {
+    const entity = { metadata: { name: 'mock' }, kind: 'component' } as Entity;
+
+    render(
+      <Wrapper>
+        <AsyncEntityProvider entity={entity} loading>
+          <EntitySwitch>
+            <EntitySwitch.Case
+              if={isKind('component')}
+              children={<p>Component</p>}
+            />
+            <EntitySwitch.Case if={isKind('system')} children={<p>System</p>} />
+          </EntitySwitch>
+        </AsyncEntityProvider>
+      </Wrapper>,
+    );
+
+    expect(screen.queryByText('Component')).toBeInTheDocument();
+    expect(screen.queryByText('System')).not.toBeInTheDocument();
+  });
+
+  it(`shouldn't unmount the children on entity refresh`, () => {
+    const entity = { metadata: { name: 'mock' }, kind: 'component' } as Entity;
+
+    let mountsCount = 0;
+    function Component() {
+      useEffect(() => {
+        ++mountsCount;
+      }, []);
+
+      return <p>Component</p>;
+    }
+
+    const rendered = render(
+      <Wrapper>
+        <AsyncEntityProvider entity={entity} loading={false}>
+          <EntitySwitch>
+            <EntitySwitch.Case
+              if={isKind('component')}
+              children={<Component />}
+            />
+            <EntitySwitch.Case if={isKind('system')} children={<p>System</p>} />
+          </EntitySwitch>
+        </AsyncEntityProvider>
+      </Wrapper>,
+    );
+
+    expect(screen.queryByText('Component')).toBeInTheDocument();
+    expect(screen.queryByText('System')).not.toBeInTheDocument();
+
+    expect(mountsCount).toBe(1);
+
+    rendered.rerender(
+      <Wrapper>
+        <AsyncEntityProvider entity={entity} loading>
+          <EntitySwitch>
+            <EntitySwitch.Case
+              if={isKind('component')}
+              children={<Component />}
+            />
+            <EntitySwitch.Case if={isKind('system')} children={<p>System</p>} />
+          </EntitySwitch>
+        </AsyncEntityProvider>
+      </Wrapper>,
+    );
+
+    expect(screen.queryByText('Component')).toBeInTheDocument();
+    expect(screen.queryByText('System')).not.toBeInTheDocument();
+
+    expect(mountsCount).toBe(1);
+
+    rendered.rerender(
+      <Wrapper>
+        <AsyncEntityProvider entity={entity} loading={false}>
+          <EntitySwitch>
+            <EntitySwitch.Case
+              if={isKind('component')}
+              children={<Component />}
+            />
+            <EntitySwitch.Case if={isKind('system')} children={<p>System</p>} />
+          </EntitySwitch>
+        </AsyncEntityProvider>
+      </Wrapper>,
+    );
+
+    expect(screen.queryByText('Component')).toBeInTheDocument();
+    expect(screen.queryByText('System')).not.toBeInTheDocument();
+
+    expect(mountsCount).toBe(1);
+  });
+
   it('should switch with async condition that is true', async () => {
     const entity = { metadata: { name: 'mock' }, kind: 'component' } as Entity;
 
@@ -292,10 +501,10 @@ describe('EntitySwitch', () => {
     expect(screen.queryByText('A')).not.toBeInTheDocument();
   });
 
-  it('should switch with sync condition that throws', async () => {
+  it('should switch with async condition that throws', async () => {
     const entity = { metadata: { name: 'mock' }, kind: 'component' } as Entity;
 
-    const shouldRender = () => Promise.reject();
+    const shouldRender = jest.fn().mockRejectedValue(undefined);
     render(
       <Wrapper>
         <EntityProvider entity={entity}>
@@ -308,7 +517,9 @@ describe('EntitySwitch', () => {
       </Wrapper>,
     );
 
-    await expect(screen.findByText('C')).resolves.toBeInTheDocument();
+    await waitFor(() => expect(shouldRender).toHaveBeenCalled());
+
+    expect(screen.getByText('C')).toBeInTheDocument();
     expect(screen.queryByText('A')).not.toBeInTheDocument();
     expect(screen.queryByText('B')).not.toBeInTheDocument();
   });
diff --git a/plugins/catalog/src/components/EntitySwitch/EntitySwitch.tsx b/plugins/catalog/src/components/EntitySwitch/EntitySwitch.tsx
index 3cd806faa5..9eab743308 100644
--- a/plugins/catalog/src/components/EntitySwitch/EntitySwitch.tsx
+++ b/plugins/catalog/src/components/EntitySwitch/EntitySwitch.tsx
@@ -66,6 +66,7 @@ export interface EntitySwitchProps {
 export const EntitySwitch = (props: EntitySwitchProps) => {
   const { entity, loading } = useAsyncEntity();
   const apis = useApiHolder();
+
   const results = useElementFilter(
     props.children,
     collection =>
@@ -76,15 +77,13 @@ export const EntitySwitch = (props: EntitySwitchProps) => {
         })
         .getElements()
         .flatMap<SwitchCaseResult>((element: ReactElement) => {
-          // Nothing is rendered while loading
-          if (loading) {
+          if (loading && !entity) {
             return [];
           }
 
           const { if: condition, children: elementsChildren } =
             element.props as EntitySwitchCase;
 
-          // If the entity is missing or there is an error, render the default page
           if (!entity) {
             return [
               {
diff --git a/plugins/catalog/src/components/HasComponentsCard/HasComponentsCard.tsx b/plugins/catalog/src/components/HasComponentsCard/HasComponentsCard.tsx
index 9654152a5c..9071dac030 100644
--- a/plugins/catalog/src/components/HasComponentsCard/HasComponentsCard.tsx
+++ b/plugins/catalog/src/components/HasComponentsCard/HasComponentsCard.tsx
@@ -27,14 +27,15 @@ import {
 /** @public */
 export interface HasComponentsCardProps {
   variant?: InfoCardVariants;
+  title?: string;
 }
 
 export function HasComponentsCard(props: HasComponentsCardProps) {
-  const { variant = 'gridItem' } = props;
+  const { variant = 'gridItem', title = 'Has components' } = props;
   return (
     <RelatedEntitiesCard
       variant={variant}
-      title="Has components"
+      title={title}
       entityKind="Component"
       relationType={RELATION_HAS_PART}
       columns={componentEntityColumns}
diff --git a/plugins/catalog/src/components/HasResourcesCard/HasResourcesCard.tsx b/plugins/catalog/src/components/HasResourcesCard/HasResourcesCard.tsx
index 8476d77bda..5af7eec258 100644
--- a/plugins/catalog/src/components/HasResourcesCard/HasResourcesCard.tsx
+++ b/plugins/catalog/src/components/HasResourcesCard/HasResourcesCard.tsx
@@ -27,14 +27,15 @@ import {
 /** @public */
 export interface HasResourcesCardProps {
   variant?: InfoCardVariants;
+  title?: string;
 }
 
 export function HasResourcesCard(props: HasResourcesCardProps) {
-  const { variant = 'gridItem' } = props;
+  const { variant = 'gridItem', title = 'Has resources' } = props;
   return (
     <RelatedEntitiesCard
       variant={variant}
-      title="Has resources"
+      title={title}
       entityKind="Resource"
       relationType={RELATION_HAS_PART}
       columns={resourceEntityColumns}
diff --git a/plugins/catalog/src/components/HasSubcomponentsCard/HasSubcomponentsCard.tsx b/plugins/catalog/src/components/HasSubcomponentsCard/HasSubcomponentsCard.tsx
index 6c673c5818..ac40c82435 100644
--- a/plugins/catalog/src/components/HasSubcomponentsCard/HasSubcomponentsCard.tsx
+++ b/plugins/catalog/src/components/HasSubcomponentsCard/HasSubcomponentsCard.tsx
@@ -27,14 +27,19 @@ import {
 export interface HasSubcomponentsCardProps {
   variant?: InfoCardVariants;
   tableOptions?: TableOptions;
+  title?: string;
 }
 
 export function HasSubcomponentsCard(props: HasSubcomponentsCardProps) {
-  const { variant = 'gridItem', tableOptions = {} } = props;
+  const {
+    variant = 'gridItem',
+    tableOptions = {},
+    title = 'Has subcomponents',
+  } = props;
   return (
     <RelatedEntitiesCard
       variant={variant}
-      title="Has subcomponents"
+      title={title}
       entityKind="Component"
       relationType={RELATION_HAS_PART}
       columns={componentEntityColumns}
diff --git a/plugins/catalog/src/components/HasSystemsCard/HasSystemsCard.tsx b/plugins/catalog/src/components/HasSystemsCard/HasSystemsCard.tsx
index 5d6fa170f5..d6da465ffa 100644
--- a/plugins/catalog/src/components/HasSystemsCard/HasSystemsCard.tsx
+++ b/plugins/catalog/src/components/HasSystemsCard/HasSystemsCard.tsx
@@ -27,14 +27,15 @@ import {
 /** @public */
 export interface HasSystemsCardProps {
   variant?: InfoCardVariants;
+  title?: string;
 }
 
 export function HasSystemsCard(props: HasSystemsCardProps) {
-  const { variant = 'gridItem' } = props;
+  const { variant = 'gridItem', title = 'Has systems' } = props;
   return (
     <RelatedEntitiesCard
       variant={variant}
-      title="Has systems"
+      title={title}
       entityKind="System"
       relationType={RELATION_HAS_PART}
       columns={systemEntityColumns}
diff --git a/plugins/cicd-statistics-module-gitlab/CHANGELOG.md b/plugins/cicd-statistics-module-gitlab/CHANGELOG.md
index f6c2ea06a6..2b7658a311 100644
--- a/plugins/cicd-statistics-module-gitlab/CHANGELOG.md
+++ b/plugins/cicd-statistics-module-gitlab/CHANGELOG.md
@@ -1,5 +1,49 @@
 # @backstage/plugin-cicd-statistics-module-gitlab
 
+## 0.1.20-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-plugin-api@1.6.0-next.2
+  - @backstage/plugin-cicd-statistics@0.1.26-next.2
+  - @backstage/catalog-model@1.4.2-next.1
+
+## 0.1.20-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-cicd-statistics@0.1.26-next.1
+  - @backstage/catalog-model@1.4.2-next.0
+  - @backstage/core-plugin-api@1.6.0-next.1
+
+## 0.1.19-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-plugin-api@1.6.0-next.0
+  - @backstage/catalog-model@1.4.1
+  - @backstage/plugin-cicd-statistics@0.1.25-next.0
+
+## 0.1.17
+
+### Patch Changes
+
+- 12a8c94eda8d: Add package repository and homepage metadata
+- Updated dependencies
+  - @backstage/core-plugin-api@1.5.3
+  - @backstage/catalog-model@1.4.1
+  - @backstage/plugin-cicd-statistics@0.1.23
+
+## 0.1.17-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-cicd-statistics@0.1.23-next.1
+
 ## 0.1.17-next.1
 
 ### Patch Changes
diff --git a/plugins/cicd-statistics-module-gitlab/catalog-info.yaml b/plugins/cicd-statistics-module-gitlab/catalog-info.yaml
new file mode 100644
index 0000000000..abfe402948
--- /dev/null
+++ b/plugins/cicd-statistics-module-gitlab/catalog-info.yaml
@@ -0,0 +1,10 @@
+apiVersion: backstage.io/v1alpha1
+kind: Component
+metadata:
+  name: backstage-plugin-cicd-statistics-module-gitlab
+  title: '@backstage/plugin-cicd-statistics-module-gitlab'
+  description: CI/CD Statistics plugin module; Gitlab CICD
+spec:
+  lifecycle: experimental
+  type: backstage-frontend-plugin-module
+  owner: maintainers
diff --git a/plugins/cicd-statistics-module-gitlab/package.json b/plugins/cicd-statistics-module-gitlab/package.json
index f7c34ade60..e21ff59997 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.17-next.1",
+  "version": "0.1.20-next.2",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
@@ -24,6 +24,7 @@
     "cicd statistics",
     "gitlab"
   ],
+  "sideEffects": false,
   "scripts": {
     "build": "backstage-cli package build",
     "lint": "backstage-cli package lint",
diff --git a/plugins/cicd-statistics/CHANGELOG.md b/plugins/cicd-statistics/CHANGELOG.md
index bdfe0cd1a9..11d702d524 100644
--- a/plugins/cicd-statistics/CHANGELOG.md
+++ b/plugins/cicd-statistics/CHANGELOG.md
@@ -1,5 +1,48 @@
 # @backstage/plugin-cicd-statistics
 
+## 0.1.26-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-plugin-api@1.6.0-next.2
+  - @backstage/plugin-catalog-react@1.8.4-next.2
+  - @backstage/catalog-model@1.4.2-next.1
+
+## 0.1.26-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.8.4-next.1
+  - @backstage/catalog-model@1.4.2-next.0
+  - @backstage/core-plugin-api@1.6.0-next.1
+
+## 0.1.25-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-plugin-api@1.6.0-next.0
+  - @backstage/catalog-model@1.4.1
+  - @backstage/plugin-catalog-react@1.8.3-next.0
+
+## 0.1.23
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.8.1
+  - @backstage/core-plugin-api@1.5.3
+  - @backstage/catalog-model@1.4.1
+
+## 0.1.23-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.8.1-next.1
+
 ## 0.1.23-next.0
 
 ### Patch Changes
diff --git a/plugins/cicd-statistics/catalog-info.yaml b/plugins/cicd-statistics/catalog-info.yaml
new file mode 100644
index 0000000000..83021cc033
--- /dev/null
+++ b/plugins/cicd-statistics/catalog-info.yaml
@@ -0,0 +1,10 @@
+apiVersion: backstage.io/v1alpha1
+kind: Component
+metadata:
+  name: backstage-plugin-cicd-statistics
+  title: '@backstage/plugin-cicd-statistics'
+  description: A frontend plugin visualizing CI/CD pipeline statistics (build time)
+spec:
+  lifecycle: experimental
+  type: backstage-frontend-plugin
+  owner: maintainers
diff --git a/plugins/cicd-statistics/package.json b/plugins/cicd-statistics/package.json
index 6bd94c67e2..168349fe56 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.23-next.0",
+  "version": "0.1.26-next.2",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
@@ -22,6 +22,7 @@
   "keywords": [
     "backstage"
   ],
+  "sideEffects": false,
   "scripts": {
     "build": "backstage-cli package build",
     "lint": "backstage-cli package lint",
diff --git a/plugins/circleci/CHANGELOG.md b/plugins/circleci/CHANGELOG.md
index c4a429ec47..eaf99f6092 100644
--- a/plugins/circleci/CHANGELOG.md
+++ b/plugins/circleci/CHANGELOG.md
@@ -1,5 +1,58 @@
 # @backstage/plugin-circleci
 
+## 0.3.24-next.2
+
+### Patch Changes
+
+- 8cec7664e146: Removed `@types/node` dependency
+- Updated dependencies
+  - @backstage/core-components@0.13.5-next.2
+  - @backstage/core-plugin-api@1.6.0-next.2
+  - @backstage/plugin-catalog-react@1.8.4-next.2
+  - @backstage/catalog-model@1.4.2-next.1
+  - @backstage/theme@0.4.1
+
+## 0.3.24-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.8.4-next.1
+  - @backstage/core-components@0.13.5-next.1
+  - @backstage/catalog-model@1.4.2-next.0
+  - @backstage/core-plugin-api@1.6.0-next.1
+  - @backstage/theme@0.4.1
+
+## 0.3.23-next.0
+
+### Patch Changes
+
+- 482bb5c0bbf8: Moved `@types/react` to be a regular dependency
+- Updated dependencies
+  - @backstage/core-plugin-api@1.6.0-next.0
+  - @backstage/core-components@0.13.5-next.0
+  - @backstage/catalog-model@1.4.1
+  - @backstage/theme@0.4.1
+  - @backstage/plugin-catalog-react@1.8.3-next.0
+
+## 0.3.21
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.13.4
+  - @backstage/plugin-catalog-react@1.8.1
+  - @backstage/core-plugin-api@1.5.3
+  - @backstage/catalog-model@1.4.1
+  - @backstage/theme@0.4.1
+
+## 0.3.21-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.8.1-next.1
+
 ## 0.3.21-next.0
 
 ### Patch Changes
diff --git a/plugins/circleci/api-report.md b/plugins/circleci/api-report.md
index 277b5720de..d706115610 100644
--- a/plugins/circleci/api-report.md
+++ b/plugins/circleci/api-report.md
@@ -15,8 +15,10 @@ import { CircleCIOptions } from 'circleci-api';
 import { DiscoveryApi } from '@backstage/core-plugin-api';
 import { Entity } from '@backstage/catalog-model';
 import { GitType } from 'circleci-api';
+import { JSX as JSX_2 } from 'react';
 import { Me } from 'circleci-api';
 import { PathParams } from '@backstage/core-plugin-api';
+import { default as React_2 } from 'react';
 import { RouteRef } from '@backstage/core-plugin-api';
 import { SubRouteRef } from '@backstage/core-plugin-api';
 
@@ -69,7 +71,7 @@ export { circleCIPlugin as plugin };
 export const circleCIRouteRef: RouteRef<undefined>;
 
 // @public (undocumented)
-export const EntityCircleCIContent: () => JSX.Element;
+export const EntityCircleCIContent: () => JSX_2.Element;
 
 export { GitType };
 
@@ -79,5 +81,5 @@ export { isCircleCIAvailable };
 export { isCircleCIAvailable as isPluginApplicableToEntity };
 
 // @public (undocumented)
-export const Router: () => JSX.Element;
+export const Router: () => React_2.JSX.Element;
 ```
diff --git a/plugins/circleci/catalog-info.yaml b/plugins/circleci/catalog-info.yaml
new file mode 100644
index 0000000000..1a02a270a9
--- /dev/null
+++ b/plugins/circleci/catalog-info.yaml
@@ -0,0 +1,10 @@
+apiVersion: backstage.io/v1alpha1
+kind: Component
+metadata:
+  name: backstage-plugin-circleci
+  title: '@backstage/plugin-circleci'
+  description: A Backstage plugin that integrates towards Circle CI
+spec:
+  lifecycle: experimental
+  type: backstage-frontend-plugin
+  owner: adamdmharvey
diff --git a/plugins/circleci/package.json b/plugins/circleci/package.json
index 68066ae890..c569c2e50f 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.21-next.0",
+  "version": "0.3.24-next.2",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
@@ -23,6 +23,7 @@
     "backstage",
     "circleci"
   ],
+  "sideEffects": false,
   "scripts": {
     "build": "backstage-cli package build",
     "lint": "backstage-cli package lint",
@@ -41,6 +42,7 @@
     "@material-ui/core": "^4.12.2",
     "@material-ui/icons": "^4.9.1",
     "@material-ui/lab": "4.0.0-alpha.61",
+    "@types/react": "^16.13.1 || ^17.0.0",
     "circleci-api": "^4.0.0",
     "humanize-duration": "^3.27.0",
     "lodash": "^4.17.21",
@@ -62,8 +64,6 @@
     "@testing-library/react": "^12.1.3",
     "@testing-library/user-event": "^14.0.0",
     "@types/humanize-duration": "^3.25.1",
-    "@types/node": "^16.11.26",
-    "@types/react": "^16.13.1 || ^17.0.0",
     "cross-fetch": "^3.1.5",
     "msw": "^1.0.0"
   },
diff --git a/plugins/cloudbuild/CHANGELOG.md b/plugins/cloudbuild/CHANGELOG.md
index ebd4d6bc54..57c16ea7cf 100644
--- a/plugins/cloudbuild/CHANGELOG.md
+++ b/plugins/cloudbuild/CHANGELOG.md
@@ -1,5 +1,59 @@
 # @backstage/plugin-cloudbuild
 
+## 0.3.24-next.2
+
+### Patch Changes
+
+- 8cec7664e146: Removed `@types/node` dependency
+- 814feeed7343: Update to handle invalid luxon values
+- Updated dependencies
+  - @backstage/core-components@0.13.5-next.2
+  - @backstage/core-plugin-api@1.6.0-next.2
+  - @backstage/plugin-catalog-react@1.8.4-next.2
+  - @backstage/catalog-model@1.4.2-next.1
+  - @backstage/theme@0.4.1
+
+## 0.3.24-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.8.4-next.1
+  - @backstage/core-components@0.13.5-next.1
+  - @backstage/catalog-model@1.4.2-next.0
+  - @backstage/core-plugin-api@1.6.0-next.1
+  - @backstage/theme@0.4.1
+
+## 0.3.23-next.0
+
+### Patch Changes
+
+- 482bb5c0bbf8: Moved `@types/react` to be a regular dependency
+- Updated dependencies
+  - @backstage/core-plugin-api@1.6.0-next.0
+  - @backstage/core-components@0.13.5-next.0
+  - @backstage/catalog-model@1.4.1
+  - @backstage/theme@0.4.1
+  - @backstage/plugin-catalog-react@1.8.3-next.0
+
+## 0.3.21
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.13.4
+  - @backstage/plugin-catalog-react@1.8.1
+  - @backstage/core-plugin-api@1.5.3
+  - @backstage/catalog-model@1.4.1
+  - @backstage/theme@0.4.1
+
+## 0.3.21-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.8.1-next.1
+
 ## 0.3.21-next.0
 
 ### Patch Changes
diff --git a/plugins/cloudbuild/api-report.md b/plugins/cloudbuild/api-report.md
index deacf96acd..dc2aacbc18 100644
--- a/plugins/cloudbuild/api-report.md
+++ b/plugins/cloudbuild/api-report.md
@@ -8,7 +8,9 @@
 import { ApiRef } from '@backstage/core-plugin-api';
 import { BackstagePlugin } from '@backstage/core-plugin-api';
 import { Entity } from '@backstage/catalog-model';
+import { JSX as JSX_2 } from 'react';
 import { OAuthApi } from '@backstage/core-plugin-api';
+import { default as React_2 } from 'react';
 import { RouteRef } from '@backstage/core-plugin-api';
 
 // @public (undocumented)
@@ -109,17 +111,17 @@ export { cloudbuildPlugin };
 export { cloudbuildPlugin as plugin };
 
 // @public (undocumented)
-export const EntityCloudbuildContent: () => JSX.Element;
+export const EntityCloudbuildContent: () => JSX_2.Element;
 
 // @public (undocumented)
 export const EntityLatestCloudbuildRunCard: (props: {
   branch: string;
-}) => JSX.Element;
+}) => JSX_2.Element;
 
 // @public (undocumented)
 export const EntityLatestCloudbuildsForBranchCard: (props: {
   branch: string;
-}) => JSX.Element;
+}) => JSX_2.Element;
 
 // @public (undocumented)
 export interface FETCHSOURCE {
@@ -135,12 +137,14 @@ export { isCloudbuildAvailable };
 export { isCloudbuildAvailable as isPluginApplicableToEntity };
 
 // @public (undocumented)
-export const LatestWorkflowRunCard: (props: { branch: string }) => JSX.Element;
+export const LatestWorkflowRunCard: (props: {
+  branch: string;
+}) => React_2.JSX.Element;
 
 // @public (undocumented)
 export const LatestWorkflowsForBranchCard: (props: {
   branch: string;
-}) => JSX.Element;
+}) => React_2.JSX.Element;
 
 // @public (undocumented)
 export interface Options {
@@ -181,7 +185,7 @@ export interface Results {
 }
 
 // @public (undocumented)
-export const Router: () => JSX.Element;
+export const Router: () => React_2.JSX.Element;
 
 // @public (undocumented)
 export interface Source {
diff --git a/plugins/cloudbuild/catalog-info.yaml b/plugins/cloudbuild/catalog-info.yaml
new file mode 100644
index 0000000000..ffe625a5e3
--- /dev/null
+++ b/plugins/cloudbuild/catalog-info.yaml
@@ -0,0 +1,10 @@
+apiVersion: backstage.io/v1alpha1
+kind: Component
+metadata:
+  name: backstage-plugin-cloudbuild
+  title: '@backstage/plugin-cloudbuild'
+  description: A Backstage plugin that integrates towards Google Cloud Build
+spec:
+  lifecycle: experimental
+  type: backstage-frontend-plugin
+  owner: maintainers
diff --git a/plugins/cloudbuild/package.json b/plugins/cloudbuild/package.json
index 6a487c5494..09e375b46e 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.21-next.0",
+  "version": "0.3.24-next.2",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
@@ -23,6 +23,7 @@
     "backstage",
     "google cloud"
   ],
+  "sideEffects": false,
   "scripts": {
     "build": "backstage-cli package build",
     "start": "backstage-cli package start",
@@ -41,6 +42,7 @@
     "@material-ui/core": "^4.12.2",
     "@material-ui/icons": "^4.9.1",
     "@material-ui/lab": "4.0.0-alpha.61",
+    "@types/react": "^16.13.1 || ^17.0.0",
     "luxon": "^3.0.0",
     "qs": "^6.9.4",
     "react-use": "^17.2.4"
@@ -59,8 +61,6 @@
     "@testing-library/jest-dom": "^5.10.1",
     "@testing-library/react": "^12.1.3",
     "@testing-library/user-event": "^14.0.0",
-    "@types/node": "^16.11.26",
-    "@types/react": "^16.13.1 || ^17.0.0",
     "cross-fetch": "^3.1.5",
     "msw": "^1.0.0"
   },
diff --git a/plugins/cloudbuild/src/components/WorkflowRunsTable/WorkflowRunsTable.tsx b/plugins/cloudbuild/src/components/WorkflowRunsTable/WorkflowRunsTable.tsx
index 736e641dbd..294847a700 100644
--- a/plugins/cloudbuild/src/components/WorkflowRunsTable/WorkflowRunsTable.tsx
+++ b/plugins/cloudbuild/src/components/WorkflowRunsTable/WorkflowRunsTable.tsx
@@ -87,7 +87,7 @@ const generatedColumns: TableColumn[] = [
     title: 'Created',
     render: (row: Partial<WorkflowRun>) => (
       <Typography data-testid="cell-created" variant="body2" noWrap>
-        {DateTime.fromISO(row.createTime ?? DateTime.now().toISO()).toFormat(
+        {DateTime.fromISO(row.createTime ?? DateTime.now().toISO()!).toFormat(
           'dd-MM-yyyy hh:mm:ss',
         )}
       </Typography>
diff --git a/plugins/code-climate/CHANGELOG.md b/plugins/code-climate/CHANGELOG.md
index 72d15c9730..4b062bb563 100644
--- a/plugins/code-climate/CHANGELOG.md
+++ b/plugins/code-climate/CHANGELOG.md
@@ -1,5 +1,59 @@
 # @backstage/plugin-code-climate
 
+## 0.1.24-next.2
+
+### Patch Changes
+
+- 8cec7664e146: Removed `@types/node` dependency
+- Updated dependencies
+  - @backstage/core-components@0.13.5-next.2
+  - @backstage/core-plugin-api@1.6.0-next.2
+  - @backstage/plugin-catalog-react@1.8.4-next.2
+  - @backstage/catalog-model@1.4.2-next.1
+  - @backstage/theme@0.4.1
+
+## 0.1.24-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.8.4-next.1
+  - @backstage/core-components@0.13.5-next.1
+  - @backstage/catalog-model@1.4.2-next.0
+  - @backstage/core-plugin-api@1.6.0-next.1
+  - @backstage/theme@0.4.1
+
+## 0.1.23-next.0
+
+### Patch Changes
+
+- 482bb5c0bbf8: Moved `@types/react` to be a regular dependency
+- Updated dependencies
+  - @backstage/core-plugin-api@1.6.0-next.0
+  - @backstage/core-components@0.13.5-next.0
+  - @backstage/catalog-model@1.4.1
+  - @backstage/theme@0.4.1
+  - @backstage/plugin-catalog-react@1.8.3-next.0
+
+## 0.1.21
+
+### Patch Changes
+
+- 12a8c94eda8d: Add package repository and homepage metadata
+- Updated dependencies
+  - @backstage/core-components@0.13.4
+  - @backstage/plugin-catalog-react@1.8.1
+  - @backstage/core-plugin-api@1.5.3
+  - @backstage/catalog-model@1.4.1
+  - @backstage/theme@0.4.1
+
+## 0.1.21-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.8.1-next.1
+
 ## 0.1.21-next.1
 
 ### Patch Changes
diff --git a/plugins/code-climate/api-report.md b/plugins/code-climate/api-report.md
index f4a2d3a26d..32359f663f 100644
--- a/plugins/code-climate/api-report.md
+++ b/plugins/code-climate/api-report.md
@@ -9,6 +9,7 @@ import { ApiRef } from '@backstage/core-plugin-api';
 import { BackstagePlugin } from '@backstage/core-plugin-api';
 import { DiscoveryApi } from '@backstage/core-plugin-api';
 import { FetchApi } from '@backstage/core-plugin-api';
+import { JSX as JSX_2 } from 'react';
 import { RouteRef } from '@backstage/core-plugin-api';
 
 // @public (undocumented)
@@ -46,7 +47,7 @@ export const codeClimatePlugin: BackstagePlugin<
 >;
 
 // @public (undocumented)
-export const EntityCodeClimateCard: () => JSX.Element;
+export const EntityCodeClimateCard: () => JSX_2.Element;
 
 // @public (undocumented)
 export class MockCodeClimateApi implements CodeClimateApi {
diff --git a/plugins/code-climate/catalog-info.yaml b/plugins/code-climate/catalog-info.yaml
new file mode 100644
index 0000000000..8797ec0bfd
--- /dev/null
+++ b/plugins/code-climate/catalog-info.yaml
@@ -0,0 +1,9 @@
+apiVersion: backstage.io/v1alpha1
+kind: Component
+metadata:
+  name: backstage-plugin-code-climate
+  title: '@backstage/plugin-code-climate'
+spec:
+  lifecycle: experimental
+  type: backstage-frontend-plugin
+  owner: maintainers
diff --git a/plugins/code-climate/package.json b/plugins/code-climate/package.json
index 3782e25a5a..36af08c4ae 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.21-next.1",
+  "version": "0.1.24-next.2",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
@@ -18,6 +18,7 @@
     "url": "https://github.com/backstage/backstage",
     "directory": "plugins/code-climate"
   },
+  "sideEffects": false,
   "scripts": {
     "build": "backstage-cli package build",
     "start": "backstage-cli package start",
@@ -36,6 +37,7 @@
     "@material-ui/core": "^4.12.2",
     "@material-ui/icons": "^4.9.1",
     "@material-ui/lab": "4.0.0-alpha.61",
+    "@types/react": "^16.13.1 || ^17.0.0",
     "humanize-duration": "^3.27.1",
     "luxon": "^3.0.0",
     "react-use": "^17.2.4"
@@ -55,8 +57,6 @@
     "@testing-library/user-event": "^14.0.0",
     "@types/humanize-duration": "^3.27.1",
     "@types/luxon": "^3.0.0",
-    "@types/node": "^16.11.26",
-    "@types/react": "^16.13.1 || ^17.0.0",
     "msw": "^1.0.0"
   },
   "files": [
diff --git a/plugins/code-coverage-backend/CHANGELOG.md b/plugins/code-coverage-backend/CHANGELOG.md
index b2fd302e8c..de7bb9bed0 100644
--- a/plugins/code-coverage-backend/CHANGELOG.md
+++ b/plugins/code-coverage-backend/CHANGELOG.md
@@ -1,5 +1,77 @@
 # @backstage/plugin-code-coverage-backend
 
+## 0.2.17-next.2
+
+### Patch Changes
+
+- df005d9932fb: Add text body parser for LCOV reports
+- 91ccb56fb418: Replace `express-xml-bodyparser` with `body-parser-xml`.
+
+  `express-xml-bodyparser` was last updated 8 years ago
+  and currently depends on a version of `xml2js` which
+  contains a vulnerability.
+
+  This change will swap it out in favor of `body-parser-xml`
+  which is more maintained and depends on a more recent `xml2js`
+  version without the vulnerability.
+
+- 33e606a797ef: Include auth token when fetching entity
+- Updated dependencies
+  - @backstage/config@1.1.0-next.1
+  - @backstage/backend-common@0.19.5-next.2
+  - @backstage/plugin-auth-node@0.3.0-next.2
+  - @backstage/integration@1.7.0-next.2
+  - @backstage/catalog-model@1.4.2-next.1
+  - @backstage/catalog-client@1.4.4-next.1
+  - @backstage/errors@1.2.1
+
+## 0.2.17-next.1
+
+### Patch Changes
+
+- d409ed988aed: Correct the line hits calculation for Cobertura reports
+- Updated dependencies
+  - @backstage/config@1.1.0-next.0
+  - @backstage/integration@1.7.0-next.1
+  - @backstage/backend-common@0.19.5-next.1
+  - @backstage/catalog-model@1.4.2-next.0
+  - @backstage/catalog-client@1.4.4-next.0
+  - @backstage/errors@1.2.1
+
+## 0.2.16-next.0
+
+### Patch Changes
+
+- 3f1367b956c6: Added support for LCOV coverage reports
+- cfc3ca6ce060: Changes needed to support MySQL
+- Updated dependencies
+  - @backstage/backend-common@0.19.4-next.0
+  - @backstage/integration@1.7.0-next.0
+  - @backstage/catalog-client@1.4.3
+  - @backstage/catalog-model@1.4.1
+  - @backstage/config@1.0.8
+  - @backstage/errors@1.2.1
+
+## 0.2.14
+
+### Patch Changes
+
+- 12a8c94eda8d: Add package repository and homepage metadata
+- Updated dependencies
+  - @backstage/backend-common@0.19.2
+  - @backstage/integration@1.6.0
+  - @backstage/catalog-client@1.4.3
+  - @backstage/catalog-model@1.4.1
+  - @backstage/config@1.0.8
+  - @backstage/errors@1.2.1
+
+## 0.2.14-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.19.2-next.2
+
 ## 0.2.14-next.1
 
 ### Patch Changes
diff --git a/plugins/code-coverage-backend/README.md b/plugins/code-coverage-backend/README.md
index 802e538125..a60b95ff25 100644
--- a/plugins/code-coverage-backend/README.md
+++ b/plugins/code-coverage-backend/README.md
@@ -125,6 +125,24 @@ Example:
 }
 ```
 
+### Adding a LCOV report
+
+POST a LCOV INFO file to `/report`
+
+Example:
+
+```json
+// curl -X POST -H "Content-Type:text/plain" -d @coverage.info "localhost:7007/api/code-coverage/report?entity=component:default/entity-name&coverageType=lcov"
+{
+  "links": [
+    {
+      "href": "http://localhost:7007/api/code-coverage/report?entity=component:default/entity-name",
+      "rel": "coverage"
+    }
+  ]
+}
+```
+
 ### Reading json coverage
 
 GET `/report`
diff --git a/plugins/code-coverage-backend/catalog-info.yaml b/plugins/code-coverage-backend/catalog-info.yaml
new file mode 100644
index 0000000000..3c0cdaebbf
--- /dev/null
+++ b/plugins/code-coverage-backend/catalog-info.yaml
@@ -0,0 +1,10 @@
+apiVersion: backstage.io/v1alpha1
+kind: Component
+metadata:
+  name: backstage-plugin-code-coverage-backend
+  title: '@backstage/plugin-code-coverage-backend'
+  description: A Backstage backend plugin that helps you keep track of your code coverage
+spec:
+  lifecycle: experimental
+  type: backstage-backend-plugin
+  owner: alde
diff --git a/plugins/code-coverage-backend/migrations/20210302_init.js b/plugins/code-coverage-backend/migrations/20210302_init.js
index a794b6a60c..35eb91541b 100644
--- a/plugins/code-coverage-backend/migrations/20210302_init.js
+++ b/plugins/code-coverage-backend/migrations/20210302_init.js
@@ -34,7 +34,7 @@ exports.up = async function up(knex) {
       .comment('An insert counter to ensure ordering');
     table.uuid('id').notNullable().comment('The ID of the code coverage');
     table
-      .text('entity')
+      .string('entity')
       .notNullable()
       .comment('The entity ref that this code coverage applies to');
     table
diff --git a/plugins/code-coverage-backend/package.json b/plugins/code-coverage-backend/package.json
index 6b366ab312..5b1e7867b4 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.14-next.1",
+  "version": "0.2.17-next.2",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
@@ -35,10 +35,12 @@
     "@backstage/config": "workspace:^",
     "@backstage/errors": "workspace:^",
     "@backstage/integration": "workspace:^",
+    "@backstage/plugin-auth-node": "workspace:^",
     "@types/express": "^4.17.6",
+    "body-parser": "^1.20.0",
+    "body-parser-xml": "^2.0.5",
     "express": "^4.17.1",
     "express-promise-router": "^4.1.0",
-    "express-xml-bodyparser": "^0.3.0",
     "knex": "^2.0.0",
     "uuid": "^8.3.2",
     "winston": "^3.2.1",
@@ -46,7 +48,7 @@
   },
   "devDependencies": {
     "@backstage/cli": "workspace:^",
-    "@types/express-xml-bodyparser": "^0.3.2",
+    "@types/body-parser-xml": "^2.0.2",
     "@types/supertest": "^2.0.8",
     "msw": "^1.0.0",
     "supertest": "^6.1.6",
diff --git a/plugins/code-coverage-backend/src/service/CoverageUtils.test.ts b/plugins/code-coverage-backend/src/service/CoverageUtils.test.ts
index 44b1411cc4..23c7c6cba0 100644
--- a/plugins/code-coverage-backend/src/service/CoverageUtils.test.ts
+++ b/plugins/code-coverage-backend/src/service/CoverageUtils.test.ts
@@ -224,11 +224,11 @@ describe('CodeCoverageUtils', () => {
         err = error;
       }
       expect(err?.message).toEqual(
-        'Content-Type header "application/json" not supported, expected "text/xml" possibly followed by a charset',
+        'Content-Type header "application/json" not supported, expected "text/xml" or "text/plain" possibly followed by a charset',
       );
     });
 
-    it('parses the body', () => {
+    it('parses the xml body', () => {
       const data: Readable = utils.validateRequestBody({
         headers: {
           'content-type': 'text/xml',
@@ -240,6 +240,19 @@ describe('CodeCoverageUtils', () => {
 
       expect(data.read()).toContain('<?xml');
     });
+
+    it('parses the plain body', () => {
+      const data: Readable = utils.validateRequestBody({
+        headers: {
+          'content-type': 'text/plain',
+        },
+        body: Readable.from(
+          'TN:\nSF:/src/index.js\nFNF:0\nFNH:0\nLF:1\nLH:1\nBRF:0\nBRH:0\nend_of_record',
+        ),
+      } as Request);
+
+      expect(data.read()).toMatch(/^TN:\nSF:\/src\/index.js/);
+    });
   });
 
   describe('processCoveragePayload', () => {
diff --git a/plugins/code-coverage-backend/src/service/CoverageUtils.ts b/plugins/code-coverage-backend/src/service/CoverageUtils.ts
index a4d3405868..bfe79e869f 100644
--- a/plugins/code-coverage-backend/src/service/CoverageUtils.ts
+++ b/plugins/code-coverage-backend/src/service/CoverageUtils.ts
@@ -163,9 +163,10 @@ export class CoverageUtils {
     const contentType = req.headers['content-type'];
     if (!contentType) {
       throw new InputError('Content-Type header missing');
-    } else if (!contentType.match(/^text\/xml($|;)/)) {
+      // text/xml or text/plain is allowed
+    } else if (!contentType.match(/^text\/xml|plain($|;)/)) {
       throw new InputError(
-        `Content-Type header "${contentType}" not supported, expected "text/xml" possibly followed by a charset`,
+        `Content-Type header "${contentType}" not supported, expected "text/xml" or "text/plain" possibly followed by a charset`,
       );
     }
     const body = req.body;
diff --git a/plugins/code-coverage-backend/src/service/__fixtures__/cobertura-jsoncoverage-files-1.json b/plugins/code-coverage-backend/src/service/__fixtures__/cobertura-jsoncoverage-files-1.json
index b5b861254c..3bc4a532cc 100644
--- a/plugins/code-coverage-backend/src/service/__fixtures__/cobertura-jsoncoverage-files-1.json
+++ b/plugins/code-coverage-backend/src/service/__fixtures__/cobertura-jsoncoverage-files-1.json
@@ -2,10 +2,10 @@
   {
     "filename": "src/main/scala/com/example/Main.scala",
     "lineHits": {
-      "100": 4,
-      "103": 2,
-      "104": 4,
-      "105": 4,
+      "100": 2,
+      "103": 1,
+      "104": 2,
+      "105": 2,
       "112": 2,
       "114": 4,
       "115": 2,
@@ -25,14 +25,14 @@
       "148": 1,
       "149": 1,
       "150": 1,
-      "160": 2,
-      "163": 8,
-      "164": 4,
-      "166": 2,
-      "167": 4,
-      "168": 6,
-      "169": 6,
-      "170": 4,
+      "160": 1,
+      "163": 4,
+      "164": 2,
+      "166": 1,
+      "167": 2,
+      "168": 3,
+      "169": 3,
+      "170": 2,
       "178": 1,
       "179": 1,
       "181": 1,
@@ -40,46 +40,46 @@
       "183": 3,
       "187": 1,
       "188": 3,
-      "202": 4,
-      "203": 6,
-      "204": 4,
+      "202": 2,
+      "203": 3,
+      "204": 2,
       "210": 5,
-      "26": 4,
-      "27": 4,
-      "28": 4,
-      "30": 4,
-      "33": 4,
-      "35": 2,
-      "36": 2,
-      "37": 4,
-      "38": 2,
-      "42": 2,
-      "44": 2,
-      "46": 2,
-      "48": 2,
-      "50": 2,
-      "52": 2,
-      "53": 2,
-      "55": 2,
-      "56": 2,
-      "58": 2,
-      "60": 2,
-      "61": 2,
-      "64": 2,
-      "65": 6,
-      "68": 4,
-      "73": 2,
-      "75": 10,
-      "77": 4,
+      "26": 2,
+      "27": 2,
+      "28": 2,
+      "30": 2,
+      "33": 2,
+      "35": 1,
+      "36": 1,
+      "37": 2,
+      "38": 1,
+      "42": 1,
+      "44": 1,
+      "46": 1,
+      "48": 1,
+      "50": 1,
+      "52": 1,
+      "53": 1,
+      "55": 1,
+      "56": 1,
+      "58": 1,
+      "60": 1,
+      "61": 1,
+      "64": 1,
+      "65": 3,
+      "68": 2,
+      "73": 1,
+      "75": 5,
+      "77": 2,
       "83": 1,
       "84": 2,
       "85": 3,
       "86": 3,
       "87": 1,
       "88": 6,
-      "95": 2,
-      "97": 8,
-      "99": 2
+      "95": 1,
+      "97": 4,
+      "99": 1
     },
     "branchHits": {}
   },
@@ -100,9 +100,9 @@
       "123": 3,
       "124": 1,
       "129": 7,
-      "132": 2,
-      "133": 4,
-      "134": 2,
+      "132": 1,
+      "133": 2,
+      "134": 1,
       "138": 1,
       "139": 2,
       "140": 2,
@@ -125,13 +125,13 @@
       "33": 2,
       "34": 2,
       "37": 0,
-      "42": 4,
-      "44": 2,
-      "45": 2,
-      "46": 2,
-      "49": 4,
-      "50": 10,
-      "52": 4,
+      "42": 2,
+      "44": 1,
+      "45": 1,
+      "46": 1,
+      "49": 2,
+      "50": 5,
+      "52": 2,
       "59": 5,
       "61": 4,
       "64": 2,
@@ -157,9 +157,9 @@
   {
     "filename": "src/main/scala/com/example/utils/Util.scala",
     "lineHits": {
-      "13": 2,
-      "8": 4,
-      "7": 2
+      "7": 1,
+      "8": 2,
+      "13": 1
     },
     "branchHits": {}
   }
diff --git a/plugins/code-coverage-backend/src/service/__fixtures__/cobertura-jsoncoverage-files-2.json b/plugins/code-coverage-backend/src/service/__fixtures__/cobertura-jsoncoverage-files-2.json
index ddfcc729fd..d8770694a9 100644
--- a/plugins/code-coverage-backend/src/service/__fixtures__/cobertura-jsoncoverage-files-2.json
+++ b/plugins/code-coverage-backend/src/service/__fixtures__/cobertura-jsoncoverage-files-2.json
@@ -18,15 +18,15 @@
   {
     "filename": "src/utils.ts",
     "lineHits": {
-      "4": 104,
-      "7": 1178,
-      "12": 20,
+      "4": 19,
+      "7": 589,
+      "12": 18,
       "16": 2,
-      "29": 3105,
+      "29": 2329,
       "33": 1601,
       "37": 15,
       "56": 20,
-      "64": 42,
+      "64": 21,
       "65": 2,
       "1": 18,
       "8": 589,
@@ -84,37 +84,37 @@
   {
     "filename": "src/controller/VideoContextPlayerCoordinator.ts",
     "lineHits": {
-      "50": 8,
-      "74": 66,
+      "50": 4,
+      "74": 33,
       "137": 33,
-      "143": 5,
-      "157": 18,
-      "217": 5,
-      "240": 5,
-      "309": 48,
-      "343": 48,
-      "357": 48,
-      "405": 8,
+      "143": 4,
+      "157": 4,
+      "217": 4,
+      "240": 4,
+      "309": 24,
+      "343": 24,
+      "357": 24,
+      "405": 4,
       "420": 20,
       "442": 19,
       "445": 1,
       "460": 20,
       "466": 20,
-      "480": 16,
+      "480": 8,
       "488": 8,
-      "520": 16,
+      "520": 8,
       "530": 14,
       "619": 0,
       "627": 2,
       "636": 0,
-      "640": 8,
-      "651": 8,
-      "661": 12,
-      "673": 37,
-      "690": 8,
-      "711": 7,
-      "736": 4,
-      "740": 29,
+      "640": 4,
+      "651": 4,
+      "661": 4,
+      "673": 4,
+      "690": 4,
+      "711": 4,
+      "736": 2,
+      "740": 4,
       "1": 4,
       "2": 4,
       "31": 4,
@@ -508,9 +508,9 @@
   {
     "filename": "src/controller/VideoContextPlayerCoordinatorFactory.ts",
     "lineHits": {
-      "9": 8,
+      "9": 4,
       "11": 33,
-      "14": 66,
+      "14": 33,
       "2": 4,
       "3": 4,
       "4": 4,
@@ -556,24 +556,24 @@
   {
     "filename": "src/controller-x/VideoContextPlayerCoordinatorX.ts",
     "lineHits": {
-      "43": 6,
-      "59": 60,
-      "99": 24,
+      "43": 3,
+      "59": 30,
+      "99": 3,
       "126": 0,
       "132": 0,
-      "219": 4,
-      "233": 16,
+      "219": 3,
+      "233": 3,
       "290": 3,
-      "338": 34,
+      "338": 17,
       "341": 17,
-      "362": 34,
+      "362": 17,
       "363": 0,
-      "422": 10,
-      "435": 8,
-      "444": 33,
-      "458": 6,
-      "466": 4,
-      "477": 4,
+      "422": 3,
+      "435": 3,
+      "444": 3,
+      "458": 3,
+      "466": 3,
+      "477": 3,
       "507": 3,
       "1": 3,
       "2": 3,
@@ -852,27 +852,27 @@
   {
     "filename": "src/controller-x/VideoContextPlayerCoordinatorXObserver.ts",
     "lineHits": {
-      "5": 6,
+      "5": 3,
       "9": 3,
-      "13": 4,
-      "17": 7,
+      "13": 3,
+      "17": 3,
       "24": 3,
-      "26": 4,
+      "26": 3,
       "30": 3,
       "32": 3,
-      "34": 4,
+      "34": 3,
       "38": 3,
       "40": 3,
       "42": 3,
-      "44": 4,
+      "44": 3,
       "48": 3,
       "50": 3,
       "52": 3,
-      "54": 4,
-      "58": 4,
-      "62": 4,
-      "66": 4,
-      "70": 4,
+      "54": 3,
+      "58": 3,
+      "62": 3,
+      "66": 3,
+      "70": 3,
       "74": 3,
       "76": 3,
       "78": 3,
@@ -904,54 +904,54 @@
   {
     "filename": "src/events/InternalPlaybackObserver.ts",
     "lineHits": {
-      "17": 22,
+      "17": 11,
       "21": 107,
-      "26": 100,
+      "26": 11,
       "32": 0,
       "39": 0,
-      "42": 100,
+      "42": 11,
       "48": 89,
       "57": 11,
       "59": 0,
-      "63": 100,
+      "63": 11,
       "65": 89,
-      "69": 38,
+      "69": 11,
       "71": 27,
-      "75": 16,
+      "75": 11,
       "77": 5,
-      "81": 12,
+      "81": 11,
       "83": 1,
-      "87": 13,
+      "87": 11,
       "89": 2,
-      "93": 18,
+      "93": 11,
       "95": 7,
-      "99": 12,
+      "99": 11,
       "101": 1,
-      "106": 13,
+      "106": 11,
       "108": 2,
-      "113": 13,
+      "113": 11,
       "115": 2,
-      "120": 109,
+      "120": 11,
       "122": 98,
-      "126": 15,
+      "126": 11,
       "128": 4,
-      "132": 15,
+      "132": 11,
       "134": 4,
-      "138": 104,
+      "138": 11,
       "144": 93,
-      "149": 12,
+      "149": 11,
       "151": 1,
-      "156": 12,
+      "156": 11,
       "158": 1,
-      "163": 12,
+      "163": 11,
       "165": 1,
-      "170": 12,
+      "170": 11,
       "172": 1,
-      "177": 15,
+      "177": 11,
       "179": 4,
-      "184": 19,
+      "184": 11,
       "186": 8,
-      "191": 14,
+      "191": 11,
       "193": 3,
       "22": 107,
       "23": 107,
@@ -1008,35 +1008,35 @@
   {
     "filename": "src/events/PlaybackEventsObserver.ts",
     "lineHits": {
-      "24": 22,
+      "24": 11,
       "28": 90,
-      "36": 100,
-      "48": 23,
-      "52": 17,
-      "56": 100,
+      "36": 11,
+      "48": 11,
+      "52": 11,
+      "56": 11,
       "71": 11,
-      "75": 100,
-      "88": 38,
-      "97": 15,
-      "101": 12,
-      "105": 12,
-      "112": 13,
-      "116": 18,
-      "124": 12,
-      "129": 13,
-      "134": 13,
-      "142": 109,
-      "150": 15,
-      "157": 15,
-      "165": 104,
-      "177": 12,
-      "184": 12,
-      "191": 12,
-      "196": 12,
-      "204": 15,
-      "211": 19,
-      "219": 14,
-      "227": 472,
+      "75": 11,
+      "88": 11,
+      "97": 11,
+      "101": 11,
+      "105": 11,
+      "112": 11,
+      "116": 11,
+      "124": 11,
+      "129": 11,
+      "134": 11,
+      "142": 11,
+      "150": 11,
+      "157": 11,
+      "165": 11,
+      "177": 11,
+      "184": 11,
+      "191": 11,
+      "196": 11,
+      "204": 11,
+      "211": 11,
+      "219": 11,
+      "227": 11,
       "13": 11,
       "32": 90,
       "33": 90,
@@ -1097,15 +1097,15 @@
   {
     "filename": "src/events/TimeObservable.ts",
     "lineHits": {
-      "4": 26,
-      "8": 202,
+      "4": 13,
+      "8": 101,
       "13": 101,
       "14": 0,
       "17": 0,
       "22": 13,
       "27": 0,
       "31": 0,
-      "41": 24,
+      "41": 13,
       "46": 11,
       "9": 101,
       "10": 101,
@@ -1140,22 +1140,22 @@
   {
     "filename": "src/player/BetamaxPlayer.ts",
     "lineHits": {
-      "25": 20,
+      "25": 10,
       "31": 14,
-      "277": 24,
-      "283": 890,
-      "288": 456,
-      "47": 26,
-      "58": 34,
-      "74": 34,
+      "277": 18,
+      "283": 442,
+      "288": 14,
+      "47": 10,
+      "58": 17,
+      "74": 17,
       "76": 0,
       "87": 10,
       "95": 10,
       "108": 10,
-      "121": 11,
+      "121": 10,
       "134": 10,
       "146": 10,
-      "154": 11,
+      "154": 10,
       "162": 10,
       "168": 10,
       "179": 10,
@@ -1163,11 +1163,11 @@
       "203": 0,
       "216": 0,
       "228": 10,
-      "232": 27,
-      "244": 13,
-      "252": 11,
-      "256": 34,
-      "266": 459,
+      "232": 10,
+      "244": 10,
+      "252": 10,
+      "256": 17,
+      "266": 17,
       "8": 10,
       "9": 10,
       "15": 10,
@@ -1260,9 +1260,9 @@
   {
     "filename": "src/player/BetamaxPlayerFactory.ts",
     "lineHits": {
-      "6": 20,
+      "6": 10,
       "9": 68,
-      "15": 78,
+      "15": 10,
       "2": 10,
       "3": 10,
       "12": 68,
@@ -1275,73 +1275,73 @@
   {
     "filename": "src/player/PlaybackSession.ts",
     "lineHits": {
-      "50": 20,
+      "50": 10,
       "71": 90,
-      "165": 182,
+      "165": 90,
       "170": 2,
-      "177": 179,
-      "179": 102,
-      "90": 91,
-      "136": 100,
-      "146": 103,
-      "185": 178,
-      "189": 178,
+      "177": 90,
+      "179": 89,
+      "90": 90,
+      "136": 10,
+      "146": 10,
+      "185": 89,
+      "189": 89,
       "301": 0,
       "310": 0,
       "324": 89,
-      "334": 178,
-      "339": 979,
-      "343": 445,
-      "349": 14,
-      "351": 44,
-      "355": 20,
+      "334": 89,
+      "339": 89,
+      "343": 89,
+      "349": 10,
+      "351": 4,
+      "355": 4,
       "361": 10,
-      "365": 15,
-      "392": 178,
+      "365": 10,
+      "392": 89,
       "443": 0,
-      "458": 14,
-      "485": 99,
-      "501": 11,
-      "514": 14,
-      "525": 11,
-      "529": 23,
-      "558": 29,
-      "567": 24,
-      "571": 25,
-      "581": 15,
-      "596": 14,
-      "608": 37,
+      "458": 10,
+      "485": 10,
+      "501": 10,
+      "514": 10,
+      "525": 10,
+      "529": 10,
+      "558": 10,
+      "567": 12,
+      "571": 11,
+      "581": 10,
+      "596": 10,
+      "608": 10,
       "619": 10,
-      "623": 110,
-      "714": 18,
-      "719": 16,
-      "762": 11,
-      "768": 12,
-      "782": 13,
-      "803": 195,
-      "840": 11,
-      "844": 180,
-      "849": 180,
-      "860": 16,
-      "869": 221,
-      "875": 18,
-      "879": 4,
-      "885": 18,
-      "922": 13,
-      "939": 11,
-      "952": 101,
-      "965": 1572,
-      "969": 784,
-      "983": 11,
-      "987": 11,
-      "991": 19,
-      "1026": 106,
-      "1035": 16,
-      "1040": 18,
+      "623": 10,
+      "714": 10,
+      "719": 8,
+      "762": 10,
+      "768": 10,
+      "782": 10,
+      "803": 10,
+      "840": 10,
+      "844": 90,
+      "849": 90,
+      "860": 10,
+      "869": 10,
+      "875": 10,
+      "879": 2,
+      "885": 10,
+      "922": 10,
+      "939": 10,
+      "952": 10,
+      "965": 10,
+      "969": 10,
+      "983": 10,
+      "987": 10,
+      "991": 10,
+      "1026": 10,
+      "1035": 10,
+      "1040": 10,
       "1076": 10,
-      "1123": 16,
-      "1134": 11,
-      "1138": 100,
+      "1123": 10,
+      "1134": 10,
+      "1138": 10,
       "1142": 0,
       "1146": 0,
       "1150": 0,
@@ -1901,9 +1901,9 @@
   {
     "filename": "src/player/PlaybackSessionFactory.ts",
     "lineHits": {
-      "10": 20,
+      "10": 10,
       "13": 68,
-      "19": 27,
+      "19": 10,
       "70": 17,
       "2": 10,
       "3": 10,
@@ -1960,19 +1960,19 @@
   {
     "filename": "src/player/player.ts",
     "lineHits": {
-      "9": 24,
+      "9": 12,
       "12": 89,
-      "16": 101,
+      "16": 12,
       "18": 89,
-      "25": 198,
-      "29": 101,
+      "25": 12,
+      "29": 12,
       "37": 12,
       "41": 12,
       "45": 12,
       "49": 12,
-      "53": 38,
-      "57": 368,
-      "61": 28,
+      "53": 12,
+      "57": 12,
+      "61": 12,
       "65": 12,
       "69": 12,
       "73": 12,
@@ -2019,40 +2019,40 @@
     "filename": "src/plugins/SPManifestParser.ts",
     "lineHits": {
       "26": 5,
-      "40": 14,
-      "45": 14,
-      "60": 10,
+      "40": 9,
+      "45": 9,
+      "60": 5,
       "67": 9,
       "70": 9,
       "75": 9,
-      "87": 14,
-      "94": 10,
-      "113": 14,
-      "152": 14,
+      "87": 9,
+      "94": 5,
+      "113": 9,
+      "152": 9,
       "159": 13,
-      "173": 14,
-      "175": 44,
-      "186": 14,
-      "191": 23,
+      "173": 9,
+      "175": 22,
+      "186": 9,
+      "191": 5,
       "211": 0,
       "218": 0,
-      "226": 18,
-      "227": 26,
-      "242": 22,
-      "281": 14,
-      "289": 16,
-      "298": 13,
-      "313": 43,
+      "226": 5,
+      "227": 13,
+      "242": 9,
+      "281": 9,
+      "289": 8,
+      "298": 5,
+      "313": 9,
       "332": 0,
-      "366": 52,
-      "367": 28,
-      "368": 6,
-      "388": 68,
-      "399": 10,
-      "405": 4,
-      "461": 7944,
-      "467": 3974,
-      "468": 6,
+      "366": 26,
+      "367": 26,
+      "368": 2,
+      "388": 34,
+      "399": 8,
+      "405": 2,
+      "461": 3972,
+      "467": 3972,
+      "468": 2,
       "18": 9,
       "27": 5,
       "28": 5,
@@ -2235,11 +2235,11 @@
   {
     "filename": "src/plugins/SpotifyVideoMediaExtension.ts",
     "lineHits": {
-      "9": 16,
+      "9": 8,
       "12": 59,
-      "29": 10,
-      "34": 12,
-      "38": 10,
+      "29": 8,
+      "34": 8,
+      "38": 8,
       "2": 8,
       "3": 8,
       "13": 59,
@@ -2258,8 +2258,8 @@
   {
     "filename": "src/plugins/SpotifyVideoUrl.ts",
     "lineHits": {
-      "7": 16,
-      "8": 39,
+      "7": 8,
+      "8": 8,
       "1": 8,
       "9": 31,
       "11": 8
@@ -2473,21 +2473,21 @@
   {
     "filename": "src/plugins/WidevineDownloader.ts",
     "lineHits": {
-      "14": 14,
-      "21": 14,
-      "190": 12,
-      "34": 11,
+      "14": 7,
+      "21": 7,
+      "190": 6,
+      "34": 7,
       "40": 4,
-      "44": 5,
-      "66": 4,
+      "44": 4,
+      "66": 3,
       "69": 0,
-      "78": 9,
-      "90": 8,
-      "107": 11,
-      "137": 2,
+      "78": 7,
+      "90": 7,
+      "107": 7,
+      "137": 1,
       "147": 1,
-      "165": 14,
-      "174": 8,
+      "165": 7,
+      "174": 7,
       "2": 7,
       "9": 7,
       "10": 7,
@@ -2596,7 +2596,7 @@
   {
     "filename": "src/plugins/types.ts",
     "lineHits": {
-      "19": 14,
+      "19": 7,
       "20": 7,
       "21": 7,
       "22": 7,
@@ -2620,50 +2620,50 @@
   {
     "filename": "src/tracking/DefaultEventsCalculator.ts",
     "lineHits": {
-      "34": 108,
+      "34": 54,
       "46": 7,
-      "95": 68,
-      "108": 17,
-      "116": 17,
-      "124": 92,
-      "145": 92,
-      "164": 41,
-      "168": 48,
-      "181": 41,
-      "185": 6,
-      "194": 41,
-      "198": 2,
-      "207": 42,
+      "95": 16,
+      "108": 16,
+      "116": 16,
+      "124": 16,
+      "145": 16,
+      "164": 16,
+      "168": 24,
+      "181": 16,
+      "185": 3,
+      "194": 16,
+      "198": 1,
+      "207": 16,
       "215": 4,
-      "229": 41,
-      "233": 2,
-      "242": 42,
-      "246": 50,
-      "255": 44,
-      "259": 12,
-      "276": 42,
+      "229": 16,
+      "233": 1,
+      "242": 16,
+      "246": 25,
+      "255": 16,
+      "259": 6,
+      "276": 16,
       "284": 2,
-      "298": 41,
-      "302": 2,
-      "311": 42,
-      "315": 10,
-      "326": 42,
+      "298": 16,
+      "302": 1,
+      "311": 16,
+      "315": 5,
+      "326": 16,
       "334": 2,
-      "348": 43,
-      "352": 22,
-      "386": 42,
-      "398": 10,
-      "417": 45,
-      "475": 43,
+      "348": 16,
+      "352": 11,
+      "386": 16,
+      "398": 5,
+      "417": 16,
+      "475": 16,
       "479": 83,
-      "483": 86,
-      "496": 41,
+      "483": 43,
+      "496": 16,
       "500": 76,
-      "505": 86,
-      "522": 41,
+      "505": 43,
+      "522": 16,
       "526": 76,
-      "531": 86,
-      "548": 39,
+      "531": 43,
+      "548": 16,
       "1": 16,
       "11": 16,
       "12": 16,
@@ -2874,30 +2874,30 @@
   {
     "filename": "src/tracking/EventsTracker.ts",
     "lineHits": {
-      "16": 32,
+      "16": 16,
       "19": 15,
-      "23": 17,
-      "40": 17,
-      "53": 17,
-      "63": 17,
-      "71": 17,
+      "23": 16,
+      "40": 16,
+      "53": 16,
+      "63": 16,
+      "71": 16,
       "86": 16,
-      "101": 28,
+      "101": 16,
       "117": 16,
-      "130": 21,
-      "145": 19,
-      "160": 25,
-      "170": 19,
-      "180": 21,
-      "195": 17,
-      "210": 17,
-      "225": 17,
-      "240": 17,
-      "248": 17,
-      "256": 17,
-      "271": 17,
-      "286": 17,
-      "301": 17,
+      "130": 16,
+      "145": 16,
+      "160": 16,
+      "170": 16,
+      "180": 16,
+      "195": 16,
+      "210": 16,
+      "225": 16,
+      "240": 16,
+      "248": 16,
+      "256": 16,
+      "271": 16,
+      "286": 16,
+      "301": 16,
       "14": 16,
       "20": 15,
       "29": 1,
@@ -2929,11 +2929,11 @@
   {
     "filename": "src/tracking/ProductStatesStreamingRulesProvider.ts",
     "lineHits": {
-      "4": 32,
-      "9": 6,
+      "4": 16,
+      "9": 3,
       "14": 2,
       "17": 0,
-      "21": 20,
+      "21": 16,
       "10": 3,
       "11": 3,
       "12": 3,
@@ -2946,9 +2946,9 @@
   {
     "filename": "src/tracking/VideoPlaybackEvents.ts",
     "lineHits": {
-      "1": 36,
-      "7": 36,
-      "17": 36,
+      "1": 18,
+      "7": 18,
+      "17": 18,
       "2": 18,
       "3": 18,
       "4": 18,
@@ -3023,8 +3023,8 @@
   {
     "filename": "src/tracking/types.ts",
     "lineHits": {
-      "13": 32,
-      "95": 32,
+      "13": 16,
+      "95": 16,
       "10": 16,
       "14": 16,
       "15": 16,
@@ -3129,40 +3129,40 @@
   {
     "filename": "src/tracking/utils.ts",
     "lineHits": {
-      "44": 64,
-      "109": 225,
-      "113": 1944,
-      "115": 1902,
-      "123": 514,
-      "128": 486,
-      "133": 91,
-      "138": 95,
-      "143": 239,
-      "148": 314,
-      "153": 167,
-      "158": 91,
-      "163": 91,
-      "168": 261,
-      "173": 167,
+      "44": 17,
+      "109": 17,
+      "113": 972,
+      "115": 951,
+      "123": 17,
+      "128": 17,
+      "133": 17,
+      "138": 17,
+      "143": 17,
+      "148": 17,
+      "153": 17,
+      "158": 17,
+      "163": 17,
+      "168": 17,
+      "173": 17,
       "178": 17,
-      "183": 139,
-      "188": 93,
-      "193": 475,
-      "198": 61,
-      "203": 95,
-      "208": 19,
-      "220": 1501,
-      "224": 484,
-      "228": 462,
-      "232": 900,
-      "236": 113,
-      "245": 96,
-      "250": 460,
-      "251": 56,
-      "254": 46,
-      "259": 158,
+      "183": 17,
+      "188": 17,
+      "193": 17,
+      "198": 17,
+      "203": 17,
+      "208": 17,
+      "220": 502,
+      "224": 176,
+      "228": 176,
+      "232": 326,
+      "236": 17,
+      "245": 17,
+      "250": 230,
+      "251": 28,
+      "254": 17,
+      "259": 79,
       "261": 19,
-      "269": 78,
+      "269": 17,
       "2": 17,
       "4": 17,
       "7": 17,
@@ -3284,41 +3284,41 @@
       "39": 24,
       "52": 11,
       "71": 6,
-      "79": 14,
+      "79": 7,
       "88": 11,
       "92": 19,
-      "120": 28,
-      "123": 36,
-      "145": 20,
-      "181": 36,
-      "190": 27,
-      "206": 25,
-      "223": 26,
-      "240": 26,
-      "258": 42,
-      "264": 48,
-      "272": 42,
-      "276": 2,
-      "285": 42,
-      "289": 2,
-      "298": 43,
-      "306": 50,
-      "328": 40,
-      "332": 46,
-      "341": 45,
-      "345": 4,
-      "356": 43,
-      "361": 50,
-      "371": 43,
+      "120": 14,
+      "123": 15,
+      "145": 15,
+      "181": 15,
+      "190": 15,
+      "206": 15,
+      "223": 15,
+      "240": 15,
+      "258": 15,
+      "264": 24,
+      "272": 15,
+      "276": 1,
+      "285": 15,
+      "289": 1,
+      "298": 15,
+      "306": 25,
+      "328": 15,
+      "332": 23,
+      "341": 15,
+      "345": 2,
+      "356": 15,
+      "361": 25,
+      "371": 15,
       "375": 89,
-      "380": 86,
-      "394": 43,
+      "380": 43,
+      "394": 15,
       "398": 87,
-      "403": 90,
-      "416": 46,
+      "403": 45,
+      "416": 15,
       "420": 91,
-      "425": 88,
-      "442": 40,
+      "425": 44,
+      "442": 15,
       "1": 15,
       "8": 15,
       "9": 15,
@@ -3477,9 +3477,9 @@
   {
     "filename": "src/tracking/endvideo/EndVideoLoggerFactory.ts",
     "lineHits": {
-      "11": 30,
+      "11": 15,
       "19": 14,
-      "32": 29,
+      "32": 15,
       "9": 15,
       "26": 14,
       "27": 14,
@@ -3494,19 +3494,19 @@
   {
     "filename": "src/tracking/endvideo/EndVideoLoggerTracker.ts",
     "lineHits": {
-      "24": 30,
+      "24": 15,
       "38": 14,
       "54": 14,
       "62": 0,
       "96": 0,
-      "139": 24,
-      "140": 18,
-      "141": 18,
-      "154": 40,
-      "155": 40,
-      "156": 40,
-      "166": 35,
-      "177": 38,
+      "139": 15,
+      "140": 9,
+      "141": 9,
+      "154": 20,
+      "155": 20,
+      "156": 20,
+      "166": 15,
+      "177": 15,
       "1": 15,
       "4": 15,
       "15": 15,
@@ -3605,7 +3605,7 @@
   {
     "filename": "src/tracking/endvideo/EndVideoReasonEnd.ts",
     "lineHits": {
-      "1": 30,
+      "1": 15,
       "2": 15,
       "3": 15,
       "4": 15,
@@ -3626,23 +3626,23 @@
   {
     "filename": "src/tracking/endvideo/EndVideoTracker.ts",
     "lineHits": {
-      "24": 30,
+      "24": 15,
       "64": 13,
-      "78": 28,
-      "110": 26,
-      "118": 27,
-      "131": 79,
-      "237": 21,
-      "255": 44,
-      "287": 28,
-      "295": 22,
-      "355": 20,
-      "364": 28,
-      "417": 28,
-      "419": 17,
-      "430": 28,
-      "438": 24,
-      "458": 25,
+      "78": 15,
+      "110": 13,
+      "118": 13,
+      "131": 15,
+      "237": 15,
+      "255": 15,
+      "287": 15,
+      "295": 13,
+      "355": 15,
+      "364": 15,
+      "417": 15,
+      "419": 13,
+      "430": 15,
+      "438": 12,
+      "458": 15,
       "1": 15,
       "2": 15,
       "15": 15,
@@ -3914,9 +3914,9 @@
   {
     "filename": "src/tracking/session/PlaybackSessionTracker.ts",
     "lineHits": {
-      "7": 32,
+      "7": 16,
       "9": 1,
-      "14": 17,
+      "14": 16,
       "1": 16,
       "10": 1,
       "11": 1,
@@ -3936,7 +3936,7 @@
   {
     "filename": "src/tracking/session/VideoPlaybackSessionLogger.ts",
     "lineHits": {
-      "6": 30,
+      "6": 15,
       "9": 0,
       "12": 15,
       "13": 0,
diff --git a/plugins/code-coverage-backend/src/service/__fixtures__/cobertura-jsoncoverage-files-3.json b/plugins/code-coverage-backend/src/service/__fixtures__/cobertura-jsoncoverage-files-3.json
index 625dcde1a0..b1f65270cb 100644
--- a/plugins/code-coverage-backend/src/service/__fixtures__/cobertura-jsoncoverage-files-3.json
+++ b/plugins/code-coverage-backend/src/service/__fixtures__/cobertura-jsoncoverage-files-3.json
@@ -11,8 +11,8 @@
     "lineHits": {
       "17": 41,
       "34": 41,
-      "70": 82,
-      "72": 82,
+      "70": 41,
+      "72": 41,
       "74": 41,
       "31": 41,
       "32": 41,
@@ -55,10 +55,10 @@
   {
     "filename": "src/atoms/Container/components.ts",
     "lineHits": {
-      "5": 70,
-      "19": 70,
-      "20": 70,
-      "23": 70,
+      "5": 35,
+      "19": 35,
+      "20": 35,
+      "23": 35,
       "4": 13,
       "13": 13
     },
@@ -83,23 +83,23 @@
   {
     "filename": "src/molecules/Hero/components.ts",
     "lineHits": {
-      "26": 20,
+      "26": 10,
       "28": 10,
       "94": 10,
-      "103": 20,
+      "103": 10,
       "121": 10,
-      "182": 20,
+      "182": 10,
       "203": 5,
       "218": 5,
-      "236": 10,
-      "241": 10,
-      "249": 8,
+      "236": 5,
+      "241": 5,
+      "249": 4,
       "254": 4,
       "264": 4,
-      "277": 8,
+      "277": 4,
       "282": 4,
-      "294": 8,
-      "299": 6,
+      "294": 4,
+      "299": 3,
       "25": 2,
       "29": 10,
       "37": 3,
diff --git a/plugins/code-coverage-backend/src/service/__fixtures__/cobertura-jsoncoverage-files-5.json b/plugins/code-coverage-backend/src/service/__fixtures__/cobertura-jsoncoverage-files-5.json
index 41ab6c084f..a7da6fa0b9 100644
--- a/plugins/code-coverage-backend/src/service/__fixtures__/cobertura-jsoncoverage-files-5.json
+++ b/plugins/code-coverage-backend/src/service/__fixtures__/cobertura-jsoncoverage-files-5.json
@@ -16,34 +16,34 @@
     "filename": "src/graphql/resolvers.ts",
     "lineHits": {
       "22": 17,
-      "28": 14,
-      "36": 16,
-      "27": 8,
-      "35": 8,
+      "28": 4,
+      "36": 4,
+      "27": 4,
+      "35": 4,
       "43": 9,
-      "51": 15,
-      "56": 8,
-      "61": 8,
-      "50": 8,
-      "55": 8,
-      "60": 8,
+      "51": 4,
+      "56": 4,
+      "61": 4,
+      "50": 4,
+      "55": 4,
+      "60": 4,
       "128": 7,
       "139": 4,
-      "145": 8,
-      "160": 8,
-      "177": 7,
-      "185": 13,
-      "70": 12,
-      "78": 8,
-      "81": 8,
+      "145": 4,
+      "160": 4,
+      "177": 4,
+      "185": 4,
+      "70": 4,
+      "78": 4,
+      "81": 4,
       "84": 4,
-      "97": 12,
-      "103": 8,
-      "114": 8,
-      "144": 8,
-      "159": 8,
-      "176": 8,
-      "184": 8,
+      "97": 4,
+      "103": 4,
+      "114": 4,
+      "144": 4,
+      "159": 4,
+      "176": 4,
+      "184": 4,
       "1": 4,
       "2": 4,
       "3": 4,
@@ -130,9 +130,9 @@
     "filename": "src/graphql/router.ts",
     "lineHits": {
       "21": 1,
-      "22": 2,
-      "43": 21,
-      "53": 40,
+      "22": 1,
+      "43": 3,
+      "53": 18,
       "12": 3,
       "14": 3,
       "23": 1,
@@ -182,7 +182,7 @@
   {
     "filename": "src/graphql/schema.ts",
     "lineHits": {
-      "9": 7,
+      "9": 3,
       "1": 3,
       "2": 3,
       "4": 3,
@@ -205,8 +205,8 @@
   {
     "filename": "src/graphql/transforms.ts",
     "lineHits": {
-      "9": 10,
-      "20": 5,
+      "9": 4,
+      "20": 4,
       "13": 6,
       "14": 2,
       "15": 6,
diff --git a/plugins/code-coverage-backend/src/service/__fixtures__/cobertura-jsoncoverage-files-6.json b/plugins/code-coverage-backend/src/service/__fixtures__/cobertura-jsoncoverage-files-6.json
new file mode 100644
index 0000000000..7de4e7dcf7
--- /dev/null
+++ b/plugins/code-coverage-backend/src/service/__fixtures__/cobertura-jsoncoverage-files-6.json
@@ -0,0 +1,47 @@
+[
+  {
+    "filename": "src/Calc/Main.cs",
+    "lineHits": {
+      "5": 4,
+      "6": 4,
+      "7": 1,
+      "8": 0,
+      "9": 2,
+      "10": 1,
+      "11": 4
+    },
+    "branchHits": {
+      "5": {
+        "covered": 5,
+        "missed": 1,
+        "available": 6
+      }
+    }
+  },
+  {
+    "filename": "src/Calc/Math.cs",
+    "lineHits": {
+      "5": 1,
+      "6": 0,
+      "7": 2,
+      "8": 2,
+      "9": 0,
+      "11": 3,
+      "12": 1,
+      "14": 1,
+      "15": 1
+    },
+    "branchHits": {
+      "8": {
+        "covered": 1,
+        "missed": 1,
+        "available": 2
+      },
+      "11": {
+        "covered": 2,
+        "missed": 0,
+        "available": 2
+      }
+    }
+  }
+]
diff --git a/plugins/code-coverage-backend/src/service/__fixtures__/cobertura-sourcefiles-6.txt b/plugins/code-coverage-backend/src/service/__fixtures__/cobertura-sourcefiles-6.txt
new file mode 100644
index 0000000000..3aa3c36039
--- /dev/null
+++ b/plugins/code-coverage-backend/src/service/__fixtures__/cobertura-sourcefiles-6.txt
@@ -0,0 +1,2 @@
+src/Calc/Main.cs
+src/Calc/Math.cs
diff --git a/plugins/code-coverage-backend/src/service/__fixtures__/cobertura-testdata-6.xml b/plugins/code-coverage-backend/src/service/__fixtures__/cobertura-testdata-6.xml
new file mode 100644
index 0000000000..84560b6c21
--- /dev/null
+++ b/plugins/code-coverage-backend/src/service/__fixtures__/cobertura-testdata-6.xml
@@ -0,0 +1,100 @@
+<?xml version="1.0" encoding="utf-8"?>
+<coverage line-rate="0.8125" branch-rate="0.8" version="1.9" timestamp="1692517802" lines-covered="13" lines-valid="16" branches-covered="8" branches-valid="10">
+  <sources>
+    <source>/Some/Path/src/Calc/</source>
+  </sources>
+  <packages>
+    <package name="Calc" line-rate="0.8125" branch-rate="0.8" complexity="12">
+      <classes>
+        <class name="Calc.Main" filename="Main.cs" line-rate="0.8571" branch-rate="0.8332999999999999" complexity="6">
+          <methods>
+            <method name="Calc" signature="(System.Int32,System.Int32,System.String)" line-rate="0.8571" branch-rate="0.8332999999999999" complexity="6">
+              <lines>
+                <line number="5" hits="4" branch="True" condition-coverage="83.33% (5/6)">
+                  <conditions>
+                    <condition number="15" type="jump" coverage="100%" />
+                    <condition number="28" type="jump" coverage="50%" />
+                    <condition number="41" type="jump" coverage="100%" />
+                  </conditions>
+                </line>
+                <line number="6" hits="4" branch="False" />
+                <line number="7" hits="1" branch="False" />
+                <line number="8" hits="0" branch="False" />
+                <line number="9" hits="2" branch="False" />
+                <line number="10" hits="1" branch="False" />
+                <line number="11" hits="4" branch="False" />
+              </lines>
+            </method>
+          </methods>
+          <lines>
+            <line number="5" hits="4" branch="True" condition-coverage="83.33% (5/6)">
+              <conditions>
+                <condition number="15" type="jump" coverage="100%" />
+                <condition number="28" type="jump" coverage="50%" />
+                <condition number="41" type="jump" coverage="100%" />
+              </conditions>
+            </line>
+            <line number="6" hits="4" branch="False" />
+            <line number="7" hits="1" branch="False" />
+            <line number="8" hits="0" branch="False" />
+            <line number="9" hits="2" branch="False" />
+            <line number="10" hits="1" branch="False" />
+            <line number="11" hits="4" branch="False" />
+          </lines>
+        </class>
+        <class name="Calc.Math" filename="Math.cs" line-rate="0.7777" branch-rate="0.75" complexity="6">
+          <methods>
+            <method name="Addition" signature="(System.Int32,System.Int32)" line-rate="1" branch-rate="1" complexity="1">
+              <lines>
+                <line number="5" hits="1" branch="False" />
+              </lines>
+            </method>
+            <method name="Subtraction" signature="(System.Int32,System.Int32)" line-rate="0" branch-rate="1" complexity="1">
+              <lines>
+                <line number="6" hits="0" branch="False" />
+              </lines>
+            </method>
+            <method name="Division" signature="(System.Int32,System.Int32)" line-rate="0.8571" branch-rate="0.75" complexity="4">
+              <lines>
+                <line number="7" hits="2" branch="False" />
+                <line number="8" hits="2" branch="True" condition-coverage="50% (1/2)">
+                  <conditions>
+                    <condition number="7" type="jump" coverage="50%" />
+                  </conditions>
+                </line>
+                <line number="9" hits="0" branch="False" />
+                <line number="11" hits="3" branch="True" condition-coverage="100% (2/2)">
+                  <conditions>
+                    <condition number="22" type="jump" coverage="100%" />
+                  </conditions>
+                </line>
+                <line number="12" hits="1" branch="False" />
+                <line number="14" hits="1" branch="False" />
+                <line number="15" hits="1" branch="False" />
+              </lines>
+            </method>
+          </methods>
+          <lines>
+            <line number="5" hits="1" branch="False" />
+            <line number="6" hits="0" branch="False" />
+            <line number="7" hits="2" branch="False" />
+            <line number="8" hits="2" branch="True" condition-coverage="50% (1/2)">
+              <conditions>
+                <condition number="7" type="jump" coverage="50%" />
+              </conditions>
+            </line>
+            <line number="9" hits="0" branch="False" />
+            <line number="11" hits="3" branch="True" condition-coverage="100% (2/2)">
+              <conditions>
+                <condition number="22" type="jump" coverage="100%" />
+              </conditions>
+            </line>
+            <line number="12" hits="1" branch="False" />
+            <line number="14" hits="1" branch="False" />
+            <line number="15" hits="1" branch="False" />
+          </lines>
+        </class>
+      </classes>
+    </package>
+  </packages>
+</coverage>
diff --git a/plugins/code-coverage-backend/src/service/__fixtures__/lcov-jsoncoverage-files-1.json b/plugins/code-coverage-backend/src/service/__fixtures__/lcov-jsoncoverage-files-1.json
new file mode 100644
index 0000000000..1d0ed702df
--- /dev/null
+++ b/plugins/code-coverage-backend/src/service/__fixtures__/lcov-jsoncoverage-files-1.json
@@ -0,0 +1,103 @@
+[
+  {
+    "filename": "src/index.js",
+    "lineHits": {
+      "1": 1,
+      "2": 1,
+      "3": 1,
+      "4": 5,
+      "5": 5,
+      "6": 1,
+      "7": 5,
+      "8": 0,
+      "9": 5,
+      "10": 3,
+      "11": 5,
+      "12": 1,
+      "13": 5,
+      "14": 5
+    },
+    "branchHits": {
+      "3": {
+        "covered": 1,
+        "missed": 0,
+        "available": 1
+      },
+      "5": {
+        "covered": 1,
+        "missed": 0,
+        "available": 1
+      },
+      "7": {
+        "covered": 0,
+        "missed": 1,
+        "available": 1
+      },
+      "9": {
+        "covered": 1,
+        "missed": 0,
+        "available": 1
+      },
+      "11": {
+        "covered": 1,
+        "missed": 0,
+        "available": 1
+      }
+    }
+  },
+  {
+    "filename": "src/math.js",
+    "lineHits": {
+      "1": 1,
+      "2": 1,
+      "3": 1,
+      "4": 1,
+      "5": 1,
+      "6": 0,
+      "7": 0,
+      "8": 1,
+      "9": 1,
+      "10": 3,
+      "11": 0,
+      "12": 3,
+      "13": 1,
+      "14": 3,
+      "15": 1,
+      "16": 1,
+      "17": 1,
+      "18": 1
+    },
+    "branchHits": {
+      "2": {
+        "covered": 1,
+        "missed": 0,
+        "available": 1
+      },
+      "9": {
+        "covered": 1,
+        "missed": 0,
+        "available": 1
+      },
+      "10": {
+        "covered": 0,
+        "missed": 1,
+        "available": 1
+      },
+      "12": {
+        "covered": 2,
+        "missed": 0,
+        "available": 2
+      },
+      "14": {
+        "covered": 2,
+        "missed": 0,
+        "available": 2
+      },
+      "17": {
+        "covered": 1,
+        "missed": 0,
+        "available": 1
+      }
+    }
+  }
+]
diff --git a/plugins/code-coverage-backend/src/service/__fixtures__/lcov-jsoncoverage-files-2.json b/plugins/code-coverage-backend/src/service/__fixtures__/lcov-jsoncoverage-files-2.json
new file mode 100644
index 0000000000..7de4e7dcf7
--- /dev/null
+++ b/plugins/code-coverage-backend/src/service/__fixtures__/lcov-jsoncoverage-files-2.json
@@ -0,0 +1,47 @@
+[
+  {
+    "filename": "src/Calc/Main.cs",
+    "lineHits": {
+      "5": 4,
+      "6": 4,
+      "7": 1,
+      "8": 0,
+      "9": 2,
+      "10": 1,
+      "11": 4
+    },
+    "branchHits": {
+      "5": {
+        "covered": 5,
+        "missed": 1,
+        "available": 6
+      }
+    }
+  },
+  {
+    "filename": "src/Calc/Math.cs",
+    "lineHits": {
+      "5": 1,
+      "6": 0,
+      "7": 2,
+      "8": 2,
+      "9": 0,
+      "11": 3,
+      "12": 1,
+      "14": 1,
+      "15": 1
+    },
+    "branchHits": {
+      "8": {
+        "covered": 1,
+        "missed": 1,
+        "available": 2
+      },
+      "11": {
+        "covered": 2,
+        "missed": 0,
+        "available": 2
+      }
+    }
+  }
+]
diff --git a/plugins/code-coverage-backend/src/service/__fixtures__/lcov-sourcefiles-1.txt b/plugins/code-coverage-backend/src/service/__fixtures__/lcov-sourcefiles-1.txt
new file mode 100644
index 0000000000..4f4bf2c118
--- /dev/null
+++ b/plugins/code-coverage-backend/src/service/__fixtures__/lcov-sourcefiles-1.txt
@@ -0,0 +1,2 @@
+src/index.js
+src/math.js
diff --git a/plugins/code-coverage-backend/src/service/__fixtures__/lcov-sourcefiles-2.txt b/plugins/code-coverage-backend/src/service/__fixtures__/lcov-sourcefiles-2.txt
new file mode 100644
index 0000000000..3aa3c36039
--- /dev/null
+++ b/plugins/code-coverage-backend/src/service/__fixtures__/lcov-sourcefiles-2.txt
@@ -0,0 +1,2 @@
+src/Calc/Main.cs
+src/Calc/Math.cs
diff --git a/plugins/code-coverage-backend/src/service/__fixtures__/lcov-testdata-1.info b/plugins/code-coverage-backend/src/service/__fixtures__/lcov-testdata-1.info
new file mode 100644
index 0000000000..0bf69f6bc7
--- /dev/null
+++ b/plugins/code-coverage-backend/src/service/__fixtures__/lcov-testdata-1.info
@@ -0,0 +1,71 @@
+TN:
+SF:src/index.js
+FN:3,__vite_ssr_exports__.default
+FNF:1
+FNH:1
+FNDA:5,__vite_ssr_exports__.default
+DA:1,1
+DA:2,1
+DA:3,1
+DA:4,5
+DA:5,5
+DA:6,1
+DA:7,5
+DA:8,0
+DA:9,5
+DA:10,3
+DA:11,5
+DA:12,1
+DA:13,5
+DA:14,5
+LF:14
+LH:13
+BRDA:3,0,0,5
+BRDA:5,1,0,1
+BRDA:7,2,0,0
+BRDA:9,3,0,3
+BRDA:11,4,0,1
+BRF:5
+BRH:4
+end_of_record
+TN:
+SF:src/math.js
+FN:2,addition
+FN:5,subtraction
+FN:9,division
+FNF:3
+FNH:2
+FNDA:1,addition
+FNDA:0,subtraction
+FNDA:3,division
+DA:1,1
+DA:2,1
+DA:3,1
+DA:4,1
+DA:5,1
+DA:6,0
+DA:7,0
+DA:8,1
+DA:9,1
+DA:10,3
+DA:11,0
+DA:12,3
+DA:13,1
+DA:14,3
+DA:15,1
+DA:16,1
+DA:17,1
+DA:18,1
+LF:18
+LH:15
+BRDA:2,0,0,1
+BRDA:9,1,0,3
+BRDA:10,2,0,0
+BRDA:12,3,0,2
+BRDA:12,4,0,1
+BRDA:14,5,0,2
+BRDA:14,6,0,1
+BRDA:17,7,0,1
+BRF:8
+BRH:7
+end_of_record
diff --git a/plugins/code-coverage-backend/src/service/__fixtures__/lcov-testdata-2.info b/plugins/code-coverage-backend/src/service/__fixtures__/lcov-testdata-2.info
new file mode 100644
index 0000000000..688bffb521
--- /dev/null
+++ b/plugins/code-coverage-backend/src/service/__fixtures__/lcov-testdata-2.info
@@ -0,0 +1,50 @@
+SF:/Some/Path/src/Calc/Main.cs
+FN:4,System.Int32 Calc.Main::Calc(System.Int32,System.Int32,System.String)
+FNDA:4,System.Int32 Calc.Main::Calc(System.Int32,System.Int32,System.String)
+DA:5,4
+DA:6,4
+DA:7,1
+DA:8,0
+DA:9,2
+DA:10,1
+DA:11,4
+BRDA:5,15,0,3
+BRDA:5,28,0,3
+BRDA:5,15,1,1
+BRDA:5,28,1,0
+BRDA:5,41,1,2
+BRDA:5,41,0,1
+LF:7
+LH:6
+BRF:6
+BRH:5
+FNF:1
+FNH:1
+end_of_record
+SF:/Some/Path/src/Calc/Math.cs
+FN:4,System.Int32 Calc.Math::Addition(System.Int32,System.Int32)
+FNDA:1,System.Int32 Calc.Math::Addition(System.Int32,System.Int32)
+DA:5,1
+FN:5,System.Int32 Calc.Math::Subtraction(System.Int32,System.Int32)
+FNDA:0,System.Int32 Calc.Math::Subtraction(System.Int32,System.Int32)
+DA:6,0
+FN:6,System.Int32 Calc.Math::Division(System.Int32,System.Int32)
+FNDA:2,System.Int32 Calc.Math::Division(System.Int32,System.Int32)
+DA:7,2
+DA:8,2
+DA:9,0
+DA:11,3
+DA:12,1
+DA:14,1
+DA:15,1
+BRDA:8,7,0,0
+BRDA:8,7,1,2
+BRDA:11,22,0,1
+BRDA:11,22,1,1
+LF:9
+LH:7
+BRF:4
+BRH:3
+FNF:3
+FNH:2
+end_of_record
diff --git a/plugins/code-coverage-backend/src/service/converter/cobertura.test.ts b/plugins/code-coverage-backend/src/service/converter/cobertura.test.ts
index dfe6c77c98..3b55930d5f 100644
--- a/plugins/code-coverage-backend/src/service/converter/cobertura.test.ts
+++ b/plugins/code-coverage-backend/src/service/converter/cobertura.test.ts
@@ -24,7 +24,7 @@ import { getVoidLogger } from '@backstage/backend-common';
 
 describe('convert cobertura', () => {
   const converter = new Cobertura(getVoidLogger());
-  [1, 2, 3, 4, 5].forEach(idx => {
+  [1, 2, 3, 4, 5, 6].forEach(idx => {
     let fixture: CoberturaXML;
     parseString(
       fs.readFileSync(
diff --git a/plugins/code-coverage-backend/src/service/converter/cobertura.ts b/plugins/code-coverage-backend/src/service/converter/cobertura.ts
index 025d40a4f6..540ea95944 100644
--- a/plugins/code-coverage-backend/src/service/converter/cobertura.ts
+++ b/plugins/code-coverage-backend/src/service/converter/cobertura.ts
@@ -113,7 +113,13 @@ export class Cobertura implements Converter {
       .filter(Boolean)
       .flatMap(m => m.lines)
       .filter(Boolean)
-      .flatMap(l => l.line);
+      .flatMap(l => l.line)
+      .filter(
+        ({ $: methodLine }) =>
+          classLines.some(
+            ({ $: classLine }) => methodLine.number === classLine.number,
+          ) === false,
+      );
     const lines = [classLines, methodLines].flat().filter(Boolean);
     const lineHits = lines.map(l => {
       return {
diff --git a/plugins/code-coverage-backend/src/service/converter/index.ts b/plugins/code-coverage-backend/src/service/converter/index.ts
index a85f320486..7e6d95ead5 100644
--- a/plugins/code-coverage-backend/src/service/converter/index.ts
+++ b/plugins/code-coverage-backend/src/service/converter/index.ts
@@ -17,3 +17,4 @@
 export * from './Converter';
 export { Cobertura } from './cobertura';
 export { Jacoco } from './jacoco';
+export { Lcov } from './lcov';
diff --git a/plugins/code-coverage-backend/src/service/converter/lcov.test.ts b/plugins/code-coverage-backend/src/service/converter/lcov.test.ts
new file mode 100644
index 0000000000..e31261ba77
--- /dev/null
+++ b/plugins/code-coverage-backend/src/service/converter/lcov.test.ts
@@ -0,0 +1,53 @@
+/*
+ * 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 fs from 'fs';
+import path from 'path';
+import { Lcov } from './lcov';
+import { getVoidLogger } from '@backstage/backend-common';
+
+describe('convert lcov', () => {
+  const converter = new Lcov(getVoidLogger());
+  [1, 2].forEach(idx => {
+    const lcov = fs
+      .readFileSync(
+        path.resolve(`${__dirname}/../__fixtures__/lcov-testdata-${idx}.info`),
+      )
+      .toString();
+    const expected = JSON.parse(
+      fs
+        .readFileSync(
+          path.resolve(
+            `${__dirname}/../__fixtures__/lcov-jsoncoverage-files-${idx}.json`,
+          ),
+        )
+        .toString(),
+    );
+    const scmFiles = fs
+      .readFileSync(
+        path.resolve(
+          `${__dirname}/../__fixtures__/lcov-sourcefiles-${idx}.txt`,
+        ),
+      )
+      .toString()
+      .split('\n');
+
+    it(`should convert the lcov report with index ${idx} to json`, async () => {
+      const files = converter.convert(lcov, scmFiles);
+
+      expect(files).toEqual(expected);
+    });
+  });
+});
diff --git a/plugins/code-coverage-backend/src/service/converter/lcov.ts b/plugins/code-coverage-backend/src/service/converter/lcov.ts
new file mode 100644
index 0000000000..e2f5733dae
--- /dev/null
+++ b/plugins/code-coverage-backend/src/service/converter/lcov.ts
@@ -0,0 +1,126 @@
+/*
+ * 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 { FileEntry } from '../types';
+import { Logger } from 'winston';
+import { Converter } from './Converter';
+
+export class Lcov implements Converter {
+  constructor(readonly logger: Logger) {
+    this.logger = logger;
+  }
+
+  /**
+   * convert lcov into shared json coverage format
+   *
+   * @param raw - raw lcov report
+   * @param scmFiles - list of files that are committed to SCM
+   */
+  convert(raw: string, scmFiles: string[]): FileEntry[] {
+    const lines = raw.split(/\r?\n/);
+    const jscov: Array<FileEntry> = [];
+    let currentFile: FileEntry | null = null;
+
+    lines.forEach(line => {
+      const [section, value] = line.split(':');
+
+      switch (section) {
+        // If the line starts with SF, it's a new file
+        case 'SF':
+          currentFile = this.processNewFile(value, scmFiles);
+          break;
+        // If the line starts with DA, it's a line hit
+        case 'DA':
+          this.processLineHit(currentFile, value);
+          break;
+        // If the line starts with BRDA, it's a branch line
+        case 'BRDA':
+          this.processBranchHit(currentFile, value);
+          break;
+        // If the line starts with end_of_record, it's the end of current file
+        case 'end_of_record':
+          if (currentFile) {
+            jscov.push(currentFile);
+            currentFile = null;
+          }
+          break;
+        default:
+          break;
+      }
+    });
+
+    return jscov;
+  }
+
+  /**
+   * Parses a new file entry
+   *
+   * @param file - file name from coverage report
+   * @param scmFiles - list of files that are committed to SCM
+   */
+  private processNewFile(file: string, scmFiles: string[]): FileEntry | null {
+    const filename = scmFiles.map(f => f.trimEnd()).find(f => file.endsWith(f));
+
+    this.logger.debug(`matched ${file} to ${filename}`);
+
+    if (scmFiles.length === 0 || filename) {
+      return {
+        filename: filename || file,
+        lineHits: {},
+        branchHits: {},
+      };
+    }
+
+    return null;
+  }
+
+  /**
+   * Parses line coverage information
+   *
+   * @param currentFile - current file entry
+   * @param value - line coverage information
+   */
+  private processLineHit(currentFile: FileEntry | null, value: string): void {
+    if (!currentFile) return;
+
+    const [lineNumber, hits] = value.split(',');
+    currentFile.lineHits[Number(lineNumber)] = Number(hits);
+  }
+
+  /**
+   * Parses branch coverage information
+   *
+   * @param currentFile - current file entry
+   * @param value - branch coverage information
+   */
+  private processBranchHit(currentFile: FileEntry | null, value: string): void {
+    if (!currentFile) return;
+
+    const [lineNumber, , , hits] = value.split(',');
+    const lineNumberNum = Number(lineNumber);
+    const isHit = Number(hits) > 0;
+    const branch = currentFile.branchHits[lineNumberNum] || {
+      covered: 0,
+      available: 0,
+      missed: 0,
+    };
+
+    branch.available++;
+    branch.covered += isHit ? 1 : 0;
+    branch.missed += isHit ? 0 : 1;
+
+    currentFile.branchHits[lineNumberNum] = branch;
+  }
+}
diff --git a/plugins/code-coverage-backend/src/service/router.test.ts b/plugins/code-coverage-backend/src/service/router.test.ts
index 7d1825c25f..4f1a9ee2e5 100644
--- a/plugins/code-coverage-backend/src/service/router.test.ts
+++ b/plugins/code-coverage-backend/src/service/router.test.ts
@@ -25,6 +25,35 @@ import {
 } from '@backstage/backend-common';
 import { ConfigReader } from '@backstage/config';
 import { createRouter } from './router';
+import { CatalogRequestOptions } from '@backstage/catalog-client';
+
+jest.mock('./CodeCoverageDatabase');
+
+import { CodeCoverageDatabase } from './CodeCoverageDatabase';
+
+CodeCoverageDatabase.create = jest.fn(
+  async () =>
+    ({
+      getCodeCoverage: async () => ({
+        files: [],
+        metadata: {
+          generationTime: 1,
+        },
+      }),
+      getHistory: async () => ({}),
+    } as any),
+);
+
+let catalogRequestOptions: CatalogRequestOptions;
+
+jest.mock('@backstage/catalog-client', () => ({
+  CatalogClient: jest.fn().mockImplementation(() => ({
+    getEntityByRef: async (_: string, options: CatalogRequestOptions) => {
+      catalogRequestOptions = options;
+      return {};
+    },
+  })),
+}));
 
 function createDatabase(): PluginDatabaseManager {
   return DatabaseManager.fromConfig(
@@ -76,4 +105,28 @@ describe('createRouter', () => {
       expect(response.body).toEqual({ status: 'ok' });
     });
   });
+
+  [
+    '/report?entity=component:default/mycomponent',
+    '/history?entity=component:default/mycomponent',
+  ].forEach(uri => {
+    describe(`GET ${uri}`, () => {
+      it('does not send token when calling catalog api and request is unauthenticated', async () => {
+        const response = await request(app).get(uri);
+
+        expect(response.status).toEqual(200);
+        expect(catalogRequestOptions.token).toBeUndefined();
+      });
+
+      it('includes auth token when calling catalog api', async () => {
+        const token = 'my-auth-token';
+        const response = await request(app)
+          .get(uri)
+          .set('Authorization', `Bearer ${token}`);
+
+        expect(response.status).toEqual(200);
+        expect(catalogRequestOptions.token).toEqual(token);
+      });
+    });
+  });
 });
diff --git a/plugins/code-coverage-backend/src/service/router.ts b/plugins/code-coverage-backend/src/service/router.ts
index 4d4fb779b5..3b97f2d233 100644
--- a/plugins/code-coverage-backend/src/service/router.ts
+++ b/plugins/code-coverage-backend/src/service/router.ts
@@ -17,7 +17,8 @@
 import express from 'express';
 import Router from 'express-promise-router';
 import { Logger } from 'winston';
-import xmlparser from 'express-xml-bodyparser';
+import BodyParser from 'body-parser';
+import bodyParserXml from 'body-parser-xml';
 import { CatalogApi, CatalogClient } from '@backstage/catalog-client';
 import {
   errorHandler,
@@ -30,10 +31,9 @@ import { Config } from '@backstage/config';
 import { ScmIntegrations } from '@backstage/integration';
 import { CodeCoverageDatabase } from './CodeCoverageDatabase';
 import { aggregateCoverage, CoverageUtils } from './CoverageUtils';
-import { Cobertura } from './converter/cobertura';
-import { Jacoco } from './converter/jacoco';
-import { Converter } from './converter';
+import { Converter, Jacoco, Cobertura, Lcov } from './converter';
 import { getEntitySourceLocation } from '@backstage/catalog-model';
+import { getBearerTokenFromAuthorizationHeader } from '@backstage/plugin-auth-node';
 
 /**
  * Options for {@link createRouter}.
@@ -64,8 +64,10 @@ export const makeRouter = async (
     options.catalogApi ?? new CatalogClient({ discoveryApi: discovery });
   const scm = ScmIntegrations.fromConfig(config);
 
+  bodyParserXml(BodyParser);
   const router = Router();
-  router.use(xmlparser());
+  router.use(BodyParser.xml());
+  router.use(BodyParser.text());
   router.use(express.json());
 
   const utils = new CoverageUtils(scm, urlReader);
@@ -79,7 +81,9 @@ export const makeRouter = async (
    */
   router.get('/report', async (req, res) => {
     const { entity } = req.query;
-    const entityLookup = await catalogApi.getEntityByRef(entity as string);
+    const entityLookup = await catalogApi.getEntityByRef(entity as string, {
+      token: getBearerTokenFromAuthorizationHeader(req.headers.authorization),
+    });
     if (!entityLookup) {
       throw new NotFoundError(`No entity found matching ${entity}`);
     }
@@ -101,7 +105,9 @@ export const makeRouter = async (
    */
   router.get('/history', async (req, res) => {
     const { entity } = req.query;
-    const entityLookup = await catalogApi.getEntityByRef(entity as string);
+    const entityLookup = await catalogApi.getEntityByRef(entity as string, {
+      token: getBearerTokenFromAuthorizationHeader(req.headers.authorization),
+    });
     if (!entityLookup) {
       throw new NotFoundError(`No entity found matching ${entity}`);
     }
@@ -119,7 +125,9 @@ export const makeRouter = async (
    */
   router.get('/file-content', async (req, res) => {
     const { entity, path } = req.query;
-    const entityLookup = await catalogApi.getEntityByRef(entity as string);
+    const entityLookup = await catalogApi.getEntityByRef(entity as string, {
+      token: getBearerTokenFromAuthorizationHeader(req.headers.authorization),
+    });
     if (!entityLookup) {
       throw new NotFoundError(`No entity found matching ${entity}`);
     }
@@ -170,7 +178,9 @@ export const makeRouter = async (
    */
   router.post('/report', async (req, res) => {
     const { entity: entityRef, coverageType } = req.query;
-    const entity = await catalogApi.getEntityByRef(entityRef as string);
+    const entity = await catalogApi.getEntityByRef(entityRef as string, {
+      token: getBearerTokenFromAuthorizationHeader(req.headers.authorization),
+    });
     if (!entity) {
       throw new NotFoundError(`No entity found matching ${entityRef}`);
     }
@@ -182,6 +192,8 @@ export const makeRouter = async (
       converter = new Jacoco(logger);
     } else if (coverageType === 'cobertura') {
       converter = new Cobertura(logger);
+    } else if (coverageType === 'lcov') {
+      converter = new Lcov(logger);
     } else {
       throw new InputError(`Unsupported coverage type '${coverageType}`);
     }
diff --git a/plugins/code-coverage-backend/src/service/standaloneServer.ts b/plugins/code-coverage-backend/src/service/standaloneServer.ts
index 41493660fb..23eaf981c1 100644
--- a/plugins/code-coverage-backend/src/service/standaloneServer.ts
+++ b/plugins/code-coverage-backend/src/service/standaloneServer.ts
@@ -16,8 +16,8 @@
 
 import {
   createServiceBuilder,
+  HostDiscovery,
   loadBackendConfig,
-  SingleHostDiscovery,
   UrlReaders,
   useHotMemoize,
 } from '@backstage/backend-common';
@@ -71,7 +71,7 @@ export async function startStandaloneServer(
   const router = await createRouter({
     database: { getClient: async () => db },
     config,
-    discovery: SingleHostDiscovery.fromConfig(config),
+    discovery: HostDiscovery.fromConfig(config),
     urlReader: UrlReaders.default({ logger, config }),
     logger,
     catalogApi,
diff --git a/plugins/code-coverage/CHANGELOG.md b/plugins/code-coverage/CHANGELOG.md
index 28c8abef54..3ae505d854 100644
--- a/plugins/code-coverage/CHANGELOG.md
+++ b/plugins/code-coverage/CHANGELOG.md
@@ -1,5 +1,67 @@
 # @backstage/plugin-code-coverage
 
+## 0.2.17-next.2
+
+### Patch Changes
+
+- 8cec7664e146: Removed `@types/node` dependency
+- Updated dependencies
+  - @backstage/core-components@0.13.5-next.2
+  - @backstage/core-plugin-api@1.6.0-next.2
+  - @backstage/config@1.1.0-next.1
+  - @backstage/plugin-catalog-react@1.8.4-next.2
+  - @backstage/catalog-model@1.4.2-next.1
+  - @backstage/errors@1.2.1
+  - @backstage/theme@0.4.1
+
+## 0.2.17-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.8.4-next.1
+  - @backstage/core-components@0.13.5-next.1
+  - @backstage/config@1.1.0-next.0
+  - @backstage/catalog-model@1.4.2-next.0
+  - @backstage/core-plugin-api@1.6.0-next.1
+  - @backstage/errors@1.2.1
+  - @backstage/theme@0.4.1
+
+## 0.2.16-next.0
+
+### Patch Changes
+
+- 1d8f4f0a7486: Use fetchApi to ensure authorization is used when fetching code-coverage data
+- Updated dependencies
+  - @backstage/core-plugin-api@1.6.0-next.0
+  - @backstage/core-components@0.13.5-next.0
+  - @backstage/catalog-model@1.4.1
+  - @backstage/config@1.0.8
+  - @backstage/errors@1.2.1
+  - @backstage/theme@0.4.1
+  - @backstage/plugin-catalog-react@1.8.3-next.0
+
+## 0.2.14
+
+### Patch Changes
+
+- 12a8c94eda8d: Add package repository and homepage metadata
+- Updated dependencies
+  - @backstage/core-components@0.13.4
+  - @backstage/plugin-catalog-react@1.8.1
+  - @backstage/core-plugin-api@1.5.3
+  - @backstage/catalog-model@1.4.1
+  - @backstage/config@1.0.8
+  - @backstage/errors@1.2.1
+  - @backstage/theme@0.4.1
+
+## 0.2.14-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.8.1-next.1
+
 ## 0.2.14-next.1
 
 ### Patch Changes
diff --git a/plugins/code-coverage/catalog-info.yaml b/plugins/code-coverage/catalog-info.yaml
new file mode 100644
index 0000000000..27887c89aa
--- /dev/null
+++ b/plugins/code-coverage/catalog-info.yaml
@@ -0,0 +1,10 @@
+apiVersion: backstage.io/v1alpha1
+kind: Component
+metadata:
+  name: backstage-plugin-code-coverage
+  title: '@backstage/plugin-code-coverage'
+  description: A Backstage plugin that helps you keep track of your code coverage
+spec:
+  lifecycle: experimental
+  type: backstage-frontend-plugin
+  owner: alde
diff --git a/plugins/code-coverage/package.json b/plugins/code-coverage/package.json
index 8e2b111878..a7ab1f0188 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.14-next.1",
+  "version": "0.2.17-next.2",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
@@ -19,6 +19,7 @@
     "url": "https://github.com/backstage/backstage",
     "directory": "plugins/code-coverage"
   },
+  "sideEffects": false,
   "scripts": {
     "build": "backstage-cli package build",
     "start": "backstage-cli package start",
@@ -60,7 +61,6 @@
     "@testing-library/react": "^12.1.3",
     "@testing-library/user-event": "^14.0.0",
     "@types/highlightjs": "^10.1.0",
-    "@types/node": "^16.11.26",
     "@types/react": "^16.13.1 || ^17.0.0",
     "@types/recharts": "^1.8.15",
     "msw": "^1.0.0"
diff --git a/plugins/code-coverage/src/api.ts b/plugins/code-coverage/src/api.ts
index 081f1c7999..942e5a8a47 100644
--- a/plugins/code-coverage/src/api.ts
+++ b/plugins/code-coverage/src/api.ts
@@ -20,10 +20,13 @@ import {
 } from '@backstage/catalog-model';
 import { ResponseError } from '@backstage/errors';
 import { JsonCodeCoverage, JsonCoverageHistory } from './types';
-import { createApiRef, DiscoveryApi } from '@backstage/core-plugin-api';
+import {
+  createApiRef,
+  DiscoveryApi,
+  FetchApi,
+} from '@backstage/core-plugin-api';
 
 export type CodeCoverageApi = {
-  discovery: DiscoveryApi;
   getCoverageForEntity: (
     entity: CompoundEntityRef,
   ) => Promise<JsonCodeCoverage>;
@@ -42,18 +45,22 @@ export const codeCoverageApiRef = createApiRef<CodeCoverageApi>({
 });
 
 export class CodeCoverageRestApi implements CodeCoverageApi {
-  url: string = '';
+  private readonly discoveryApi: DiscoveryApi;
+  private readonly fetchApi: FetchApi;
 
-  constructor(public discovery: DiscoveryApi) {}
+  public constructor(options: {
+    discoveryApi: DiscoveryApi;
+    fetchApi: FetchApi;
+  }) {
+    this.discoveryApi = options.discoveryApi;
+    this.fetchApi = options.fetchApi;
+  }
 
   private async fetch<T = unknown | string | JsonCoverageHistory>(
     path: string,
-    init?: RequestInit,
   ): Promise<T | string> {
-    if (!this.url) {
-      this.url = await this.discovery.getBaseUrl('code-coverage');
-    }
-    const resp = await fetch(`${this.url}${path}`, init);
+    const url = await this.discoveryApi.getBaseUrl('code-coverage');
+    const resp = await this.fetchApi.fetch(`${url}${path}`);
     if (!resp.ok) {
       throw await ResponseError.fromResponse(resp);
     }
diff --git a/plugins/code-coverage/src/plugin.ts b/plugins/code-coverage/src/plugin.ts
index f137e9d488..391595f142 100644
--- a/plugins/code-coverage/src/plugin.ts
+++ b/plugins/code-coverage/src/plugin.ts
@@ -21,6 +21,7 @@ import {
   createPlugin,
   createRoutableExtension,
   discoveryApiRef,
+  fetchApiRef,
 } from '@backstage/core-plugin-api';
 
 /**
@@ -34,8 +35,9 @@ export const codeCoveragePlugin = createPlugin({
   apis: [
     createApiFactory({
       api: codeCoverageApiRef,
-      deps: { discoveryApi: discoveryApiRef },
-      factory: ({ discoveryApi }) => new CodeCoverageRestApi(discoveryApi),
+      deps: { discoveryApi: discoveryApiRef, fetchApi: fetchApiRef },
+      factory: ({ discoveryApi, fetchApi }) =>
+        new CodeCoverageRestApi({ discoveryApi, fetchApi }),
     }),
   ],
 });
diff --git a/plugins/codescene/CHANGELOG.md b/plugins/codescene/CHANGELOG.md
index 3a10b0984f..8e03362c46 100644
--- a/plugins/codescene/CHANGELOG.md
+++ b/plugins/codescene/CHANGELOG.md
@@ -1,5 +1,53 @@
 # @backstage/plugin-codescene
 
+## 0.1.17-next.2
+
+### Patch Changes
+
+- 8cec7664e146: Removed `@types/node` dependency
+- db92d1244897: Updated dependency `rc-progress` to `3.5.1`.
+- Updated dependencies
+  - @backstage/core-components@0.13.5-next.2
+  - @backstage/core-plugin-api@1.6.0-next.2
+  - @backstage/config@1.1.0-next.1
+  - @backstage/errors@1.2.1
+  - @backstage/theme@0.4.1
+
+## 0.1.17-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.13.5-next.1
+  - @backstage/config@1.1.0-next.0
+  - @backstage/core-plugin-api@1.6.0-next.1
+  - @backstage/errors@1.2.1
+  - @backstage/theme@0.4.1
+
+## 0.1.17-next.0
+
+### Patch Changes
+
+- 482bb5c0bbf8: Moved `@types/react` to be a regular dependency
+- Updated dependencies
+  - @backstage/core-plugin-api@1.6.0-next.0
+  - @backstage/core-components@0.13.5-next.0
+  - @backstage/config@1.0.8
+  - @backstage/errors@1.2.1
+  - @backstage/theme@0.4.1
+
+## 0.1.16
+
+### Patch Changes
+
+- 12a8c94eda8d: Add package repository and homepage metadata
+- Updated dependencies
+  - @backstage/core-components@0.13.4
+  - @backstage/core-plugin-api@1.5.3
+  - @backstage/config@1.0.8
+  - @backstage/errors@1.2.1
+  - @backstage/theme@0.4.1
+
 ## 0.1.16-next.1
 
 ### Patch Changes
diff --git a/plugins/codescene/api-report.md b/plugins/codescene/api-report.md
index 75dfddd09e..662968d3c9 100644
--- a/plugins/codescene/api-report.md
+++ b/plugins/codescene/api-report.md
@@ -7,13 +7,14 @@
 
 import { BackstagePlugin } from '@backstage/core-plugin-api';
 import { IconComponent } from '@backstage/core-plugin-api';
+import { JSX as JSX_2 } from 'react';
 import { RouteRef } from '@backstage/core-plugin-api';
 
 // @public (undocumented)
 export const CodeSceneIcon: IconComponent;
 
 // @public (undocumented)
-export const CodeScenePage: () => JSX.Element;
+export const CodeScenePage: () => JSX_2.Element;
 
 // @public (undocumented)
 export const codescenePlugin: BackstagePlugin<
@@ -28,7 +29,7 @@ export const codescenePlugin: BackstagePlugin<
 >;
 
 // @public (undocumented)
-export const CodeSceneProjectDetailsPage: () => JSX.Element;
+export const CodeSceneProjectDetailsPage: () => JSX_2.Element;
 
 // (No @packageDocumentation comment for this package)
 ```
diff --git a/plugins/codescene/catalog-info.yaml b/plugins/codescene/catalog-info.yaml
new file mode 100644
index 0000000000..5904add837
--- /dev/null
+++ b/plugins/codescene/catalog-info.yaml
@@ -0,0 +1,9 @@
+apiVersion: backstage.io/v1alpha1
+kind: Component
+metadata:
+  name: backstage-plugin-codescene
+  title: '@backstage/plugin-codescene'
+spec:
+  lifecycle: experimental
+  type: backstage-frontend-plugin
+  owner: maintainers
diff --git a/plugins/codescene/package.json b/plugins/codescene/package.json
index 4ec2a9ec4b..1fa703e45a 100644
--- a/plugins/codescene/package.json
+++ b/plugins/codescene/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-codescene",
-  "version": "0.1.16-next.1",
+  "version": "0.1.17-next.2",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
@@ -18,6 +18,7 @@
     "url": "https://github.com/backstage/backstage",
     "directory": "plugins/codescene"
   },
+  "sideEffects": false,
   "scripts": {
     "start": "backstage-cli package start",
     "build": "backstage-cli package build",
@@ -36,7 +37,8 @@
     "@material-ui/core": "^4.12.2",
     "@material-ui/icons": "^4.9.1",
     "@material-ui/lab": "4.0.0-alpha.61",
-    "rc-progress": "3.4.2",
+    "@types/react": "^16.13.1 || ^17.0.0",
+    "rc-progress": "3.5.1",
     "react-use": "^17.2.4"
   },
   "peerDependencies": {
@@ -53,8 +55,6 @@
     "@testing-library/jest-dom": "^5.10.1",
     "@testing-library/react": "^12.1.3",
     "@testing-library/user-event": "^14.0.0",
-    "@types/node": "*",
-    "@types/react": "^16.13.1 || ^17.0.0",
     "msw": "^1.0.0"
   },
   "files": [
diff --git a/plugins/config-schema/CHANGELOG.md b/plugins/config-schema/CHANGELOG.md
index b607255110..976c3a5012 100644
--- a/plugins/config-schema/CHANGELOG.md
+++ b/plugins/config-schema/CHANGELOG.md
@@ -1,5 +1,56 @@
 # @backstage/plugin-config-schema
 
+## 0.1.45-next.2
+
+### Patch Changes
+
+- 8cec7664e146: Removed `@types/node` dependency
+- Updated dependencies
+  - @backstage/core-components@0.13.5-next.2
+  - @backstage/core-plugin-api@1.6.0-next.2
+  - @backstage/config@1.1.0-next.1
+  - @backstage/errors@1.2.1
+  - @backstage/theme@0.4.1
+  - @backstage/types@1.1.0
+
+## 0.1.45-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.13.5-next.1
+  - @backstage/config@1.1.0-next.0
+  - @backstage/core-plugin-api@1.6.0-next.1
+  - @backstage/errors@1.2.1
+  - @backstage/theme@0.4.1
+  - @backstage/types@1.1.0
+
+## 0.1.45-next.0
+
+### Patch Changes
+
+- 482bb5c0bbf8: Moved `@types/react` to be a regular dependency
+- Updated dependencies
+  - @backstage/core-plugin-api@1.6.0-next.0
+  - @backstage/core-components@0.13.5-next.0
+  - @backstage/config@1.0.8
+  - @backstage/errors@1.2.1
+  - @backstage/theme@0.4.1
+  - @backstage/types@1.1.0
+
+## 0.1.44
+
+### Patch Changes
+
+- 12a8c94eda8d: Add package repository and homepage metadata
+- Updated dependencies
+  - @backstage/core-components@0.13.4
+  - @backstage/core-plugin-api@1.5.3
+  - @backstage/config@1.0.8
+  - @backstage/errors@1.2.1
+  - @backstage/theme@0.4.1
+  - @backstage/types@1.1.0
+
 ## 0.1.44-next.1
 
 ### Patch Changes
diff --git a/plugins/config-schema/api-report.md b/plugins/config-schema/api-report.md
index 7d110c34d4..95d352d1b7 100644
--- a/plugins/config-schema/api-report.md
+++ b/plugins/config-schema/api-report.md
@@ -7,6 +7,7 @@
 
 import { ApiRef } from '@backstage/core-plugin-api';
 import { BackstagePlugin } from '@backstage/core-plugin-api';
+import { JSX as JSX_2 } from 'react';
 import { Observable } from '@backstage/types';
 import { RouteRef } from '@backstage/core-plugin-api';
 import { Schema } from 'jsonschema';
@@ -21,7 +22,7 @@ export interface ConfigSchemaApi {
 export const configSchemaApiRef: ApiRef<ConfigSchemaApi>;
 
 // @public (undocumented)
-export const ConfigSchemaPage: () => JSX.Element;
+export const ConfigSchemaPage: () => JSX_2.Element;
 
 // @public (undocumented)
 export const configSchemaPlugin: BackstagePlugin<
diff --git a/plugins/config-schema/catalog-info.yaml b/plugins/config-schema/catalog-info.yaml
new file mode 100644
index 0000000000..fbea2be520
--- /dev/null
+++ b/plugins/config-schema/catalog-info.yaml
@@ -0,0 +1,10 @@
+apiVersion: backstage.io/v1alpha1
+kind: Component
+metadata:
+  name: backstage-plugin-config-schema
+  title: '@backstage/plugin-config-schema'
+  description: A Backstage plugin that lets you browse the configuration schema of your app
+spec:
+  lifecycle: experimental
+  type: backstage-frontend-plugin
+  owner: maintainers
diff --git a/plugins/config-schema/package.json b/plugins/config-schema/package.json
index 2f8d233407..1cb52f0ce4 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.44-next.1",
+  "version": "0.1.45-next.2",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
@@ -19,6 +19,7 @@
     "url": "https://github.com/backstage/backstage",
     "directory": "plugins/config-schema"
   },
+  "sideEffects": false,
   "scripts": {
     "build": "backstage-cli package build",
     "start": "backstage-cli package start",
@@ -38,6 +39,7 @@
     "@material-ui/core": "^4.12.2",
     "@material-ui/icons": "^4.9.1",
     "@material-ui/lab": "4.0.0-alpha.61",
+    "@types/react": "^16.13.1 || ^17.0.0",
     "jsonschema": "^1.2.6",
     "react-use": "^17.2.4",
     "zen-observable": "^0.10.0"
@@ -56,8 +58,6 @@
     "@testing-library/jest-dom": "^5.10.1",
     "@testing-library/react": "^12.1.3",
     "@testing-library/user-event": "^14.0.0",
-    "@types/node": "^16.11.26",
-    "@types/react": "^16.13.1 || ^17.0.0",
     "msw": "^1.0.0"
   },
   "files": [
diff --git a/plugins/cost-insights-common/catalog-info.yaml b/plugins/cost-insights-common/catalog-info.yaml
new file mode 100644
index 0000000000..027726d1a9
--- /dev/null
+++ b/plugins/cost-insights-common/catalog-info.yaml
@@ -0,0 +1,10 @@
+apiVersion: backstage.io/v1alpha1
+kind: Component
+metadata:
+  name: backstage-plugin-cost-insights-common
+  title: '@backstage/plugin-cost-insights-common'
+  description: Common functionalities for the cost-insights plugin
+spec:
+  lifecycle: experimental
+  type: backstage-common-library
+  owner: silver-lining
diff --git a/plugins/cost-insights-common/package.json b/plugins/cost-insights-common/package.json
index d675e0a548..a2d2c7d439 100644
--- a/plugins/cost-insights-common/package.json
+++ b/plugins/cost-insights-common/package.json
@@ -23,6 +23,7 @@
   "keywords": [
     "backstage"
   ],
+  "sideEffects": false,
   "scripts": {
     "build": "backstage-cli package build",
     "lint": "backstage-cli package lint",
diff --git a/plugins/cost-insights/CHANGELOG.md b/plugins/cost-insights/CHANGELOG.md
index 98a48380ee..59884812ee 100644
--- a/plugins/cost-insights/CHANGELOG.md
+++ b/plugins/cost-insights/CHANGELOG.md
@@ -1,5 +1,66 @@
 # @backstage/plugin-cost-insights
 
+## 0.12.13-next.2
+
+### Patch Changes
+
+- 8cec7664e146: Removed `@types/node` dependency
+- Updated dependencies
+  - @backstage/core-components@0.13.5-next.2
+  - @backstage/core-plugin-api@1.6.0-next.2
+  - @backstage/config@1.1.0-next.1
+  - @backstage/plugin-catalog-react@1.8.4-next.2
+  - @backstage/catalog-model@1.4.2-next.1
+  - @backstage/theme@0.4.1
+  - @backstage/plugin-cost-insights-common@0.1.1
+
+## 0.12.13-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.8.4-next.1
+  - @backstage/core-components@0.13.5-next.1
+  - @backstage/config@1.1.0-next.0
+  - @backstage/catalog-model@1.4.2-next.0
+  - @backstage/core-plugin-api@1.6.0-next.1
+  - @backstage/theme@0.4.1
+  - @backstage/plugin-cost-insights-common@0.1.1
+
+## 0.12.12-next.0
+
+### Patch Changes
+
+- a54cd411639e: Updated dependency `@types/pluralize` to `^0.0.30`.
+- Updated dependencies
+  - @backstage/core-plugin-api@1.6.0-next.0
+  - @backstage/core-components@0.13.5-next.0
+  - @backstage/catalog-model@1.4.1
+  - @backstage/config@1.0.8
+  - @backstage/theme@0.4.1
+  - @backstage/plugin-catalog-react@1.8.3-next.0
+  - @backstage/plugin-cost-insights-common@0.1.1
+
+## 0.12.10
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.13.4
+  - @backstage/plugin-catalog-react@1.8.1
+  - @backstage/core-plugin-api@1.5.3
+  - @backstage/catalog-model@1.4.1
+  - @backstage/config@1.0.8
+  - @backstage/theme@0.4.1
+  - @backstage/plugin-cost-insights-common@0.1.1
+
+## 0.12.10-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.8.1-next.1
+
 ## 0.12.10-next.0
 
 ### Patch Changes
diff --git a/plugins/cost-insights/api-report.md b/plugins/cost-insights/api-report.md
index 00cbc4c3af..b37804c93d 100644
--- a/plugins/cost-insights/api-report.md
+++ b/plugins/cost-insights/api-report.md
@@ -16,6 +16,7 @@ import { Dispatch } from 'react';
 import { Entity as Entity_2 } from '@backstage/plugin-cost-insights-common';
 import { ForwardRefExoticComponent } from 'react';
 import { Group as Group_2 } from '@backstage/plugin-cost-insights-common';
+import { JSX as JSX_2 } from 'react';
 import { Maybe as Maybe_2 } from '@backstage/plugin-cost-insights-common';
 import { Metric as Metric_2 } from '@backstage/plugin-cost-insights-common';
 import { MetricData as MetricData_2 } from '@backstage/plugin-cost-insights-common';
@@ -23,6 +24,7 @@ import { PaletteOptions } from '@material-ui/core/styles/createPalette';
 import { Product as Product_2 } from '@backstage/plugin-cost-insights-common';
 import { Project as Project_2 } from '@backstage/plugin-cost-insights-common';
 import { PropsWithChildren } from 'react';
+import { default as React_2 } from 'react';
 import { ReactNode } from 'react';
 import { RefAttributes } from 'react';
 import { RouteRef } from '@backstage/core-plugin-api';
@@ -140,7 +142,7 @@ export enum AlertStatus {
 }
 
 // @public (undocumented)
-export const BarChart: (props: BarChartProps) => JSX.Element;
+export const BarChart: (props: BarChartProps) => React_2.JSX.Element;
 
 // @public @deprecated (undocumented)
 export interface BarChartData extends BarChartOptions {}
@@ -148,7 +150,7 @@ export interface BarChartData extends BarChartOptions {}
 // @public (undocumented)
 export const BarChartLegend: (
   props: PropsWithChildren<BarChartLegendProps>,
-) => JSX.Element;
+) => React_2.JSX.Element;
 
 // @public (undocumented)
 export type BarChartLegendOptions = {
@@ -192,12 +194,12 @@ export type BarChartProps = {
 // @public (undocumented)
 export const BarChartTooltip: (
   props: PropsWithChildren<BarChartTooltipProps>,
-) => JSX.Element;
+) => React_2.JSX.Element;
 
 // @public (undocumented)
 export const BarChartTooltipItem: (
   props: BarChartTooltipItemProps,
-) => JSX.Element;
+) => React_2.JSX.Element;
 
 // @public (undocumented)
 export type BarChartTooltipItemProps = {
@@ -247,12 +249,12 @@ export type ConfigContextProps = {
 export type Cost = common.Cost;
 
 // @public (undocumented)
-export const CostGrowth: (props: CostGrowthProps) => JSX.Element;
+export const CostGrowth: (props: CostGrowthProps) => React_2.JSX.Element;
 
 // @public (undocumented)
 export const CostGrowthIndicator: (
   props: CostGrowthIndicatorProps,
-) => JSX.Element;
+) => React_2.JSX.Element;
 
 // @public (undocumented)
 export type CostGrowthIndicatorProps = TypographyProps & {
@@ -291,10 +293,10 @@ export type CostInsightsApi = {
 export const costInsightsApiRef: ApiRef<CostInsightsApi>;
 
 // @public (undocumented)
-export const CostInsightsLabelDataflowInstructionsPage: () => JSX.Element;
+export const CostInsightsLabelDataflowInstructionsPage: () => JSX_2.Element;
 
 // @public (undocumented)
-export const CostInsightsPage: () => JSX.Element;
+export const CostInsightsPage: () => JSX_2.Element;
 
 // @public (undocumented)
 export type CostInsightsPalette = BackstagePalette &
@@ -331,7 +333,7 @@ export { costInsightsPlugin };
 export { costInsightsPlugin as plugin };
 
 // @public (undocumented)
-export const CostInsightsProjectGrowthInstructionsPage: () => JSX.Element;
+export const CostInsightsProjectGrowthInstructionsPage: () => JSX_2.Element;
 
 // @public (undocumented)
 export interface CostInsightsTheme extends BackstageTheme {
@@ -418,7 +420,7 @@ export const EngineerThreshold = 0.5;
 export type Entity = common.Entity;
 
 // @public
-export const EntityCostInsightsContent: () => JSX.Element;
+export const EntityCostInsightsContent: () => JSX_2.Element;
 
 // @public (undocumented)
 export class ExampleCostInsightsClient implements CostInsightsApi {
@@ -483,7 +485,7 @@ export enum IconType {
 // @public (undocumented)
 export const LegendItem: (
   props: PropsWithChildren<LegendItemProps>,
-) => JSX.Element;
+) => React_2.JSX.Element;
 
 // @public (undocumented)
 export type LegendItemProps = {
@@ -507,7 +509,7 @@ export type MetricData = common.MetricData;
 // @public (undocumented)
 export const MockConfigProvider: (
   props: MockConfigProviderProps,
-) => JSX.Element;
+) => React_2.JSX.Element;
 
 // @public (undocumented)
 export type MockConfigProviderProps = PropsWithChildren<
@@ -517,7 +519,7 @@ export type MockConfigProviderProps = PropsWithChildren<
 // @public (undocumented)
 export const MockCurrencyProvider: (
   props: MockCurrencyProviderProps,
-) => JSX.Element;
+) => React_2.JSX.Element;
 
 // @public (undocumented)
 export type MockCurrencyProviderProps = PropsWithChildren<
@@ -567,7 +569,7 @@ export class ProjectGrowthAlert implements Alert {
   // (undocumented)
   data: ProjectGrowthData;
   // (undocumented)
-  get element(): JSX.Element;
+  get element(): React_2.JSX.Element;
   // (undocumented)
   get subtitle(): string;
   // (undocumented)
@@ -623,7 +625,7 @@ export class UnlabeledDataflowAlert implements Alert {
   // (undocumented)
   data: UnlabeledDataflowData;
   // (undocumented)
-  get element(): JSX.Element;
+  get element(): React_2.JSX.Element;
   // (undocumented)
   status?: AlertStatus;
   // (undocumented)
diff --git a/plugins/cost-insights/catalog-info.yaml b/plugins/cost-insights/catalog-info.yaml
new file mode 100644
index 0000000000..7cfeb607a8
--- /dev/null
+++ b/plugins/cost-insights/catalog-info.yaml
@@ -0,0 +1,10 @@
+apiVersion: backstage.io/v1alpha1
+kind: Component
+metadata:
+  name: backstage-plugin-cost-insights
+  title: '@backstage/plugin-cost-insights'
+  description: A Backstage plugin that helps you keep track of your cloud spend
+spec:
+  lifecycle: experimental
+  type: backstage-frontend-plugin
+  owner: silver-lining
diff --git a/plugins/cost-insights/package.json b/plugins/cost-insights/package.json
index b87b3db435..1774944f7a 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.10-next.0",
+  "version": "0.12.13-next.2",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
@@ -22,6 +22,7 @@
   "keywords": [
     "backstage"
   ],
+  "sideEffects": false,
   "scripts": {
     "build": "backstage-cli package build",
     "start": "backstage-cli package start",
@@ -69,8 +70,7 @@
     "@testing-library/jest-dom": "^5.10.1",
     "@testing-library/react": "^12.1.3",
     "@testing-library/user-event": "^14.0.0",
-    "@types/node": "^16.11.26",
-    "@types/pluralize": "^0.0.29",
+    "@types/pluralize": "^0.0.30",
     "@types/recharts": "^1.8.14",
     "@types/regression": "^2.0.0",
     "@types/yup": "^0.29.13",
diff --git a/plugins/devtools-backend/CHANGELOG.md b/plugins/devtools-backend/CHANGELOG.md
index c1f6c2e10f..7d5f1f5b79 100644
--- a/plugins/devtools-backend/CHANGELOG.md
+++ b/plugins/devtools-backend/CHANGELOG.md
@@ -1,5 +1,98 @@
 # @backstage/plugin-devtools-backend
 
+## 0.1.6-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config-loader@1.5.0-next.2
+  - @backstage/config@1.1.0-next.1
+  - @backstage/backend-common@0.19.5-next.2
+  - @backstage/plugin-auth-node@0.3.0-next.2
+  - @backstage/plugin-permission-node@0.7.14-next.2
+  - @backstage/backend-plugin-api@0.6.3-next.2
+  - @backstage/plugin-permission-common@0.7.8-next.1
+  - @backstage/cli-common@0.1.12
+  - @backstage/errors@1.2.1
+  - @backstage/types@1.1.0
+  - @backstage/plugin-devtools-common@0.1.4-next.1
+
+## 0.1.6-next.1
+
+### Patch Changes
+
+- 12e644aa4eef: Show resource utilization in `DevTools` plugin
+- Updated dependencies
+  - @backstage/config@1.1.0-next.0
+  - @backstage/plugin-devtools-common@0.1.4-next.0
+  - @backstage/backend-common@0.19.5-next.1
+  - @backstage/backend-plugin-api@0.6.3-next.1
+  - @backstage/config-loader@1.5.0-next.1
+  - @backstage/plugin-auth-node@0.3.0-next.1
+  - @backstage/plugin-permission-common@0.7.8-next.0
+  - @backstage/plugin-permission-node@0.7.14-next.1
+  - @backstage/cli-common@0.1.12
+  - @backstage/errors@1.2.1
+  - @backstage/types@1.1.0
+
+## 0.1.5-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-auth-node@0.3.0-next.0
+  - @backstage/backend-common@0.19.4-next.0
+  - @backstage/config-loader@1.5.0-next.0
+  - @backstage/backend-plugin-api@0.6.2-next.0
+  - @backstage/cli-common@0.1.12
+  - @backstage/config@1.0.8
+  - @backstage/errors@1.2.1
+  - @backstage/types@1.1.0
+  - @backstage/plugin-devtools-common@0.1.3
+  - @backstage/plugin-permission-common@0.7.7
+  - @backstage/plugin-permission-node@0.7.13-next.0
+
+## 0.1.3
+
+### Patch Changes
+
+- 629cbd194a87: Use `coreServices.rootConfig` instead of `coreService.config`
+- 12a8c94eda8d: Add package repository and homepage metadata
+- 2b4f77a4e900: Add DevTools configuration to enable dependency listing to be filtered with custom prefixes. For instance, in your `app-config.yaml`:
+
+  ```yaml
+  devTools:
+    info:
+      packagePrefixes:
+        - @backstage/
+        - @roadiehq/backstage-
+        - @spotify/backstage-
+  ```
+
+- Updated dependencies
+  - @backstage/backend-common@0.19.2
+  - @backstage/config-loader@1.4.0
+  - @backstage/backend-plugin-api@0.6.0
+  - @backstage/plugin-devtools-common@0.1.3
+  - @backstage/plugin-auth-node@0.2.17
+  - @backstage/plugin-permission-node@0.7.11
+  - @backstage/cli-common@0.1.12
+  - @backstage/config@1.0.8
+  - @backstage/errors@1.2.1
+  - @backstage/types@1.1.0
+  - @backstage/plugin-permission-common@0.7.7
+
+## 0.1.3-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@0.6.0-next.2
+  - @backstage/backend-common@0.19.2-next.2
+  - @backstage/plugin-permission-node@0.7.11-next.2
+  - @backstage/plugin-auth-node@0.2.17-next.2
+  - @backstage/config-loader@1.4.0-next.1
+
 ## 0.1.3-next.1
 
 ### Patch Changes
diff --git a/plugins/devtools-backend/api-report.md b/plugins/devtools-backend/api-report.md
index dc51fc8387..b9eb7b5a0c 100644
--- a/plugins/devtools-backend/api-report.md
+++ b/plugins/devtools-backend/api-report.md
@@ -27,7 +27,8 @@ export class DevToolsBackendApi {
 }
 
 // @public
-export const devtoolsPlugin: () => BackendFeature;
+const devtoolsPlugin: () => BackendFeature;
+export default devtoolsPlugin;
 
 // @public (undocumented)
 export interface RouterOptions {
diff --git a/plugins/devtools-backend/catalog-info.yaml b/plugins/devtools-backend/catalog-info.yaml
new file mode 100644
index 0000000000..29e91c4ad7
--- /dev/null
+++ b/plugins/devtools-backend/catalog-info.yaml
@@ -0,0 +1,9 @@
+apiVersion: backstage.io/v1alpha1
+kind: Component
+metadata:
+  name: backstage-plugin-devtools-backend
+  title: '@backstage/plugin-devtools-backend'
+spec:
+  lifecycle: experimental
+  type: backstage-backend-plugin
+  owner: awanlin
diff --git a/plugins/devtools-backend/package.json b/plugins/devtools-backend/package.json
index f45b38c120..e9fb555a0e 100644
--- a/plugins/devtools-backend/package.json
+++ b/plugins/devtools-backend/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-devtools-backend",
-  "version": "0.1.3-next.1",
+  "version": "0.1.6-next.2",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
diff --git a/plugins/devtools-backend/src/api/DevToolsBackendApi.ts b/plugins/devtools-backend/src/api/DevToolsBackendApi.ts
index c1b1a1fa9a..b71edb3391 100644
--- a/plugins/devtools-backend/src/api/DevToolsBackendApi.ts
+++ b/plugins/devtools-backend/src/api/DevToolsBackendApi.ts
@@ -17,12 +17,12 @@
 import { Config, ConfigReader } from '@backstage/config';
 import { loadConfigSchema } from '@backstage/config-loader';
 import {
-  PackageDependency,
-  DevToolsInfo,
-  ExternalDependency,
-  Endpoint,
-  ExternalDependencyStatus,
   ConfigInfo,
+  DevToolsInfo,
+  Endpoint,
+  ExternalDependency,
+  ExternalDependencyStatus,
+  PackageDependency,
 } from '@backstage/plugin-devtools-common';
 
 import { JsonObject } from '@backstage/types';
@@ -204,7 +204,16 @@ export class DevToolsBackendApi {
   }
 
   public async listInfo(): Promise<DevToolsInfo> {
-    const operatingSystem = `${os.type} ${os.release} - ${os.platform}/${os.arch}`;
+    const operatingSystem = `${os.hostname()}: ${os.type} ${os.release} - ${
+      os.platform
+    }/${os.arch}`;
+    const usedMem = Math.floor((os.totalmem() - os.freemem()) / (1024 * 1024));
+    const resources = `Memory: ${usedMem}/${Math.floor(
+      os.totalmem() / (1024 * 1024),
+    )}MB - Load: ${os
+      .loadavg()
+      .map(v => v.toFixed(2))
+      .join('/')}`;
     const nodeJsVersion = process.version;
 
     /* eslint-disable-next-line no-restricted-syntax */
@@ -238,6 +247,7 @@ export class DevToolsBackendApi {
 
     const info: DevToolsInfo = {
       operatingSystem: operatingSystem ?? 'N/A',
+      resourceUtilization: resources ?? 'N/A',
       nodeJsVersion: nodeJsVersion ?? 'N/A',
       backstageVersion:
         backstageJson && backstageJson.version ? backstageJson.version : 'N/A',
diff --git a/plugins/devtools-backend/src/index.ts b/plugins/devtools-backend/src/index.ts
index 57c1739c34..58d4570163 100644
--- a/plugins/devtools-backend/src/index.ts
+++ b/plugins/devtools-backend/src/index.ts
@@ -22,4 +22,4 @@
 
 export { DevToolsBackendApi } from './api';
 export * from './service/router';
-export { devtoolsPlugin } from './plugin';
+export { devtoolsPlugin as default } from './plugin';
diff --git a/plugins/devtools-common/CHANGELOG.md b/plugins/devtools-common/CHANGELOG.md
index adf0300433..2198dc466f 100644
--- a/plugins/devtools-common/CHANGELOG.md
+++ b/plugins/devtools-common/CHANGELOG.md
@@ -1,5 +1,31 @@
 # @backstage/plugin-devtools-common
 
+## 0.1.4-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-permission-common@0.7.8-next.1
+  - @backstage/types@1.1.0
+
+## 0.1.4-next.0
+
+### Patch Changes
+
+- 12e644aa4eef: Show resource utilization in `DevTools` plugin
+- Updated dependencies
+  - @backstage/plugin-permission-common@0.7.8-next.0
+  - @backstage/types@1.1.0
+
+## 0.1.3
+
+### Patch Changes
+
+- 12a8c94eda8d: Add package repository and homepage metadata
+- Updated dependencies
+  - @backstage/types@1.1.0
+  - @backstage/plugin-permission-common@0.7.7
+
 ## 0.1.3-next.0
 
 ### Patch Changes
diff --git a/plugins/devtools-common/api-report.md b/plugins/devtools-common/api-report.md
index 6594b0d8a4..83af75d11a 100644
--- a/plugins/devtools-common/api-report.md
+++ b/plugins/devtools-common/api-report.md
@@ -32,6 +32,7 @@ export const devToolsExternalDependenciesReadPermission: BasicPermission;
 // @public (undocumented)
 export type DevToolsInfo = {
   operatingSystem: string;
+  resourceUtilization: string;
   nodeJsVersion: string;
   backstageVersion: string;
   dependencies: PackageDependency[];
diff --git a/plugins/devtools-common/catalog-info.yaml b/plugins/devtools-common/catalog-info.yaml
new file mode 100644
index 0000000000..af2bcc4a1b
--- /dev/null
+++ b/plugins/devtools-common/catalog-info.yaml
@@ -0,0 +1,10 @@
+apiVersion: backstage.io/v1alpha1
+kind: Component
+metadata:
+  name: backstage-plugin-devtools-common
+  title: '@backstage/plugin-devtools-common'
+  description: Common functionalities for the devtools plugin
+spec:
+  lifecycle: experimental
+  type: backstage-common-library
+  owner: awanlin
diff --git a/plugins/devtools-common/package.json b/plugins/devtools-common/package.json
index d098df0e23..a4c81369b7 100644
--- a/plugins/devtools-common/package.json
+++ b/plugins/devtools-common/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@backstage/plugin-devtools-common",
   "description": "Common functionalities for the devtools plugin",
-  "version": "0.1.3-next.0",
+  "version": "0.1.4-next.1",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
@@ -20,6 +20,7 @@
     "url": "https://github.com/backstage/backstage",
     "directory": "plugins/devtools-common"
   },
+  "sideEffects": false,
   "scripts": {
     "build": "backstage-cli package build",
     "lint": "backstage-cli package lint",
diff --git a/plugins/devtools-common/src/types.ts b/plugins/devtools-common/src/types.ts
index d08232b155..75644ece26 100644
--- a/plugins/devtools-common/src/types.ts
+++ b/plugins/devtools-common/src/types.ts
@@ -35,6 +35,7 @@ export type ExternalDependency = {
 /** @public */
 export type DevToolsInfo = {
   operatingSystem: string;
+  resourceUtilization: string;
   nodeJsVersion: string;
   backstageVersion: string;
   dependencies: PackageDependency[];
diff --git a/plugins/devtools/CHANGELOG.md b/plugins/devtools/CHANGELOG.md
index d87d21a886..f47e662f22 100644
--- a/plugins/devtools/CHANGELOG.md
+++ b/plugins/devtools/CHANGELOG.md
@@ -1,5 +1,60 @@
 # @backstage/plugin-devtools
 
+## 0.1.4-next.2
+
+### Patch Changes
+
+- 8cec7664e146: Removed `@types/node` dependency
+- Updated dependencies
+  - @backstage/core-components@0.13.5-next.2
+  - @backstage/core-plugin-api@1.6.0-next.2
+  - @backstage/plugin-permission-react@0.4.15-next.2
+  - @backstage/errors@1.2.1
+  - @backstage/theme@0.4.1
+  - @backstage/types@1.1.0
+  - @backstage/plugin-devtools-common@0.1.4-next.1
+
+## 0.1.4-next.1
+
+### Patch Changes
+
+- 12e644aa4eef: Show resource utilization in `DevTools` plugin
+- Updated dependencies
+  - @backstage/core-components@0.13.5-next.1
+  - @backstage/plugin-devtools-common@0.1.4-next.0
+  - @backstage/core-plugin-api@1.6.0-next.1
+  - @backstage/plugin-permission-react@0.4.15-next.1
+  - @backstage/errors@1.2.1
+  - @backstage/theme@0.4.1
+  - @backstage/types@1.1.0
+
+## 0.1.4-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-plugin-api@1.6.0-next.0
+  - @backstage/core-components@0.13.5-next.0
+  - @backstage/errors@1.2.1
+  - @backstage/theme@0.4.1
+  - @backstage/types@1.1.0
+  - @backstage/plugin-devtools-common@0.1.3
+  - @backstage/plugin-permission-react@0.4.15-next.0
+
+## 0.1.3
+
+### Patch Changes
+
+- 48b6a04ad045: Fix readme typo
+- Updated dependencies
+  - @backstage/plugin-devtools-common@0.1.3
+  - @backstage/core-components@0.13.4
+  - @backstage/core-plugin-api@1.5.3
+  - @backstage/errors@1.2.1
+  - @backstage/theme@0.4.1
+  - @backstage/types@1.1.0
+  - @backstage/plugin-permission-react@0.4.14
+
 ## 0.1.3-next.1
 
 ### Patch Changes
diff --git a/plugins/devtools/api-report.md b/plugins/devtools/api-report.md
index 3e3fb99ff7..f0a9280162 100644
--- a/plugins/devtools/api-report.md
+++ b/plugins/devtools/api-report.md
@@ -7,15 +7,17 @@
 
 import { BackstagePlugin } from '@backstage/core-plugin-api';
 import { default as default_2 } from 'react';
+import { JSX as JSX_2 } from 'react';
+import { default as React_2 } from 'react';
 import { RouteRef } from '@backstage/core-plugin-api';
 import { TabProps } from '@material-ui/core';
 
 // @public (undocumented)
-export const ConfigContent: () => JSX.Element;
+export const ConfigContent: () => React_2.JSX.Element;
 
 // @public
 export const DevToolsLayout: {
-  ({ children, title, subtitle }: DevToolsLayoutProps): JSX.Element;
+  ({ children, title, subtitle }: DevToolsLayoutProps): default_2.JSX.Element;
   Route: (props: SubRoute) => null;
 };
 
@@ -27,7 +29,7 @@ export type DevToolsLayoutProps = {
 };
 
 // @public (undocumented)
-export const DevToolsPage: () => JSX.Element;
+export const DevToolsPage: () => JSX_2.Element;
 
 // @public (undocumented)
 export const devToolsPlugin: BackstagePlugin<
@@ -39,10 +41,10 @@ export const devToolsPlugin: BackstagePlugin<
 >;
 
 // @public (undocumented)
-export const ExternalDependenciesContent: () => JSX.Element;
+export const ExternalDependenciesContent: () => React_2.JSX.Element;
 
 // @public (undocumented)
-export const InfoContent: () => JSX.Element;
+export const InfoContent: () => React_2.JSX.Element;
 
 // @public (undocumented)
 export type SubRoute = {
diff --git a/plugins/devtools/catalog-info.yaml b/plugins/devtools/catalog-info.yaml
new file mode 100644
index 0000000000..59bcd82497
--- /dev/null
+++ b/plugins/devtools/catalog-info.yaml
@@ -0,0 +1,9 @@
+apiVersion: backstage.io/v1alpha1
+kind: Component
+metadata:
+  name: backstage-plugin-devtools
+  title: '@backstage/plugin-devtools'
+spec:
+  lifecycle: experimental
+  type: backstage-frontend-plugin
+  owner: awanlin
diff --git a/plugins/devtools/package.json b/plugins/devtools/package.json
index a791233f17..4cb9b95f0b 100644
--- a/plugins/devtools/package.json
+++ b/plugins/devtools/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-devtools",
-  "version": "0.1.3-next.1",
+  "version": "0.1.4-next.2",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
@@ -18,6 +18,7 @@
     "url": "https://github.com/backstage/backstage",
     "directory": "plugins/devtools"
   },
+  "sideEffects": false,
   "scripts": {
     "start": "backstage-cli package start",
     "build": "backstage-cli package build",
@@ -55,7 +56,6 @@
     "@testing-library/jest-dom": "^5.10.1",
     "@testing-library/react": "^12.1.3",
     "@testing-library/user-event": "^14.0.0",
-    "@types/node": "*",
     "cross-fetch": "^3.1.5",
     "msw": "^1.0.0"
   },
diff --git a/plugins/devtools/src/components/Content/InfoContent/InfoContent.tsx b/plugins/devtools/src/components/Content/InfoContent/InfoContent.tsx
index 7a0ebb3e06..0ed43d2fee 100644
--- a/plugins/devtools/src/components/Content/InfoContent/InfoContent.tsx
+++ b/plugins/devtools/src/components/Content/InfoContent/InfoContent.tsx
@@ -33,6 +33,7 @@ import React from 'react';
 import { useInfo } from '../../../hooks';
 import { InfoDependenciesTable } from './InfoDependenciesTable';
 import DescriptionIcon from '@material-ui/icons/Description';
+import MemoryIcon from '@material-ui/icons/Memory';
 import DeveloperBoardIcon from '@material-ui/icons/DeveloperBoard';
 import { BackstageLogoIcon } from './BackstageLogoIcon';
 import FileCopyIcon from '@material-ui/icons/FileCopy';
@@ -57,7 +58,7 @@ const useStyles = makeStyles((theme: Theme) =>
 
 const copyToClipboard = ({ about }: { about: DevToolsInfo | undefined }) => {
   if (about) {
-    let formatted = `OS: ${about.operatingSystem}\nnode: ${about.nodeJsVersion}\nbackstage: ${about.backstageVersion}\nDependencies:\n`;
+    let formatted = `OS: ${about.operatingSystem}\nResources: ${about.resourceUtilization}\nnode: ${about.nodeJsVersion}\nbackstage: ${about.backstageVersion}\nDependencies:\n`;
     const deps = about.dependencies;
     for (const key in deps) {
       if (Object.prototype.hasOwnProperty.call(deps, key)) {
@@ -93,6 +94,17 @@ export const InfoContent = () => {
               secondary={about?.operatingSystem}
             />
           </ListItem>
+          <ListItem>
+            <ListItemAvatar>
+              <Avatar>
+                <MemoryIcon />
+              </Avatar>
+            </ListItemAvatar>
+            <ListItemText
+              primary="Resource utilization"
+              secondary={about?.resourceUtilization}
+            />
+          </ListItem>
           <ListItem>
             <ListItemAvatar>
               <Avatar>
diff --git a/plugins/dynatrace/CHANGELOG.md b/plugins/dynatrace/CHANGELOG.md
index 6cd8f6b0c4..6d5aa819ee 100644
--- a/plugins/dynatrace/CHANGELOG.md
+++ b/plugins/dynatrace/CHANGELOG.md
@@ -1,5 +1,59 @@
 # @backstage/plugin-dynatrace
 
+## 7.0.4-next.2
+
+### Patch Changes
+
+- 8cec7664e146: Removed `@types/node` dependency
+- Updated dependencies
+  - @backstage/core-components@0.13.5-next.2
+  - @backstage/core-plugin-api@1.6.0-next.2
+  - @backstage/plugin-catalog-react@1.8.4-next.2
+  - @backstage/catalog-model@1.4.2-next.1
+  - @backstage/theme@0.4.1
+
+## 7.0.4-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.8.4-next.1
+  - @backstage/core-components@0.13.5-next.1
+  - @backstage/catalog-model@1.4.2-next.0
+  - @backstage/core-plugin-api@1.6.0-next.1
+  - @backstage/theme@0.4.1
+
+## 7.0.3-next.0
+
+### Patch Changes
+
+- 482bb5c0bbf8: Moved `@types/react` to be a regular dependency
+- Updated dependencies
+  - @backstage/core-plugin-api@1.6.0-next.0
+  - @backstage/core-components@0.13.5-next.0
+  - @backstage/catalog-model@1.4.1
+  - @backstage/theme@0.4.1
+  - @backstage/plugin-catalog-react@1.8.3-next.0
+
+## 7.0.1
+
+### Patch Changes
+
+- 12a8c94eda8d: Add package repository and homepage metadata
+- Updated dependencies
+  - @backstage/core-components@0.13.4
+  - @backstage/plugin-catalog-react@1.8.1
+  - @backstage/core-plugin-api@1.5.3
+  - @backstage/catalog-model@1.4.1
+  - @backstage/theme@0.4.1
+
+## 7.0.1-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.8.1-next.1
+
 ## 7.0.1-next.1
 
 ### Patch Changes
diff --git a/plugins/dynatrace/api-report.md b/plugins/dynatrace/api-report.md
index 1dded736ad..0f25fc3108 100644
--- a/plugins/dynatrace/api-report.md
+++ b/plugins/dynatrace/api-report.md
@@ -7,12 +7,13 @@
 
 import { BackstagePlugin } from '@backstage/core-plugin-api';
 import { Entity } from '@backstage/catalog-model';
+import { JSX as JSX_2 } from 'react';
 
 // @public
 export const dynatracePlugin: BackstagePlugin<{}, {}, {}>;
 
 // @public
-export const DynatraceTab: () => JSX.Element;
+export const DynatraceTab: () => JSX_2.Element;
 
 // @public
 export const isDynatraceAvailable: (entity: Entity) => boolean;
diff --git a/plugins/dynatrace/catalog-info.yaml b/plugins/dynatrace/catalog-info.yaml
new file mode 100644
index 0000000000..3dc14c96ff
--- /dev/null
+++ b/plugins/dynatrace/catalog-info.yaml
@@ -0,0 +1,9 @@
+apiVersion: backstage.io/v1alpha1
+kind: Component
+metadata:
+  name: backstage-plugin-dynatrace
+  title: '@backstage/plugin-dynatrace'
+spec:
+  lifecycle: experimental
+  type: backstage-frontend-plugin
+  owner: maintainers
diff --git a/plugins/dynatrace/package.json b/plugins/dynatrace/package.json
index c0a855aa26..e565870482 100644
--- a/plugins/dynatrace/package.json
+++ b/plugins/dynatrace/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-dynatrace",
-  "version": "7.0.1-next.1",
+  "version": "7.0.4-next.2",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
@@ -18,6 +18,7 @@
     "url": "https://github.com/backstage/backstage",
     "directory": "plugins/dynatrace"
   },
+  "sideEffects": false,
   "scripts": {
     "start": "backstage-cli package start",
     "build": "backstage-cli package build",
@@ -35,6 +36,7 @@
     "@material-ui/core": "^4.12.2",
     "@material-ui/icons": "^4.9.1",
     "@material-ui/lab": "4.0.0-alpha.61",
+    "@types/react": "^16.13.1 || ^17.0.0",
     "react-use": "^17.2.4"
   },
   "peerDependencies": {
@@ -52,8 +54,6 @@
     "@testing-library/jest-dom": "^5.10.1",
     "@testing-library/react": "^12.1.3",
     "@testing-library/user-event": "^14.0.0",
-    "@types/node": "*",
-    "@types/react": "^16.13.1 || ^17.0.0",
     "express": "^4.18.1",
     "msw": "^1.0.0"
   },
diff --git a/plugins/entity-feedback-backend/CHANGELOG.md b/plugins/entity-feedback-backend/CHANGELOG.md
index c0cd2d8c81..96ecb37900 100644
--- a/plugins/entity-feedback-backend/CHANGELOG.md
+++ b/plugins/entity-feedback-backend/CHANGELOG.md
@@ -1,5 +1,68 @@
 # @backstage/plugin-entity-feedback-backend
 
+## 0.1.9-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config@1.1.0-next.1
+  - @backstage/backend-common@0.19.5-next.2
+  - @backstage/plugin-auth-node@0.3.0-next.2
+  - @backstage/backend-plugin-api@0.6.3-next.2
+  - @backstage/catalog-model@1.4.2-next.1
+  - @backstage/catalog-client@1.4.4-next.1
+  - @backstage/plugin-entity-feedback-common@0.1.2
+
+## 0.1.9-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config@1.1.0-next.0
+  - @backstage/backend-common@0.19.5-next.1
+  - @backstage/backend-plugin-api@0.6.3-next.1
+  - @backstage/catalog-model@1.4.2-next.0
+  - @backstage/plugin-auth-node@0.3.0-next.1
+  - @backstage/catalog-client@1.4.4-next.0
+  - @backstage/plugin-entity-feedback-common@0.1.2
+
+## 0.1.8-next.0
+
+### Patch Changes
+
+- 740155e8e976: Improve backend logging if method calls fail
+- Updated dependencies
+  - @backstage/plugin-auth-node@0.3.0-next.0
+  - @backstage/backend-common@0.19.4-next.0
+  - @backstage/backend-plugin-api@0.6.2-next.0
+  - @backstage/catalog-client@1.4.3
+  - @backstage/catalog-model@1.4.1
+  - @backstage/config@1.0.8
+  - @backstage/plugin-entity-feedback-common@0.1.2
+
+## 0.1.6
+
+### Patch Changes
+
+- 12a8c94eda8d: Add package repository and homepage metadata
+- Updated dependencies
+  - @backstage/backend-common@0.19.2
+  - @backstage/backend-plugin-api@0.6.0
+  - @backstage/plugin-entity-feedback-common@0.1.2
+  - @backstage/plugin-auth-node@0.2.17
+  - @backstage/catalog-client@1.4.3
+  - @backstage/catalog-model@1.4.1
+  - @backstage/config@1.0.8
+
+## 0.1.6-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@0.6.0-next.2
+  - @backstage/backend-common@0.19.2-next.2
+  - @backstage/plugin-auth-node@0.2.17-next.2
+
 ## 0.1.6-next.1
 
 ### Patch Changes
diff --git a/plugins/entity-feedback-backend/README.md b/plugins/entity-feedback-backend/README.md
index 99489e28b2..49a8ce20e0 100644
--- a/plugins/entity-feedback-backend/README.md
+++ b/plugins/entity-feedback-backend/README.md
@@ -4,6 +4,10 @@ Welcome to the entity-feedback backend plugin!
 
 ## Installation
 
+Note: this plugin requires authentication and identity configured so Backstage can identify
+which user has rated the entity. If you are using the guest identity provider which comes
+out of the box, this plugin will not work when you test it.
+
 ### Install the package
 
 ```bash
diff --git a/plugins/entity-feedback-backend/api-report.md b/plugins/entity-feedback-backend/api-report.md
index 3e8f90220e..1ec466e256 100644
--- a/plugins/entity-feedback-backend/api-report.md
+++ b/plugins/entity-feedback-backend/api-report.md
@@ -14,7 +14,8 @@ import { PluginEndpointDiscovery } from '@backstage/backend-common';
 export function createRouter(options: RouterOptions): Promise<express.Router>;
 
 // @public
-export const entityFeedbackPlugin: () => BackendFeature;
+const entityFeedbackPlugin: () => BackendFeature;
+export default entityFeedbackPlugin;
 
 // @public (undocumented)
 export interface RouterOptions {
diff --git a/plugins/entity-feedback-backend/catalog-info.yaml b/plugins/entity-feedback-backend/catalog-info.yaml
new file mode 100644
index 0000000000..4973f67edc
--- /dev/null
+++ b/plugins/entity-feedback-backend/catalog-info.yaml
@@ -0,0 +1,9 @@
+apiVersion: backstage.io/v1alpha1
+kind: Component
+metadata:
+  name: backstage-plugin-entity-feedback-backend
+  title: '@backstage/plugin-entity-feedback-backend'
+spec:
+  lifecycle: experimental
+  type: backstage-backend-plugin
+  owner: kuangp
diff --git a/plugins/entity-feedback-backend/package.json b/plugins/entity-feedback-backend/package.json
index 91cc97a65c..6c94fa4845 100644
--- a/plugins/entity-feedback-backend/package.json
+++ b/plugins/entity-feedback-backend/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-entity-feedback-backend",
-  "version": "0.1.6-next.1",
+  "version": "0.1.9-next.2",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
diff --git a/plugins/entity-feedback-backend/src/index.ts b/plugins/entity-feedback-backend/src/index.ts
index 74e545de04..47215ebd7a 100644
--- a/plugins/entity-feedback-backend/src/index.ts
+++ b/plugins/entity-feedback-backend/src/index.ts
@@ -20,4 +20,4 @@
  * @packageDocumentation
  */
 export * from './service/router';
-export { entityFeedbackPlugin } from './plugin';
+export { entityFeedbackPlugin as default } from './plugin';
diff --git a/plugins/entity-feedback-backend/src/service/router.ts b/plugins/entity-feedback-backend/src/service/router.ts
index ea759c1639..4953c531b8 100644
--- a/plugins/entity-feedback-backend/src/service/router.ts
+++ b/plugins/entity-feedback-backend/src/service/router.ts
@@ -134,6 +134,9 @@ export async function createRouter(
     const user = await identity.getIdentity({ request: req });
     const rating = req.body.rating;
     if (!user || !rating) {
+      logger.warn(
+        `Can't save rating because there is not enough info: user=${user}, rating=${rating}`,
+      );
       res.status(400).end();
       return;
     }
@@ -188,6 +191,7 @@ export async function createRouter(
     const { response, comments, consent } = req.body;
 
     if (!user) {
+      logger.warn(`Could not identify user to save responses, user=${user}`);
       res.status(400).end();
       return;
     }
diff --git a/plugins/entity-feedback-common/CHANGELOG.md b/plugins/entity-feedback-common/CHANGELOG.md
index dd93a7ee36..1b1bee0c2a 100644
--- a/plugins/entity-feedback-common/CHANGELOG.md
+++ b/plugins/entity-feedback-common/CHANGELOG.md
@@ -1,5 +1,11 @@
 # @backstage/plugin-entity-feedback-common
 
+## 0.1.2
+
+### Patch Changes
+
+- 12a8c94eda8d: Add package repository and homepage metadata
+
 ## 0.1.2-next.0
 
 ### Patch Changes
diff --git a/plugins/entity-feedback-common/catalog-info.yaml b/plugins/entity-feedback-common/catalog-info.yaml
new file mode 100644
index 0000000000..01035f68fd
--- /dev/null
+++ b/plugins/entity-feedback-common/catalog-info.yaml
@@ -0,0 +1,10 @@
+apiVersion: backstage.io/v1alpha1
+kind: Component
+metadata:
+  name: backstage-plugin-entity-feedback-common
+  title: '@backstage/plugin-entity-feedback-common'
+  description: Common functionalities for the entity-feedback plugin
+spec:
+  lifecycle: experimental
+  type: backstage-common-library
+  owner: kuangp
diff --git a/plugins/entity-feedback-common/package.json b/plugins/entity-feedback-common/package.json
index 776e33e198..2518aec4fc 100644
--- a/plugins/entity-feedback-common/package.json
+++ b/plugins/entity-feedback-common/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@backstage/plugin-entity-feedback-common",
   "description": "Common functionalities for the entity-feedback plugin",
-  "version": "0.1.2-next.0",
+  "version": "0.1.2",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
@@ -20,6 +20,7 @@
     "url": "https://github.com/backstage/backstage",
     "directory": "plugins/entity-feedback-common"
   },
+  "sideEffects": false,
   "scripts": {
     "build": "backstage-cli package build",
     "lint": "backstage-cli package lint",
diff --git a/plugins/entity-feedback/CHANGELOG.md b/plugins/entity-feedback/CHANGELOG.md
index 8429cdb56b..326d0b2d15 100644
--- a/plugins/entity-feedback/CHANGELOG.md
+++ b/plugins/entity-feedback/CHANGELOG.md
@@ -1,5 +1,67 @@
 # @backstage/plugin-entity-feedback
 
+## 0.2.7-next.2
+
+### Patch Changes
+
+- 8cec7664e146: Removed `@types/node` dependency
+- Updated dependencies
+  - @backstage/core-components@0.13.5-next.2
+  - @backstage/core-plugin-api@1.6.0-next.2
+  - @backstage/plugin-catalog-react@1.8.4-next.2
+  - @backstage/catalog-model@1.4.2-next.1
+  - @backstage/errors@1.2.1
+  - @backstage/theme@0.4.1
+  - @backstage/plugin-entity-feedback-common@0.1.2
+
+## 0.2.7-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.8.4-next.1
+  - @backstage/core-components@0.13.5-next.1
+  - @backstage/catalog-model@1.4.2-next.0
+  - @backstage/core-plugin-api@1.6.0-next.1
+  - @backstage/errors@1.2.1
+  - @backstage/theme@0.4.1
+  - @backstage/plugin-entity-feedback-common@0.1.2
+
+## 0.2.6-next.0
+
+### Patch Changes
+
+- 5e2e06db747a: Improve README to note that Backstage identity is required to be configured
+- Updated dependencies
+  - @backstage/core-plugin-api@1.6.0-next.0
+  - @backstage/core-components@0.13.5-next.0
+  - @backstage/catalog-model@1.4.1
+  - @backstage/errors@1.2.1
+  - @backstage/theme@0.4.1
+  - @backstage/plugin-catalog-react@1.8.3-next.0
+  - @backstage/plugin-entity-feedback-common@0.1.2
+
+## 0.2.4
+
+### Patch Changes
+
+- 12a8c94eda8d: Add package repository and homepage metadata
+- Updated dependencies
+  - @backstage/plugin-entity-feedback-common@0.1.2
+  - @backstage/core-components@0.13.4
+  - @backstage/plugin-catalog-react@1.8.1
+  - @backstage/core-plugin-api@1.5.3
+  - @backstage/catalog-model@1.4.1
+  - @backstage/errors@1.2.1
+  - @backstage/theme@0.4.1
+
+## 0.2.4-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.8.1-next.1
+
 ## 0.2.4-next.1
 
 ### Patch Changes
diff --git a/plugins/entity-feedback/README.md b/plugins/entity-feedback/README.md
index fdfa4761d6..c405bd4083 100644
--- a/plugins/entity-feedback/README.md
+++ b/plugins/entity-feedback/README.md
@@ -36,7 +36,11 @@ This plugin allows you give and view feedback on entities available in the Backs
 
 ## Setup
 
-The following sections will help you get the Entity Feedback plugin setup and running
+The following sections will help you get the Entity Feedback plugin setup and running.
+
+Note: this plugin requires authentication and identity configured so Backstage can identify
+which user has rated the entity. If you are using the guest identity provider which comes
+out of the box, this plugin will not work when you test it.
 
 ### Backend
 
@@ -133,4 +137,4 @@ const groupPage = (
 );
 ```
 
-Note: For a full example of this you can look at [this EntityPage](../../packages/app/src/components/catalog/EntityPage.tsx)
+Note: For a full example of this you can look at [this EntityPage](../../packages/app/src/components/catalog/EntityPage.tsx).
diff --git a/plugins/entity-feedback/api-report.md b/plugins/entity-feedback/api-report.md
index 696536aef4..d61394ab9a 100644
--- a/plugins/entity-feedback/api-report.md
+++ b/plugins/entity-feedback/api-report.md
@@ -3,8 +3,6 @@
 > Do not edit this file. It is a report generated by [API Extractor](https://api-extractor.com/).
 
 ```ts
-/// <reference types="react" />
-
 import { ApiRef } from '@backstage/core-plugin-api';
 import { BackstagePlugin } from '@backstage/core-plugin-api';
 import { DiscoveryApi } from '@backstage/core-plugin-api';
@@ -14,6 +12,7 @@ import { FeedbackResponse } from '@backstage/plugin-entity-feedback-common';
 import { FetchApi } from '@backstage/core-plugin-api';
 import { Rating } from '@backstage/plugin-entity-feedback-common';
 import { Ratings } from '@backstage/plugin-entity-feedback-common';
+import { default as React_2 } from 'react';
 import { ReactNode } from 'react';
 import { RouteRef } from '@backstage/core-plugin-api';
 
@@ -84,18 +83,18 @@ export interface EntityFeedbackResponse {
 }
 
 // @public (undocumented)
-export const EntityFeedbackResponseContent: () => JSX.Element;
+export const EntityFeedbackResponseContent: () => React_2.JSX.Element;
 
 // @public (undocumented)
-export const EntityLikeDislikeRatingsCard: () => JSX.Element;
+export const EntityLikeDislikeRatingsCard: () => React_2.JSX.Element;
 
 // @public (undocumented)
-export const EntityStarredRatingsCard: () => JSX.Element;
+export const EntityStarredRatingsCard: () => React_2.JSX.Element;
 
 // @public (undocumented)
 export const FeedbackResponseDialog: (
   props: FeedbackResponseDialogProps,
-) => JSX.Element;
+) => React_2.JSX.Element;
 
 // @public (undocumented)
 export interface FeedbackResponseDialogProps {
@@ -114,7 +113,7 @@ export interface FeedbackResponseDialogProps {
 // @public (undocumented)
 export const FeedbackResponseTable: (
   props: FeedbackResponseTableProps,
-) => JSX.Element;
+) => React_2.JSX.Element;
 
 // @public (undocumented)
 export interface FeedbackResponseTableProps {
@@ -127,7 +126,7 @@ export interface FeedbackResponseTableProps {
 // @public (undocumented)
 export const LikeDislikeButtons: (
   props: LikeDislikeButtonsProps,
-) => JSX.Element;
+) => React_2.JSX.Element;
 
 // @public (undocumented)
 export interface LikeDislikeButtonsProps {
@@ -142,7 +141,7 @@ export interface LikeDislikeButtonsProps {
 // @public (undocumented)
 export const LikeDislikeRatingsTable: (
   props: LikeDislikeRatingsTableProps,
-) => JSX.Element;
+) => React_2.JSX.Element;
 
 // @public (undocumented)
 export interface LikeDislikeRatingsTableProps {
@@ -157,7 +156,7 @@ export interface LikeDislikeRatingsTableProps {
 // @public (undocumented)
 export const StarredRatingButtons: (
   props: StarredRatingButtonsProps,
-) => JSX.Element;
+) => React_2.JSX.Element;
 
 // @public (undocumented)
 export interface StarredRatingButtonsProps {
@@ -174,7 +173,7 @@ export interface StarredRatingButtonsProps {
 // @public (undocumented)
 export const StarredRatingsTable: (
   props: StarredRatingsTableProps,
-) => JSX.Element;
+) => React_2.JSX.Element;
 
 // @public (undocumented)
 export interface StarredRatingsTableProps {
diff --git a/plugins/entity-feedback/catalog-info.yaml b/plugins/entity-feedback/catalog-info.yaml
new file mode 100644
index 0000000000..57961ad954
--- /dev/null
+++ b/plugins/entity-feedback/catalog-info.yaml
@@ -0,0 +1,9 @@
+apiVersion: backstage.io/v1alpha1
+kind: Component
+metadata:
+  name: backstage-plugin-entity-feedback
+  title: '@backstage/plugin-entity-feedback'
+spec:
+  lifecycle: experimental
+  type: backstage-frontend-plugin
+  owner: kuangp
diff --git a/plugins/entity-feedback/package.json b/plugins/entity-feedback/package.json
index 2736a3a1e2..de58ce46fb 100644
--- a/plugins/entity-feedback/package.json
+++ b/plugins/entity-feedback/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-entity-feedback",
-  "version": "0.2.4-next.1",
+  "version": "0.2.7-next.2",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
@@ -18,6 +18,7 @@
     "url": "https://github.com/backstage/backstage",
     "directory": "plugins/entity-feedback"
   },
+  "sideEffects": false,
   "scripts": {
     "start": "backstage-cli package start",
     "build": "backstage-cli package build",
@@ -56,7 +57,6 @@
     "@testing-library/react": "^12.1.3",
     "@testing-library/react-hooks": "^8.0.1",
     "@testing-library/user-event": "^14.0.0",
-    "@types/node": "*",
     "msw": "^1.0.0"
   },
   "files": [
diff --git a/plugins/entity-validation/CHANGELOG.md b/plugins/entity-validation/CHANGELOG.md
index beaf7524d2..c43bf82216 100644
--- a/plugins/entity-validation/CHANGELOG.md
+++ b/plugins/entity-validation/CHANGELOG.md
@@ -1,5 +1,71 @@
 # @backstage/plugin-entity-validation
 
+## 0.1.9-next.2
+
+### Patch Changes
+
+- 8cec7664e146: Removed `@types/node` dependency
+- Updated dependencies
+  - @backstage/core-components@0.13.5-next.2
+  - @backstage/core-plugin-api@1.6.0-next.2
+  - @backstage/plugin-catalog-react@1.8.4-next.2
+  - @backstage/catalog-model@1.4.2-next.1
+  - @backstage/catalog-client@1.4.4-next.1
+  - @backstage/errors@1.2.1
+  - @backstage/theme@0.4.1
+  - @backstage/plugin-catalog-common@1.0.16-next.1
+
+## 0.1.9-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.8.4-next.1
+  - @backstage/core-components@0.13.5-next.1
+  - @backstage/catalog-model@1.4.2-next.0
+  - @backstage/core-plugin-api@1.6.0-next.1
+  - @backstage/catalog-client@1.4.4-next.0
+  - @backstage/plugin-catalog-common@1.0.16-next.0
+  - @backstage/errors@1.2.1
+  - @backstage/theme@0.4.1
+
+## 0.1.8-next.0
+
+### Patch Changes
+
+- 482bb5c0bbf8: Moved `@types/react` to be a regular dependency
+- Updated dependencies
+  - @backstage/core-plugin-api@1.6.0-next.0
+  - @backstage/core-components@0.13.5-next.0
+  - @backstage/catalog-client@1.4.3
+  - @backstage/catalog-model@1.4.1
+  - @backstage/errors@1.2.1
+  - @backstage/theme@0.4.1
+  - @backstage/plugin-catalog-common@1.0.15
+  - @backstage/plugin-catalog-react@1.8.3-next.0
+
+## 0.1.6
+
+### Patch Changes
+
+- 12a8c94eda8d: Add package repository and homepage metadata
+- Updated dependencies
+  - @backstage/core-components@0.13.4
+  - @backstage/plugin-catalog-react@1.8.1
+  - @backstage/core-plugin-api@1.5.3
+  - @backstage/catalog-client@1.4.3
+  - @backstage/catalog-model@1.4.1
+  - @backstage/errors@1.2.1
+  - @backstage/theme@0.4.1
+  - @backstage/plugin-catalog-common@1.0.15
+
+## 0.1.6-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.8.1-next.1
+
 ## 0.1.6-next.1
 
 ### Patch Changes
diff --git a/plugins/entity-validation/api-report.md b/plugins/entity-validation/api-report.md
index 2fccbf9471..48b309cfaa 100644
--- a/plugins/entity-validation/api-report.md
+++ b/plugins/entity-validation/api-report.md
@@ -6,13 +6,14 @@
 /// <reference types="react" />
 
 import { BackstagePlugin } from '@backstage/core-plugin-api';
+import { JSX as JSX_2 } from 'react';
 import { RouteRef } from '@backstage/core-plugin-api';
 
 // @public (undocumented)
 export const EntityValidationPage: (props: {
   defaultYaml?: string | undefined;
   defaultLocation?: string | undefined;
-}) => JSX.Element;
+}) => JSX_2.Element;
 
 // @public (undocumented)
 export const entityValidationPlugin: BackstagePlugin<
diff --git a/plugins/entity-validation/catalog-info.yaml b/plugins/entity-validation/catalog-info.yaml
new file mode 100644
index 0000000000..d78b0296f3
--- /dev/null
+++ b/plugins/entity-validation/catalog-info.yaml
@@ -0,0 +1,9 @@
+apiVersion: backstage.io/v1alpha1
+kind: Component
+metadata:
+  name: backstage-plugin-entity-validation
+  title: '@backstage/plugin-entity-validation'
+spec:
+  lifecycle: experimental
+  type: backstage-frontend-plugin
+  owner: maintainers
diff --git a/plugins/entity-validation/package.json b/plugins/entity-validation/package.json
index 5b85f1f199..9a22d88853 100644
--- a/plugins/entity-validation/package.json
+++ b/plugins/entity-validation/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-entity-validation",
-  "version": "0.1.6-next.1",
+  "version": "0.1.9-next.2",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
@@ -18,6 +18,7 @@
     "url": "https://github.com/backstage/backstage",
     "directory": "plugins/entity-validation"
   },
+  "sideEffects": false,
   "scripts": {
     "start": "backstage-cli package start",
     "build": "backstage-cli package build",
@@ -43,6 +44,7 @@
     "@material-ui/icons": "^4.9.1",
     "@material-ui/lab": "4.0.0-alpha.61",
     "@react-hookz/web": "^20.0.0",
+    "@types/react": "^16.13.1 || ^17.0.0",
     "@uiw/react-codemirror": "^4.9.3",
     "lodash": "^4.17.21",
     "react-use": "^17.2.4",
@@ -62,8 +64,6 @@
     "@testing-library/jest-dom": "^5.10.1",
     "@testing-library/react": "^12.1.3",
     "@testing-library/user-event": "^14.0.0",
-    "@types/node": "*",
-    "@types/react": "^16.13.1 || ^17.0.0",
     "msw": "^1.0.0"
   },
   "files": [
diff --git a/plugins/events-backend-module-aws-sqs/CHANGELOG.md b/plugins/events-backend-module-aws-sqs/CHANGELOG.md
index ab4643de53..4c4532ad69 100644
--- a/plugins/events-backend-module-aws-sqs/CHANGELOG.md
+++ b/plugins/events-backend-module-aws-sqs/CHANGELOG.md
@@ -1,5 +1,66 @@
 # @backstage/plugin-events-backend-module-aws-sqs
 
+## 0.2.6-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config@1.1.0-next.1
+  - @backstage/backend-tasks@0.5.8-next.2
+  - @backstage/backend-common@0.19.5-next.2
+  - @backstage/backend-plugin-api@0.6.3-next.2
+  - @backstage/types@1.1.0
+  - @backstage/plugin-events-node@0.2.12-next.2
+
+## 0.2.6-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config@1.1.0-next.0
+  - @backstage/backend-tasks@0.5.8-next.1
+  - @backstage/backend-common@0.19.5-next.1
+  - @backstage/backend-plugin-api@0.6.3-next.1
+  - @backstage/plugin-events-node@0.2.12-next.1
+  - @backstage/types@1.1.0
+
+## 0.2.5-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.19.4-next.0
+  - @backstage/backend-tasks@0.5.7-next.0
+  - @backstage/backend-plugin-api@0.6.2-next.0
+  - @backstage/config@1.0.8
+  - @backstage/types@1.1.0
+  - @backstage/plugin-events-node@0.2.11-next.0
+
+## 0.2.3
+
+### Patch Changes
+
+- 629cbd194a87: Use `coreServices.rootConfig` instead of `coreService.config`
+- 12a8c94eda8d: Add package repository and homepage metadata
+- 4b82382ed8c2: Fixed invalid configuration schema. The configuration schema may be more strict as a result.
+- Updated dependencies
+  - @backstage/backend-common@0.19.2
+  - @backstage/backend-plugin-api@0.6.0
+  - @backstage/plugin-events-node@0.2.9
+  - @backstage/backend-tasks@0.5.5
+  - @backstage/config@1.0.8
+  - @backstage/types@1.1.0
+
+## 0.2.3-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@0.6.0-next.2
+  - @backstage/backend-tasks@0.5.5-next.2
+  - @backstage/backend-common@0.19.2-next.2
+  - @backstage/plugin-events-node@0.2.9-next.2
+
 ## 0.2.3-next.1
 
 ### Patch Changes
diff --git a/plugins/events-backend-module-aws-sqs/alpha-api-report.md b/plugins/events-backend-module-aws-sqs/alpha-api-report.md
index e48515a414..4faed2a162 100644
--- a/plugins/events-backend-module-aws-sqs/alpha-api-report.md
+++ b/plugins/events-backend-module-aws-sqs/alpha-api-report.md
@@ -6,7 +6,8 @@
 import { BackendFeature } from '@backstage/backend-plugin-api';
 
 // @alpha
-export const eventsModuleAwsSqsConsumingEventPublisher: () => BackendFeature;
+const eventsModuleAwsSqsConsumingEventPublisher: () => BackendFeature;
+export default eventsModuleAwsSqsConsumingEventPublisher;
 
 // (No @packageDocumentation comment for this package)
 ```
diff --git a/plugins/events-backend-module-aws-sqs/catalog-info.yaml b/plugins/events-backend-module-aws-sqs/catalog-info.yaml
new file mode 100644
index 0000000000..bf37805728
--- /dev/null
+++ b/plugins/events-backend-module-aws-sqs/catalog-info.yaml
@@ -0,0 +1,9 @@
+apiVersion: backstage.io/v1alpha1
+kind: Component
+metadata:
+  name: backstage-plugin-events-backend-module-aws-sqs
+  title: '@backstage/plugin-events-backend-module-aws-sqs'
+spec:
+  lifecycle: experimental
+  type: backstage-backend-plugin-module
+  owner: pjungermann
diff --git a/plugins/events-backend-module-aws-sqs/package.json b/plugins/events-backend-module-aws-sqs/package.json
index 0e0e1e65e4..9794f37acb 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.2.3-next.1",
+  "version": "0.2.6-next.2",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
diff --git a/plugins/events-backend-module-aws-sqs/src/alpha.ts b/plugins/events-backend-module-aws-sqs/src/alpha.ts
index 4f3ae09c42..3107411645 100644
--- a/plugins/events-backend-module-aws-sqs/src/alpha.ts
+++ b/plugins/events-backend-module-aws-sqs/src/alpha.ts
@@ -14,4 +14,4 @@
  * limitations under the License.
  */
 
-export { eventsModuleAwsSqsConsumingEventPublisher } from './service/eventsModuleAwsSqsConsumingEventPublisher';
+export { eventsModuleAwsSqsConsumingEventPublisher as default } from './service/eventsModuleAwsSqsConsumingEventPublisher';
diff --git a/plugins/events-backend-module-aws-sqs/src/service/eventsModuleAwsSqsConsumingEventPublisher.test.ts b/plugins/events-backend-module-aws-sqs/src/service/eventsModuleAwsSqsConsumingEventPublisher.test.ts
index 849ad733de..57e1831667 100644
--- a/plugins/events-backend-module-aws-sqs/src/service/eventsModuleAwsSqsConsumingEventPublisher.test.ts
+++ b/plugins/events-backend-module-aws-sqs/src/service/eventsModuleAwsSqsConsumingEventPublisher.test.ts
@@ -14,10 +14,7 @@
  * limitations under the License.
  */
 
-import { getVoidLogger } from '@backstage/backend-common';
-import { coreServices } from '@backstage/backend-plugin-api';
-import { startTestBackend } from '@backstage/backend-test-utils';
-import { ConfigReader } from '@backstage/config';
+import { mockServices, startTestBackend } from '@backstage/backend-test-utils';
 import { eventsExtensionPoint } from '@backstage/plugin-events-node/alpha';
 import { TestEventBroker } from '@backstage/plugin-events-backend-test-utils';
 import { eventsModuleAwsSqsConsumingEventPublisher } from './eventsModuleAwsSqsConsumingEventPublisher';
@@ -25,31 +22,6 @@ import { AwsSqsConsumingEventPublisher } from '../publisher/AwsSqsConsumingEvent
 
 describe('eventsModuleAwsSqsConsumingEventPublisher', () => {
   it('should be correctly wired and set up', async () => {
-    const config = new ConfigReader({
-      events: {
-        modules: {
-          awsSqs: {
-            awsSqsConsumingEventPublisher: {
-              topics: {
-                fake1: {
-                  queue: {
-                    region: 'eu-west-1',
-                    url: 'https://fake1.queue.url',
-                  },
-                },
-                fake2: {
-                  queue: {
-                    region: 'us-east-1',
-                    url: 'https://fake2.queue.url',
-                  },
-                },
-              },
-            },
-          },
-        },
-      },
-    });
-
     let addedPublishers: AwsSqsConsumingEventPublisher[] | undefined;
     const extensionPoint = {
       addPublishers: (publishers: any) => {
@@ -57,18 +29,40 @@ describe('eventsModuleAwsSqsConsumingEventPublisher', () => {
       },
     };
 
-    const scheduler = {
-      scheduleTask: jest.fn(),
-    };
+    const scheduler = mockServices.scheduler.mock();
 
     await startTestBackend({
       extensionPoints: [[eventsExtensionPoint, extensionPoint]],
-      services: [
-        [coreServices.rootConfig, config],
-        [coreServices.logger, getVoidLogger()],
-        [coreServices.scheduler, scheduler],
+      features: [
+        eventsModuleAwsSqsConsumingEventPublisher(),
+        mockServices.rootConfig.factory({
+          data: {
+            events: {
+              modules: {
+                awsSqs: {
+                  awsSqsConsumingEventPublisher: {
+                    topics: {
+                      fake1: {
+                        queue: {
+                          region: 'eu-west-1',
+                          url: 'https://fake1.queue.url',
+                        },
+                      },
+                      fake2: {
+                        queue: {
+                          region: 'us-east-1',
+                          url: 'https://fake2.queue.url',
+                        },
+                      },
+                    },
+                  },
+                },
+              },
+            },
+          },
+        }),
+        scheduler.factory,
       ],
-      features: [eventsModuleAwsSqsConsumingEventPublisher()],
     });
 
     expect(addedPublishers).not.toBeUndefined();
diff --git a/plugins/events-backend-module-azure/CHANGELOG.md b/plugins/events-backend-module-azure/CHANGELOG.md
index c4a72dfbdd..c853e287e3 100644
--- a/plugins/events-backend-module-azure/CHANGELOG.md
+++ b/plugins/events-backend-module-azure/CHANGELOG.md
@@ -1,5 +1,46 @@
 # @backstage/plugin-events-backend-module-azure
 
+## 0.1.13-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@0.6.3-next.2
+  - @backstage/plugin-events-node@0.2.12-next.2
+
+## 0.1.13-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@0.6.3-next.1
+  - @backstage/plugin-events-node@0.2.12-next.1
+
+## 0.1.12-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@0.6.2-next.0
+  - @backstage/plugin-events-node@0.2.11-next.0
+
+## 0.1.10
+
+### Patch Changes
+
+- 12a8c94eda8d: Add package repository and homepage metadata
+- Updated dependencies
+  - @backstage/backend-plugin-api@0.6.0
+  - @backstage/plugin-events-node@0.2.9
+
+## 0.1.10-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@0.6.0-next.2
+  - @backstage/plugin-events-node@0.2.9-next.2
+
 ## 0.1.10-next.1
 
 ### Patch Changes
diff --git a/plugins/events-backend-module-azure/catalog-info.yaml b/plugins/events-backend-module-azure/catalog-info.yaml
new file mode 100644
index 0000000000..e5627e7383
--- /dev/null
+++ b/plugins/events-backend-module-azure/catalog-info.yaml
@@ -0,0 +1,9 @@
+apiVersion: backstage.io/v1alpha1
+kind: Component
+metadata:
+  name: backstage-plugin-events-backend-module-azure
+  title: '@backstage/plugin-events-backend-module-azure'
+spec:
+  lifecycle: experimental
+  type: backstage-backend-plugin-module
+  owner: pjungermann
diff --git a/plugins/events-backend-module-azure/package.json b/plugins/events-backend-module-azure/package.json
index 568e3eda8f..36756a1cbe 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.10-next.1",
+  "version": "0.1.13-next.2",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
diff --git a/plugins/events-backend-module-azure/src/service/eventsModuleAzureDevOpsEventRouter.test.ts b/plugins/events-backend-module-azure/src/service/eventsModuleAzureDevOpsEventRouter.test.ts
index 1ff756a2d2..d67b5eb071 100644
--- a/plugins/events-backend-module-azure/src/service/eventsModuleAzureDevOpsEventRouter.test.ts
+++ b/plugins/events-backend-module-azure/src/service/eventsModuleAzureDevOpsEventRouter.test.ts
@@ -34,7 +34,6 @@ describe('eventsModuleAzureDevOpsEventRouter', () => {
 
     await startTestBackend({
       extensionPoints: [[eventsExtensionPoint, extensionPoint]],
-      services: [],
       features: [eventsModuleAzureDevOpsEventRouter()],
     });
 
diff --git a/plugins/events-backend-module-bitbucket-cloud/CHANGELOG.md b/plugins/events-backend-module-bitbucket-cloud/CHANGELOG.md
index a916666a22..26a93fb806 100644
--- a/plugins/events-backend-module-bitbucket-cloud/CHANGELOG.md
+++ b/plugins/events-backend-module-bitbucket-cloud/CHANGELOG.md
@@ -1,5 +1,46 @@
 # @backstage/plugin-events-backend-module-bitbucket-cloud
 
+## 0.1.13-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@0.6.3-next.2
+  - @backstage/plugin-events-node@0.2.12-next.2
+
+## 0.1.13-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@0.6.3-next.1
+  - @backstage/plugin-events-node@0.2.12-next.1
+
+## 0.1.12-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@0.6.2-next.0
+  - @backstage/plugin-events-node@0.2.11-next.0
+
+## 0.1.10
+
+### Patch Changes
+
+- 12a8c94eda8d: Add package repository and homepage metadata
+- Updated dependencies
+  - @backstage/backend-plugin-api@0.6.0
+  - @backstage/plugin-events-node@0.2.9
+
+## 0.1.10-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@0.6.0-next.2
+  - @backstage/plugin-events-node@0.2.9-next.2
+
 ## 0.1.10-next.1
 
 ### Patch Changes
diff --git a/plugins/events-backend-module-bitbucket-cloud/catalog-info.yaml b/plugins/events-backend-module-bitbucket-cloud/catalog-info.yaml
new file mode 100644
index 0000000000..1b73e0dab7
--- /dev/null
+++ b/plugins/events-backend-module-bitbucket-cloud/catalog-info.yaml
@@ -0,0 +1,9 @@
+apiVersion: backstage.io/v1alpha1
+kind: Component
+metadata:
+  name: backstage-plugin-events-backend-module-bitbucket-cloud
+  title: '@backstage/plugin-events-backend-module-bitbucket-cloud'
+spec:
+  lifecycle: experimental
+  type: backstage-backend-plugin-module
+  owner: pjungermann
diff --git a/plugins/events-backend-module-bitbucket-cloud/package.json b/plugins/events-backend-module-bitbucket-cloud/package.json
index 1ef814848d..1325a51359 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.10-next.1",
+  "version": "0.1.13-next.2",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
diff --git a/plugins/events-backend-module-bitbucket-cloud/src/service/eventsModuleBitbucketCloudEventRouter.test.ts b/plugins/events-backend-module-bitbucket-cloud/src/service/eventsModuleBitbucketCloudEventRouter.test.ts
index 17d2252c7b..025d994b4b 100644
--- a/plugins/events-backend-module-bitbucket-cloud/src/service/eventsModuleBitbucketCloudEventRouter.test.ts
+++ b/plugins/events-backend-module-bitbucket-cloud/src/service/eventsModuleBitbucketCloudEventRouter.test.ts
@@ -34,7 +34,6 @@ describe('eventsModuleBitbucketCloudEventRouter', () => {
 
     await startTestBackend({
       extensionPoints: [[eventsExtensionPoint, extensionPoint]],
-      services: [],
       features: [eventsModuleBitbucketCloudEventRouter()],
     });
 
diff --git a/plugins/events-backend-module-gerrit/CHANGELOG.md b/plugins/events-backend-module-gerrit/CHANGELOG.md
index 07276b736b..3156fde16c 100644
--- a/plugins/events-backend-module-gerrit/CHANGELOG.md
+++ b/plugins/events-backend-module-gerrit/CHANGELOG.md
@@ -1,5 +1,46 @@
 # @backstage/plugin-events-backend-module-gerrit
 
+## 0.1.13-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@0.6.3-next.2
+  - @backstage/plugin-events-node@0.2.12-next.2
+
+## 0.1.13-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@0.6.3-next.1
+  - @backstage/plugin-events-node@0.2.12-next.1
+
+## 0.1.12-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@0.6.2-next.0
+  - @backstage/plugin-events-node@0.2.11-next.0
+
+## 0.1.10
+
+### Patch Changes
+
+- 12a8c94eda8d: Add package repository and homepage metadata
+- Updated dependencies
+  - @backstage/backend-plugin-api@0.6.0
+  - @backstage/plugin-events-node@0.2.9
+
+## 0.1.10-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@0.6.0-next.2
+  - @backstage/plugin-events-node@0.2.9-next.2
+
 ## 0.1.10-next.1
 
 ### Patch Changes
diff --git a/plugins/events-backend-module-gerrit/catalog-info.yaml b/plugins/events-backend-module-gerrit/catalog-info.yaml
new file mode 100644
index 0000000000..482e8e2a74
--- /dev/null
+++ b/plugins/events-backend-module-gerrit/catalog-info.yaml
@@ -0,0 +1,9 @@
+apiVersion: backstage.io/v1alpha1
+kind: Component
+metadata:
+  name: backstage-plugin-events-backend-module-gerrit
+  title: '@backstage/plugin-events-backend-module-gerrit'
+spec:
+  lifecycle: experimental
+  type: backstage-backend-plugin-module
+  owner: pjungermann
diff --git a/plugins/events-backend-module-gerrit/package.json b/plugins/events-backend-module-gerrit/package.json
index 3f265c6613..87844bd82c 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.10-next.1",
+  "version": "0.1.13-next.2",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
diff --git a/plugins/events-backend-module-gerrit/src/service/eventsModuleGerritEventRouter.test.ts b/plugins/events-backend-module-gerrit/src/service/eventsModuleGerritEventRouter.test.ts
index 88ef995966..c11f4c42db 100644
--- a/plugins/events-backend-module-gerrit/src/service/eventsModuleGerritEventRouter.test.ts
+++ b/plugins/events-backend-module-gerrit/src/service/eventsModuleGerritEventRouter.test.ts
@@ -34,7 +34,6 @@ describe('eventsModuleGerritEventRouter', () => {
 
     await startTestBackend({
       extensionPoints: [[eventsExtensionPoint, extensionPoint]],
-      services: [],
       features: [eventsModuleGerritEventRouter()],
     });
 
diff --git a/plugins/events-backend-module-github/CHANGELOG.md b/plugins/events-backend-module-github/CHANGELOG.md
index e29d71c92f..9bff52ff8b 100644
--- a/plugins/events-backend-module-github/CHANGELOG.md
+++ b/plugins/events-backend-module-github/CHANGELOG.md
@@ -1,5 +1,51 @@
 # @backstage/plugin-events-backend-module-github
 
+## 0.1.13-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config@1.1.0-next.1
+  - @backstage/backend-plugin-api@0.6.3-next.2
+  - @backstage/plugin-events-node@0.2.12-next.2
+
+## 0.1.13-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config@1.1.0-next.0
+  - @backstage/backend-plugin-api@0.6.3-next.1
+  - @backstage/plugin-events-node@0.2.12-next.1
+
+## 0.1.12-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@0.6.2-next.0
+  - @backstage/config@1.0.8
+  - @backstage/plugin-events-node@0.2.11-next.0
+
+## 0.1.10
+
+### Patch Changes
+
+- 629cbd194a87: Use `coreServices.rootConfig` instead of `coreService.config`
+- 12a8c94eda8d: Add package repository and homepage metadata
+- Updated dependencies
+  - @backstage/backend-plugin-api@0.6.0
+  - @backstage/plugin-events-node@0.2.9
+  - @backstage/config@1.0.8
+
+## 0.1.10-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@0.6.0-next.2
+  - @backstage/plugin-events-node@0.2.9-next.2
+
 ## 0.1.10-next.1
 
 ### Patch Changes
diff --git a/plugins/events-backend-module-github/catalog-info.yaml b/plugins/events-backend-module-github/catalog-info.yaml
new file mode 100644
index 0000000000..4ca67b7048
--- /dev/null
+++ b/plugins/events-backend-module-github/catalog-info.yaml
@@ -0,0 +1,9 @@
+apiVersion: backstage.io/v1alpha1
+kind: Component
+metadata:
+  name: backstage-plugin-events-backend-module-github
+  title: '@backstage/plugin-events-backend-module-github'
+spec:
+  lifecycle: experimental
+  type: backstage-backend-plugin-module
+  owner: pjungermann
diff --git a/plugins/events-backend-module-github/package.json b/plugins/events-backend-module-github/package.json
index abde4c91a7..3a9f9671e2 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.10-next.1",
+  "version": "0.1.13-next.2",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
diff --git a/plugins/events-backend-module-github/src/service/eventsModuleGithubEventRouter.test.ts b/plugins/events-backend-module-github/src/service/eventsModuleGithubEventRouter.test.ts
index bfa186c7bc..02151d0dcf 100644
--- a/plugins/events-backend-module-github/src/service/eventsModuleGithubEventRouter.test.ts
+++ b/plugins/events-backend-module-github/src/service/eventsModuleGithubEventRouter.test.ts
@@ -34,7 +34,6 @@ describe('eventsModuleGithubEventRouter', () => {
 
     await startTestBackend({
       extensionPoints: [[eventsExtensionPoint, extensionPoint]],
-      services: [],
       features: [eventsModuleGithubEventRouter()],
     });
 
diff --git a/plugins/events-backend-module-github/src/service/eventsModuleGithubWebhook.test.ts b/plugins/events-backend-module-github/src/service/eventsModuleGithubWebhook.test.ts
index f5bb07f0d6..4effa62dd0 100644
--- a/plugins/events-backend-module-github/src/service/eventsModuleGithubWebhook.test.ts
+++ b/plugins/events-backend-module-github/src/service/eventsModuleGithubWebhook.test.ts
@@ -14,9 +14,7 @@
  * limitations under the License.
  */
 
-import { coreServices } from '@backstage/backend-plugin-api';
-import { startTestBackend } from '@backstage/backend-test-utils';
-import { ConfigReader } from '@backstage/config';
+import { mockServices, startTestBackend } from '@backstage/backend-test-utils';
 import { eventsExtensionPoint } from '@backstage/plugin-events-node/alpha';
 import {
   HttpPostIngressOptions,
@@ -47,20 +45,22 @@ describe('eventsModuleGithubWebhook', () => {
       },
     };
 
-    const config = new ConfigReader({
-      events: {
-        modules: {
-          github: {
-            webhookSecret: secret,
-          },
-        },
-      },
-    });
-
     await startTestBackend({
       extensionPoints: [[eventsExtensionPoint, extensionPoint]],
-      services: [[coreServices.rootConfig, config]],
-      features: [eventsModuleGithubWebhook()],
+      features: [
+        eventsModuleGithubWebhook(),
+        mockServices.rootConfig.factory({
+          data: {
+            events: {
+              modules: {
+                github: {
+                  webhookSecret: secret,
+                },
+              },
+            },
+          },
+        }),
+      ],
     });
 
     expect(addedIngress).not.toBeUndefined();
diff --git a/plugins/events-backend-module-gitlab/CHANGELOG.md b/plugins/events-backend-module-gitlab/CHANGELOG.md
index 231bf6dfe2..9ddd93105e 100644
--- a/plugins/events-backend-module-gitlab/CHANGELOG.md
+++ b/plugins/events-backend-module-gitlab/CHANGELOG.md
@@ -1,5 +1,51 @@
 # @backstage/plugin-events-backend-module-gitlab
 
+## 0.1.13-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config@1.1.0-next.1
+  - @backstage/backend-plugin-api@0.6.3-next.2
+  - @backstage/plugin-events-node@0.2.12-next.2
+
+## 0.1.13-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config@1.1.0-next.0
+  - @backstage/backend-plugin-api@0.6.3-next.1
+  - @backstage/plugin-events-node@0.2.12-next.1
+
+## 0.1.12-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@0.6.2-next.0
+  - @backstage/config@1.0.8
+  - @backstage/plugin-events-node@0.2.11-next.0
+
+## 0.1.10
+
+### Patch Changes
+
+- 629cbd194a87: Use `coreServices.rootConfig` instead of `coreService.config`
+- 12a8c94eda8d: Add package repository and homepage metadata
+- Updated dependencies
+  - @backstage/backend-plugin-api@0.6.0
+  - @backstage/plugin-events-node@0.2.9
+  - @backstage/config@1.0.8
+
+## 0.1.10-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@0.6.0-next.2
+  - @backstage/plugin-events-node@0.2.9-next.2
+
 ## 0.1.10-next.1
 
 ### Patch Changes
diff --git a/plugins/events-backend-module-gitlab/catalog-info.yaml b/plugins/events-backend-module-gitlab/catalog-info.yaml
new file mode 100644
index 0000000000..c8ab030d04
--- /dev/null
+++ b/plugins/events-backend-module-gitlab/catalog-info.yaml
@@ -0,0 +1,9 @@
+apiVersion: backstage.io/v1alpha1
+kind: Component
+metadata:
+  name: backstage-plugin-events-backend-module-gitlab
+  title: '@backstage/plugin-events-backend-module-gitlab'
+spec:
+  lifecycle: experimental
+  type: backstage-backend-plugin-module
+  owner: pjungermann
diff --git a/plugins/events-backend-module-gitlab/package.json b/plugins/events-backend-module-gitlab/package.json
index e25366b2f7..475645c361 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.10-next.1",
+  "version": "0.1.13-next.2",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
diff --git a/plugins/events-backend-module-gitlab/src/service/eventsModuleGitlabEventRouter.test.ts b/plugins/events-backend-module-gitlab/src/service/eventsModuleGitlabEventRouter.test.ts
index 86a0df6e68..34a68ccbe4 100644
--- a/plugins/events-backend-module-gitlab/src/service/eventsModuleGitlabEventRouter.test.ts
+++ b/plugins/events-backend-module-gitlab/src/service/eventsModuleGitlabEventRouter.test.ts
@@ -34,7 +34,6 @@ describe('eventsModuleGitlabEventRouter', () => {
 
     await startTestBackend({
       extensionPoints: [[eventsExtensionPoint, extensionPoint]],
-      services: [],
       features: [eventsModuleGitlabEventRouter()],
     });
 
diff --git a/plugins/events-backend-module-gitlab/src/service/eventsModuleGitlabWebhook.test.ts b/plugins/events-backend-module-gitlab/src/service/eventsModuleGitlabWebhook.test.ts
index 92e803c439..1ab116ee3d 100644
--- a/plugins/events-backend-module-gitlab/src/service/eventsModuleGitlabWebhook.test.ts
+++ b/plugins/events-backend-module-gitlab/src/service/eventsModuleGitlabWebhook.test.ts
@@ -14,9 +14,7 @@
  * limitations under the License.
  */
 
-import { coreServices } from '@backstage/backend-plugin-api';
-import { startTestBackend } from '@backstage/backend-test-utils';
-import { ConfigReader } from '@backstage/config';
+import { mockServices, startTestBackend } from '@backstage/backend-test-utils';
 import { eventsExtensionPoint } from '@backstage/plugin-events-node/alpha';
 import {
   HttpPostIngressOptions,
@@ -42,20 +40,22 @@ describe('gitlabWebhookEventsModule', () => {
       },
     };
 
-    const config = new ConfigReader({
-      events: {
-        modules: {
-          gitlab: {
-            webhookSecret: 'test-secret',
-          },
-        },
-      },
-    });
-
     await startTestBackend({
       extensionPoints: [[eventsExtensionPoint, extensionPoint]],
-      services: [[coreServices.rootConfig, config]],
-      features: [eventsModuleGitlabWebhook()],
+      features: [
+        eventsModuleGitlabWebhook(),
+        mockServices.rootConfig.factory({
+          data: {
+            events: {
+              modules: {
+                gitlab: {
+                  webhookSecret: 'test-secret',
+                },
+              },
+            },
+          },
+        }),
+      ],
     });
 
     expect(addedIngress).not.toBeUndefined();
diff --git a/plugins/events-backend-test-utils/CHANGELOG.md b/plugins/events-backend-test-utils/CHANGELOG.md
index 123a6224ed..9580013f0f 100644
--- a/plugins/events-backend-test-utils/CHANGELOG.md
+++ b/plugins/events-backend-test-utils/CHANGELOG.md
@@ -1,5 +1,41 @@
 # @backstage/plugin-events-backend-test-utils
 
+## 0.1.13-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-events-node@0.2.12-next.2
+
+## 0.1.13-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-events-node@0.2.12-next.1
+
+## 0.1.12-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-events-node@0.2.11-next.0
+
+## 0.1.10
+
+### Patch Changes
+
+- 12a8c94eda8d: Add package repository and homepage metadata
+- Updated dependencies
+  - @backstage/plugin-events-node@0.2.9
+
+## 0.1.10-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-events-node@0.2.9-next.2
+
 ## 0.1.10-next.1
 
 ### Patch Changes
diff --git a/plugins/events-backend-test-utils/catalog-info.yaml b/plugins/events-backend-test-utils/catalog-info.yaml
new file mode 100644
index 0000000000..a899f973c5
--- /dev/null
+++ b/plugins/events-backend-test-utils/catalog-info.yaml
@@ -0,0 +1,10 @@
+apiVersion: backstage.io/v1alpha1
+kind: Component
+metadata:
+  name: backstage-plugin-events-backend-test-utils
+  title: '@backstage/plugin-events-backend-test-utils'
+  description: The plugin-events-backend-test-utils for @backstage/plugin-events-node
+spec:
+  lifecycle: experimental
+  type: backstage-node-library
+  owner: pjungermann
diff --git a/plugins/events-backend-test-utils/package.json b/plugins/events-backend-test-utils/package.json
index a90a16a6c4..ae61957fd4 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.10-next.1",
+  "version": "0.1.13-next.2",
   "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 f2f9d5f01d..53888be33f 100644
--- a/plugins/events-backend/CHANGELOG.md
+++ b/plugins/events-backend/CHANGELOG.md
@@ -1,5 +1,56 @@
 # @backstage/plugin-events-backend
 
+## 0.2.12-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config@1.1.0-next.1
+  - @backstage/backend-common@0.19.5-next.2
+  - @backstage/backend-plugin-api@0.6.3-next.2
+  - @backstage/plugin-events-node@0.2.12-next.2
+
+## 0.2.12-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config@1.1.0-next.0
+  - @backstage/backend-common@0.19.5-next.1
+  - @backstage/backend-plugin-api@0.6.3-next.1
+  - @backstage/plugin-events-node@0.2.12-next.1
+
+## 0.2.11-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.19.4-next.0
+  - @backstage/backend-plugin-api@0.6.2-next.0
+  - @backstage/config@1.0.8
+  - @backstage/plugin-events-node@0.2.11-next.0
+
+## 0.2.9
+
+### Patch Changes
+
+- 629cbd194a87: Use `coreServices.rootConfig` instead of `coreService.config`
+- 12a8c94eda8d: Add package repository and homepage metadata
+- Updated dependencies
+  - @backstage/backend-common@0.19.2
+  - @backstage/backend-plugin-api@0.6.0
+  - @backstage/plugin-events-node@0.2.9
+  - @backstage/config@1.0.8
+
+## 0.2.9-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@0.6.0-next.2
+  - @backstage/backend-common@0.19.2-next.2
+  - @backstage/plugin-events-node@0.2.9-next.2
+
 ## 0.2.9-next.1
 
 ### Patch Changes
diff --git a/plugins/events-backend/alpha-api-report.md b/plugins/events-backend/alpha-api-report.md
index 3e32f769c1..b9475b3133 100644
--- a/plugins/events-backend/alpha-api-report.md
+++ b/plugins/events-backend/alpha-api-report.md
@@ -6,7 +6,8 @@
 import { BackendFeature } from '@backstage/backend-plugin-api';
 
 // @alpha
-export const eventsPlugin: () => BackendFeature;
+const eventsPlugin: () => BackendFeature;
+export default eventsPlugin;
 
 // (No @packageDocumentation comment for this package)
 ```
diff --git a/plugins/events-backend/catalog-info.yaml b/plugins/events-backend/catalog-info.yaml
new file mode 100644
index 0000000000..7fd8d058cc
--- /dev/null
+++ b/plugins/events-backend/catalog-info.yaml
@@ -0,0 +1,9 @@
+apiVersion: backstage.io/v1alpha1
+kind: Component
+metadata:
+  name: backstage-plugin-events-backend
+  title: '@backstage/plugin-events-backend'
+spec:
+  lifecycle: experimental
+  type: backstage-backend-plugin
+  owner: pjungermann
diff --git a/plugins/events-backend/package.json b/plugins/events-backend/package.json
index eaa9a8f278..00ea02e068 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.9-next.1",
+  "version": "0.2.12-next.2",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
diff --git a/plugins/events-backend/src/alpha.ts b/plugins/events-backend/src/alpha.ts
index 4403da1636..2d40694987 100644
--- a/plugins/events-backend/src/alpha.ts
+++ b/plugins/events-backend/src/alpha.ts
@@ -14,4 +14,4 @@
  * limitations under the License.
  */
 
-export { eventsPlugin } from './service/EventsPlugin';
+export { eventsPlugin as default } from './service/EventsPlugin';
diff --git a/plugins/events-backend/src/service/EventsPlugin.test.ts b/plugins/events-backend/src/service/EventsPlugin.test.ts
index bce45c9ef3..e65147ebbb 100644
--- a/plugins/events-backend/src/service/EventsPlugin.test.ts
+++ b/plugins/events-backend/src/service/EventsPlugin.test.ts
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-import { errorHandler, getVoidLogger } from '@backstage/backend-common';
-import { ConfigReader } from '@backstage/config';
+import { errorHandler } from '@backstage/backend-common';
 import {
   coreServices,
   createBackendModule,
+  createServiceFactory,
 } from '@backstage/backend-plugin-api';
-import { startTestBackend } from '@backstage/backend-test-utils';
+import { mockServices, startTestBackend } from '@backstage/backend-test-utils';
 import { eventsExtensionPoint } from '@backstage/plugin-events-node/alpha';
 import {
   TestEventBroker,
@@ -38,14 +38,6 @@ describe('eventPlugin', () => {
     const publisher = new TestEventPublisher();
     const subscriber = new TestEventSubscriber('sub', ['fake']);
 
-    const config = new ConfigReader({
-      events: {
-        http: {
-          topics: ['fake'],
-        },
-      },
-    });
-
     const httpRouter = Router();
     httpRouter.use(express.json());
     httpRouter.use(errorHandler());
@@ -70,12 +62,25 @@ describe('eventPlugin', () => {
 
     await startTestBackend({
       extensionPoints: [],
-      services: [
-        [coreServices.rootConfig, config],
-        [coreServices.httpRouter, httpRouter],
-        [coreServices.logger, getVoidLogger()],
+      features: [
+        eventsPlugin(),
+        testModule(),
+        mockServices.logger.factory(),
+        mockServices.rootConfig.factory({
+          data: {
+            events: {
+              http: {
+                topics: ['fake'],
+              },
+            },
+          },
+        }),
+        createServiceFactory({
+          service: coreServices.httpRouter,
+          deps: {},
+          factory: async () => httpRouter,
+        }),
       ],
-      features: [eventsPlugin(), testModule()],
     });
 
     expect(publisher.eventBroker).toBe(eventBroker);
diff --git a/plugins/events-node/CHANGELOG.md b/plugins/events-node/CHANGELOG.md
index af8c020ca3..fe129306fe 100644
--- a/plugins/events-node/CHANGELOG.md
+++ b/plugins/events-node/CHANGELOG.md
@@ -1,5 +1,41 @@
 # @backstage/plugin-events-node
 
+## 0.2.12-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@0.6.3-next.2
+
+## 0.2.12-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@0.6.3-next.1
+
+## 0.2.11-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@0.6.2-next.0
+
+## 0.2.9
+
+### Patch Changes
+
+- 12a8c94eda8d: Add package repository and homepage metadata
+- Updated dependencies
+  - @backstage/backend-plugin-api@0.6.0
+
+## 0.2.9-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@0.6.0-next.2
+
 ## 0.2.9-next.1
 
 ### Patch Changes
diff --git a/plugins/events-node/catalog-info.yaml b/plugins/events-node/catalog-info.yaml
new file mode 100644
index 0000000000..50a1dfe57b
--- /dev/null
+++ b/plugins/events-node/catalog-info.yaml
@@ -0,0 +1,10 @@
+apiVersion: backstage.io/v1alpha1
+kind: Component
+metadata:
+  name: backstage-plugin-events-node
+  title: '@backstage/plugin-events-node'
+  description: The plugin-events-node module for @backstage/plugin-events-backend
+spec:
+  lifecycle: experimental
+  type: backstage-node-library
+  owner: pjungermann
diff --git a/plugins/events-node/package.json b/plugins/events-node/package.json
index 0cea638e4f..9b9052c58b 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.9-next.1",
+  "version": "0.2.12-next.2",
   "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 ef47064c18..a8831fbed7 100644
--- a/plugins/example-todo-list-backend/CHANGELOG.md
+++ b/plugins/example-todo-list-backend/CHANGELOG.md
@@ -1,5 +1,58 @@
 # @internal/plugin-todo-list-backend
 
+## 1.0.17-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config@1.1.0-next.1
+  - @backstage/backend-common@0.19.5-next.2
+  - @backstage/plugin-auth-node@0.3.0-next.2
+  - @backstage/backend-plugin-api@0.6.3-next.2
+  - @backstage/errors@1.2.1
+
+## 1.0.17-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config@1.1.0-next.0
+  - @backstage/backend-common@0.19.5-next.1
+  - @backstage/backend-plugin-api@0.6.3-next.1
+  - @backstage/plugin-auth-node@0.3.0-next.1
+  - @backstage/errors@1.2.1
+
+## 1.0.17-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-auth-node@0.3.0-next.0
+  - @backstage/backend-common@0.19.4-next.0
+  - @backstage/backend-plugin-api@0.6.2-next.0
+  - @backstage/config@1.0.8
+  - @backstage/errors@1.2.1
+
+## 1.0.16
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.19.2
+  - @backstage/backend-plugin-api@0.6.0
+  - @backstage/plugin-auth-node@0.2.17
+  - @backstage/config@1.0.8
+  - @backstage/errors@1.2.1
+
+## 1.0.16-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@0.6.0-next.2
+  - @backstage/backend-common@0.19.2-next.2
+  - @backstage/plugin-auth-node@0.2.17-next.2
+
 ## 1.0.16-next.1
 
 ### Patch Changes
diff --git a/plugins/example-todo-list-backend/api-report.md b/plugins/example-todo-list-backend/api-report.md
index 319fbbf226..d78f5e0796 100644
--- a/plugins/example-todo-list-backend/api-report.md
+++ b/plugins/example-todo-list-backend/api-report.md
@@ -12,7 +12,8 @@ import { Logger } from 'winston';
 export function createRouter(options: RouterOptions): Promise<express.Router>;
 
 // @alpha
-export const exampleTodoListPlugin: () => BackendFeature;
+const exampleTodoListPlugin: () => BackendFeature;
+export default exampleTodoListPlugin;
 
 // @public
 export interface RouterOptions {
diff --git a/plugins/example-todo-list-backend/catalog-info.yaml b/plugins/example-todo-list-backend/catalog-info.yaml
new file mode 100644
index 0000000000..144837d5bb
--- /dev/null
+++ b/plugins/example-todo-list-backend/catalog-info.yaml
@@ -0,0 +1,9 @@
+apiVersion: backstage.io/v1alpha1
+kind: Component
+metadata:
+  name: internal-plugin-todo-list-backend
+  title: '@internal/plugin-todo-list-backend'
+spec:
+  lifecycle: experimental
+  type: backstage-backend-plugin
+  owner: maintainers
diff --git a/plugins/example-todo-list-backend/package.json b/plugins/example-todo-list-backend/package.json
index 2417f2a883..805bf7159f 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.16-next.1",
+  "version": "1.0.17-next.2",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
diff --git a/plugins/example-todo-list-backend/src/index.ts b/plugins/example-todo-list-backend/src/index.ts
index 6917307db6..156e44f70e 100644
--- a/plugins/example-todo-list-backend/src/index.ts
+++ b/plugins/example-todo-list-backend/src/index.ts
@@ -15,4 +15,4 @@
  */
 
 export * from './service/router';
-export { exampleTodoListPlugin } from './plugin';
+export { exampleTodoListPlugin as default } from './plugin';
diff --git a/plugins/example-todo-list-common/CHANGELOG.md b/plugins/example-todo-list-common/CHANGELOG.md
index cc614fd356..d8c40666f5 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.13-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-permission-common@0.7.8-next.1
+
+## 1.0.13-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-permission-common@0.7.8-next.0
+
 ## 1.0.12
 
 ### Patch Changes
diff --git a/plugins/example-todo-list-common/catalog-info.yaml b/plugins/example-todo-list-common/catalog-info.yaml
new file mode 100644
index 0000000000..dad155eda1
--- /dev/null
+++ b/plugins/example-todo-list-common/catalog-info.yaml
@@ -0,0 +1,9 @@
+apiVersion: backstage.io/v1alpha1
+kind: Component
+metadata:
+  name: internal-plugin-todo-list-common
+  title: '@internal/plugin-todo-list-common'
+spec:
+  lifecycle: experimental
+  type: backstage-common-library
+  owner: maintainers
diff --git a/plugins/example-todo-list-common/package.json b/plugins/example-todo-list-common/package.json
index 03d39bb49f..d3fae58693 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.12",
+  "version": "1.0.13-next.1",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
@@ -19,6 +19,7 @@
     "url": "https://github.com/backstage/backstage",
     "directory": "plugins/plugins/example-todo-list-common"
   },
+  "sideEffects": false,
   "scripts": {
     "start": "backstage-cli package start",
     "build": "backstage-cli package build",
@@ -36,7 +37,6 @@
     "@backstage/core-app-api": "workspace:^",
     "@backstage/dev-utils": "workspace:^",
     "@backstage/test-utils": "workspace:^",
-    "@types/node": "^16.11.26",
     "cross-fetch": "^3.1.5",
     "msw": "^1.0.0"
   },
diff --git a/plugins/example-todo-list/CHANGELOG.md b/plugins/example-todo-list/CHANGELOG.md
index 3c7372410c..7558e16555 100644
--- a/plugins/example-todo-list/CHANGELOG.md
+++ b/plugins/example-todo-list/CHANGELOG.md
@@ -1,5 +1,41 @@
 # @internal/plugin-todo-list
 
+## 1.0.17-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.13.5-next.2
+  - @backstage/core-plugin-api@1.6.0-next.2
+  - @backstage/theme@0.4.1
+
+## 1.0.17-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.13.5-next.1
+  - @backstage/core-plugin-api@1.6.0-next.1
+  - @backstage/theme@0.4.1
+
+## 1.0.17-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-plugin-api@1.6.0-next.0
+  - @backstage/core-components@0.13.5-next.0
+  - @backstage/theme@0.4.1
+
+## 1.0.16
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.13.4
+  - @backstage/core-plugin-api@1.5.3
+  - @backstage/theme@0.4.1
+
 ## 1.0.16-next.0
 
 ### Patch Changes
diff --git a/plugins/example-todo-list/api-report.md b/plugins/example-todo-list/api-report.md
index 68b3ffd73e..1b7aa49a19 100644
--- a/plugins/example-todo-list/api-report.md
+++ b/plugins/example-todo-list/api-report.md
@@ -6,10 +6,11 @@
 /// <reference types="react" />
 
 import { BackstagePlugin } from '@backstage/core-plugin-api';
+import { JSX as JSX_2 } from 'react';
 import { RouteRef } from '@backstage/core-plugin-api';
 
 // @public
-export const TodoListPage: () => JSX.Element;
+export const TodoListPage: () => JSX_2.Element;
 
 // @public
 export const todoListPlugin: BackstagePlugin<
diff --git a/plugins/example-todo-list/catalog-info.yaml b/plugins/example-todo-list/catalog-info.yaml
new file mode 100644
index 0000000000..3774f01103
--- /dev/null
+++ b/plugins/example-todo-list/catalog-info.yaml
@@ -0,0 +1,9 @@
+apiVersion: backstage.io/v1alpha1
+kind: Component
+metadata:
+  name: internal-plugin-todo-list
+  title: '@internal/plugin-todo-list'
+spec:
+  lifecycle: experimental
+  type: backstage-frontend-plugin
+  owner: maintainers
diff --git a/plugins/example-todo-list/package.json b/plugins/example-todo-list/package.json
index da11b3cf24..4c83f1f7c1 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.16-next.0",
+  "version": "1.0.17-next.2",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
@@ -19,6 +19,7 @@
     "main": "dist/index.esm.js",
     "types": "dist/index.d.ts"
   },
+  "sideEffects": false,
   "scripts": {
     "build": "backstage-cli package build",
     "start": "backstage-cli package start",
@@ -51,7 +52,6 @@
     "@testing-library/jest-dom": "^5.10.1",
     "@testing-library/react": "^12.1.3",
     "@testing-library/user-event": "^14.0.0",
-    "@types/node": "^16.11.26",
     "@types/react": "^16.13.1 || ^17.0.0",
     "msw": "^1.0.0"
   },
diff --git a/plugins/explore-backend/CHANGELOG.md b/plugins/explore-backend/CHANGELOG.md
index de8b7b7dd6..a8bbc49121 100644
--- a/plugins/explore-backend/CHANGELOG.md
+++ b/plugins/explore-backend/CHANGELOG.md
@@ -1,5 +1,64 @@
 # @backstage/plugin-explore-backend
 
+## 0.0.13-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config@1.1.0-next.1
+  - @backstage/backend-common@0.19.5-next.2
+  - @backstage/plugin-search-backend-module-explore@0.1.7-next.2
+  - @backstage/types@1.1.0
+  - @backstage/plugin-explore-common@0.0.1
+  - @backstage/plugin-search-common@1.2.6-next.1
+
+## 0.0.13-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config@1.1.0-next.0
+  - @backstage/backend-common@0.19.5-next.1
+  - @backstage/plugin-search-backend-module-explore@0.1.7-next.1
+  - @backstage/types@1.1.0
+  - @backstage/plugin-explore-common@0.0.1
+  - @backstage/plugin-search-common@1.2.6-next.0
+
+## 0.0.12-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.19.4-next.0
+  - @backstage/config@1.0.8
+  - @backstage/types@1.1.0
+  - @backstage/plugin-explore-common@0.0.1
+  - @backstage/plugin-search-backend-module-explore@0.1.6-next.0
+  - @backstage/plugin-search-common@1.2.5
+
+## 0.0.10
+
+### Patch Changes
+
+- eda2a699f40d: Moved the config example from the "Tools as Code" section to the "Tools as Config" section of the README
+- 12a8c94eda8d: Add package repository and homepage metadata
+- Updated dependencies
+  - @backstage/plugin-search-backend-module-explore@0.1.4
+  - @backstage/backend-common@0.19.2
+  - @backstage/config@1.0.8
+  - @backstage/types@1.1.0
+  - @backstage/plugin-explore-common@0.0.1
+  - @backstage/plugin-search-common@1.2.5
+
+## 0.0.10-next.2
+
+### Patch Changes
+
+- eda2a699f40d: Moved the config example from the "Tools as Code" section to the "Tools as Config" section of the README
+- Updated dependencies
+  - @backstage/plugin-search-backend-module-explore@0.1.4-next.2
+  - @backstage/backend-common@0.19.2-next.2
+
 ## 0.0.10-next.1
 
 ### Patch Changes
diff --git a/plugins/explore-backend/catalog-info.yaml b/plugins/explore-backend/catalog-info.yaml
new file mode 100644
index 0000000000..a74142843f
--- /dev/null
+++ b/plugins/explore-backend/catalog-info.yaml
@@ -0,0 +1,9 @@
+apiVersion: backstage.io/v1alpha1
+kind: Component
+metadata:
+  name: backstage-plugin-explore-backend
+  title: '@backstage/plugin-explore-backend'
+spec:
+  lifecycle: experimental
+  type: backstage-backend-plugin
+  owner: maintainers
diff --git a/plugins/explore-backend/package.json b/plugins/explore-backend/package.json
index 5b8a20eea7..b995b8fbd7 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.10-next.1",
+  "version": "0.0.13-next.2",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
diff --git a/plugins/explore-backend/src/index.ts b/plugins/explore-backend/src/index.ts
index ca501db96b..15659d6ab6 100644
--- a/plugins/explore-backend/src/index.ts
+++ b/plugins/explore-backend/src/index.ts
@@ -36,19 +36,19 @@ import type {
 
 /**
  * @public
- * @deprecated import from `@backstage/search-backend-module-explore` instead
+ * @deprecated import from `@backstage/plugin-search-backend-module-explore` instead
  */
 export const ToolDocumentCollatorFactory = _ToolDocumentCollatorFactory;
 
 /**
  * @public
- * @deprecated import from `@backstage/search-backend-module-explore` instead
+ * @deprecated import from `@backstage/plugin-search-backend-module-explore` instead
  */
 export type ToolDocument = _ToolDocument;
 
 /**
  * @public
- * @deprecated import from `@backstage/search-backend-module-explore` instead
+ * @deprecated import from `@backstage/plugin-search-backend-module-explore` instead
  */
 export type ToolDocumentCollatorFactoryOptions =
   _ToolDocumentCollatorFactoryOptions;
diff --git a/plugins/explore-common/catalog-info.yaml b/plugins/explore-common/catalog-info.yaml
new file mode 100644
index 0000000000..c4bf3e493f
--- /dev/null
+++ b/plugins/explore-common/catalog-info.yaml
@@ -0,0 +1,10 @@
+apiVersion: backstage.io/v1alpha1
+kind: Component
+metadata:
+  name: backstage-plugin-explore-common
+  title: '@backstage/plugin-explore-common'
+  description: Common functionalities for the explore plugin
+spec:
+  lifecycle: experimental
+  type: backstage-common-library
+  owner: maintainers
diff --git a/plugins/explore-common/package.json b/plugins/explore-common/package.json
index 988745a8f7..7c6fb494ca 100644
--- a/plugins/explore-common/package.json
+++ b/plugins/explore-common/package.json
@@ -22,6 +22,7 @@
   "keywords": [
     "backstage"
   ],
+  "sideEffects": false,
   "scripts": {
     "build": "backstage-cli package build",
     "lint": "backstage-cli package lint",
diff --git a/plugins/explore-react/CHANGELOG.md b/plugins/explore-react/CHANGELOG.md
index 83bf4cc2a1..7eb190ce8e 100644
--- a/plugins/explore-react/CHANGELOG.md
+++ b/plugins/explore-react/CHANGELOG.md
@@ -1,5 +1,30 @@
 # @backstage/plugin-explore-react
 
+## 0.0.31-next.2
+
+### Patch Changes
+
+- 8cec7664e146: Removed `@types/node` dependency
+- Updated dependencies
+  - @backstage/core-plugin-api@1.6.0-next.2
+  - @backstage/plugin-explore-common@0.0.1
+
+## 0.0.31-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-plugin-api@1.6.0-next.1
+  - @backstage/plugin-explore-common@0.0.1
+
+## 0.0.31-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-plugin-api@1.6.0-next.0
+  - @backstage/plugin-explore-common@0.0.1
+
 ## 0.0.30
 
 ### Patch Changes
diff --git a/plugins/explore-react/catalog-info.yaml b/plugins/explore-react/catalog-info.yaml
new file mode 100644
index 0000000000..d65bbc7d8d
--- /dev/null
+++ b/plugins/explore-react/catalog-info.yaml
@@ -0,0 +1,12 @@
+apiVersion: backstage.io/v1alpha1
+kind: Component
+metadata:
+  name: backstage-plugin-explore-react
+  title: '@backstage/plugin-explore-react'
+  description: >-
+    A frontend library for Backstage plugins that want to interact with the
+    explore plugin
+spec:
+  lifecycle: experimental
+  type: backstage-web-library
+  owner: sda-se-reviewers
diff --git a/plugins/explore-react/package.json b/plugins/explore-react/package.json
index 55187a6820..766669f12e 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.30",
+  "version": "0.0.31-next.2",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
@@ -22,6 +22,7 @@
   "keywords": [
     "backstage"
   ],
+  "sideEffects": false,
   "scripts": {
     "build": "backstage-cli package build",
     "lint": "backstage-cli package lint",
@@ -48,7 +49,6 @@
     "@testing-library/jest-dom": "^5.10.1",
     "@testing-library/react": "^12.1.3",
     "@testing-library/user-event": "^14.0.0",
-    "@types/node": "^16.11.26",
     "@types/react": "^16.13.1 || ^17.0.0",
     "cross-fetch": "^3.1.5",
     "msw": "^1.0.0"
diff --git a/plugins/explore/CHANGELOG.md b/plugins/explore/CHANGELOG.md
index 79cc36bcd3..9860d28f1a 100644
--- a/plugins/explore/CHANGELOG.md
+++ b/plugins/explore/CHANGELOG.md
@@ -1,5 +1,80 @@
 # @backstage/plugin-explore
 
+## 0.4.10-next.2
+
+### Patch Changes
+
+- 8cec7664e146: Removed `@types/node` dependency
+- Updated dependencies
+  - @backstage/core-components@0.13.5-next.2
+  - @backstage/core-plugin-api@1.6.0-next.2
+  - @backstage/plugin-explore-react@0.0.31-next.2
+  - @backstage/plugin-catalog-react@1.8.4-next.2
+  - @backstage/plugin-search-react@1.7.0-next.2
+  - @backstage/catalog-model@1.4.2-next.1
+  - @backstage/errors@1.2.1
+  - @backstage/theme@0.4.1
+  - @backstage/plugin-explore-common@0.0.1
+  - @backstage/plugin-search-common@1.2.6-next.1
+
+## 0.4.10-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.8.4-next.1
+  - @backstage/core-components@0.13.5-next.1
+  - @backstage/plugin-search-react@1.7.0-next.1
+  - @backstage/catalog-model@1.4.2-next.0
+  - @backstage/core-plugin-api@1.6.0-next.1
+  - @backstage/plugin-explore-react@0.0.31-next.1
+  - @backstage/errors@1.2.1
+  - @backstage/theme@0.4.1
+  - @backstage/plugin-explore-common@0.0.1
+  - @backstage/plugin-search-common@1.2.6-next.0
+
+## 0.4.9-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-plugin-api@1.6.0-next.0
+  - @backstage/core-components@0.13.5-next.0
+  - @backstage/catalog-model@1.4.1
+  - @backstage/errors@1.2.1
+  - @backstage/theme@0.4.1
+  - @backstage/plugin-catalog-react@1.8.3-next.0
+  - @backstage/plugin-explore-common@0.0.1
+  - @backstage/plugin-explore-react@0.0.31-next.0
+  - @backstage/plugin-search-common@1.2.5
+  - @backstage/plugin-search-react@1.6.5-next.0
+
+## 0.4.7
+
+### Patch Changes
+
+- 41a26248c91c: Support `material-ui` overrides in plugin-explore components
+- 83467b0534ee: Don't put "?" in URL if no query parameters.
+- Updated dependencies
+  - @backstage/core-components@0.13.4
+  - @backstage/plugin-catalog-react@1.8.1
+  - @backstage/core-plugin-api@1.5.3
+  - @backstage/plugin-search-react@1.6.4
+  - @backstage/plugin-explore-react@0.0.30
+  - @backstage/catalog-model@1.4.1
+  - @backstage/errors@1.2.1
+  - @backstage/theme@0.4.1
+  - @backstage/plugin-explore-common@0.0.1
+  - @backstage/plugin-search-common@1.2.5
+
+## 0.4.7-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.8.1-next.1
+  - @backstage/plugin-explore-react@0.0.30
+
 ## 0.4.7-next.0
 
 ### Patch Changes
diff --git a/plugins/explore/api-report.md b/plugins/explore/api-report.md
index 70ad479841..193efb044d 100644
--- a/plugins/explore/api-report.md
+++ b/plugins/explore/api-report.md
@@ -16,6 +16,8 @@ import { FetchApi } from '@backstage/core-plugin-api';
 import { GetExploreToolsRequest } from '@backstage/plugin-explore-common';
 import { GetExploreToolsResponse } from '@backstage/plugin-explore-common';
 import { IndexableDocument } from '@backstage/plugin-search-common';
+import { JSX as JSX_2 } from 'react';
+import { default as React_2 } from 'react';
 import { ReactNode } from 'react';
 import { ResultHighlight } from '@backstage/plugin-search-common';
 import { RouteRef } from '@backstage/core-plugin-api';
@@ -36,15 +38,17 @@ export const catalogEntityRouteRef: ExternalRouteRef<
 export const CatalogKindExploreContent: (props: {
   title?: string;
   kind: string;
-}) => JSX.Element;
+}) => React_2.JSX.Element;
 
 // @public (undocumented)
-export const DomainCard: (props: { entity: DomainEntity }) => JSX.Element;
+export const DomainCard: (props: {
+  entity: DomainEntity;
+}) => React_2.JSX.Element;
 
 // @public (undocumented)
 export const DomainExplorerContent: (props: {
   title?: string | undefined;
-}) => JSX.Element;
+}) => JSX_2.Element;
 
 // @public
 export interface ExploreApi {
@@ -67,7 +71,7 @@ export class ExploreClient implements ExploreApi {
 
 // @public
 export const ExploreLayout: {
-  (props: ExploreLayoutProps): JSX.Element;
+  (props: ExploreLayoutProps): default_2.JSX.Element;
   Route: (props: SubRoute) => null;
 };
 
@@ -79,7 +83,7 @@ export type ExploreLayoutProps = {
 };
 
 // @public (undocumented)
-export const ExplorePage: () => JSX.Element;
+export const ExplorePage: () => JSX_2.Element;
 
 // @public (undocumented)
 const explorePlugin: BackstagePlugin<
@@ -107,7 +111,7 @@ export const exploreRouteRef: RouteRef<undefined>;
 // @public (undocumented)
 export const GroupsExplorerContent: (props: {
   title?: string | undefined;
-}) => JSX.Element;
+}) => JSX_2.Element;
 
 // @public (undocumented)
 export type SubRoute = {
@@ -125,7 +129,7 @@ export type SubRoute = {
 // @public (undocumented)
 export const ToolExplorerContent: (props: {
   title?: string | undefined;
-}) => JSX.Element;
+}) => JSX_2.Element;
 
 // @public (undocumented)
 export const ToolSearchResultListItem: (
diff --git a/plugins/explore/catalog-info.yaml b/plugins/explore/catalog-info.yaml
new file mode 100644
index 0000000000..031dedfb3f
--- /dev/null
+++ b/plugins/explore/catalog-info.yaml
@@ -0,0 +1,12 @@
+apiVersion: backstage.io/v1alpha1
+kind: Component
+metadata:
+  name: backstage-plugin-explore
+  title: '@backstage/plugin-explore'
+  description: >-
+    A Backstage plugin for building an exploration page of your software
+    ecosystem
+spec:
+  lifecycle: experimental
+  type: backstage-frontend-plugin
+  owner: sda-se-reviewers
diff --git a/plugins/explore/package.json b/plugins/explore/package.json
index 702bbbf2d4..74fc8a0964 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.4.7-next.0",
+  "version": "0.4.10-next.2",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
@@ -22,6 +22,7 @@
   "keywords": [
     "backstage"
   ],
+  "sideEffects": false,
   "scripts": {
     "build": "backstage-cli package build",
     "lint": "backstage-cli package lint",
@@ -65,7 +66,6 @@
     "@testing-library/jest-dom": "^5.10.1",
     "@testing-library/react": "^12.1.3",
     "@testing-library/user-event": "^14.0.0",
-    "@types/node": "^16.11.26",
     "cross-fetch": "^3.1.5",
     "msw": "^1.0.0"
   },
diff --git a/plugins/explore/src/api/ExploreClient.test.ts b/plugins/explore/src/api/ExploreClient.test.ts
index bbec568a09..77eb42ddf6 100644
--- a/plugins/explore/src/api/ExploreClient.test.ts
+++ b/plugins/explore/src/api/ExploreClient.test.ts
@@ -83,6 +83,22 @@ describe('ExploreClient', () => {
       });
       expect(response).toEqual(expectedResponse);
     });
+
+    it('should request explore tools without filters', async () => {
+      const expectedResponse: GetExploreToolsResponse = {
+        tools: mockTools,
+      };
+
+      server.use(
+        rest.get(`${mockBaseUrl}/tools`, (req, res, ctx) => {
+          expect(req.url.search).toBe('');
+          return res(ctx.json(expectedResponse));
+        }),
+      );
+
+      const response = await client.getTools();
+      expect(response).toEqual(expectedResponse);
+    });
   });
 
   describe('when using exploreToolsConfig for backwards compatibility', () => {
diff --git a/plugins/explore/src/api/ExploreClient.ts b/plugins/explore/src/api/ExploreClient.ts
index 9dca2755fe..4528200b43 100644
--- a/plugins/explore/src/api/ExploreClient.ts
+++ b/plugins/explore/src/api/ExploreClient.ts
@@ -71,7 +71,7 @@ export class ExploreClient implements ExploreApi {
       filter?.lifecycle?.map(l => `lifecycle=${encodeURIComponent(l)}`) ?? [];
     const query = [...tags, ...lifecycles].join('&');
 
-    const response = await fetch(`${baseUrl}/tools?${query}`);
+    const response = await fetch(`${baseUrl}/tools${query ? `?${query}` : ''}`);
 
     if (!response.ok) {
       throw await ResponseError.fromResponse(response);
diff --git a/plugins/explore/src/components/GroupsExplorerContent/GroupsDiagram.tsx b/plugins/explore/src/components/GroupsExplorerContent/GroupsDiagram.tsx
index 127bd193bf..2c8f6f6a6e 100644
--- a/plugins/explore/src/components/GroupsExplorerContent/GroupsDiagram.tsx
+++ b/plugins/explore/src/components/GroupsExplorerContent/GroupsDiagram.tsx
@@ -41,57 +41,62 @@ import classNames from 'classnames';
 import React from 'react';
 import useAsync from 'react-use/lib/useAsync';
 
-const useStyles = makeStyles((theme: BackstageTheme) => ({
-  graph: {
-    minHeight: '100%',
-    flex: 1,
-  },
-  graphWrapper: {
-    display: 'flex',
-    height: '100%',
-  },
-  organizationNode: {
-    fill: theme.palette.secondary.light,
-    stroke: theme.palette.secondary.light,
-  },
-  groupNode: {
-    fill: theme.palette.primary.light,
-    stroke: theme.palette.primary.light,
-  },
-  centeredContent: {
-    padding: theme.spacing(1),
-    height: '100%',
-    display: 'flex',
-    alignItems: 'center',
-    justifyContent: 'center',
-    color: theme.palette.common.black,
-  },
-  legend: {
-    position: 'absolute',
-    bottom: 0,
-    right: 0,
-    padding: theme.spacing(1),
-    '& .icon': {
-      verticalAlign: 'bottom',
+const useStyles = makeStyles(
+  (theme: BackstageTheme) => ({
+    graph: {
+      minHeight: '100%',
+      flex: 1,
     },
+    graphWrapper: {
+      display: 'flex',
+      height: '100%',
+    },
+    organizationNode: {
+      fill: theme.palette.secondary.light,
+      stroke: theme.palette.secondary.light,
+    },
+    groupNode: {
+      fill: theme.palette.primary.light,
+      stroke: theme.palette.primary.light,
+    },
+    centeredContent: {
+      padding: theme.spacing(1),
+      height: '100%',
+      display: 'flex',
+      alignItems: 'center',
+      justifyContent: 'center',
+      color: theme.palette.common.black,
+    },
+    legend: {
+      position: 'absolute',
+      bottom: 0,
+      right: 0,
+      padding: theme.spacing(1),
+      '& .icon': {
+        verticalAlign: 'bottom',
+      },
+    },
+    textOrganization: {
+      color: theme.palette.secondary.contrastText,
+    },
+    textGroup: {
+      color: theme.palette.primary.contrastText,
+    },
+    textWrapper: {
+      display: '-webkit-box',
+      WebkitBoxOrient: 'vertical',
+      WebkitLineClamp: 2,
+      overflow: 'hidden',
+      textOverflow: 'ellipsis',
+      textAlign: 'center',
+      fontWeight: 'bold',
+      fontSize: '20px',
+    },
+  }),
+  {
+    name: 'ExploreGroupsDiagram',
   },
-  textOrganization: {
-    color: theme.palette.secondary.contrastText,
-  },
-  textGroup: {
-    color: theme.palette.primary.contrastText,
-  },
-  textWrapper: {
-    display: '-webkit-box',
-    WebkitBoxOrient: 'vertical',
-    WebkitLineClamp: 2,
-    overflow: 'hidden',
-    textOverflow: 'ellipsis',
-    textAlign: 'center',
-    fontWeight: 'bold',
-    fontSize: '20px',
-  },
-}));
+);
 
 function RenderNode(props: DependencyGraphTypes.RenderNodeProps<any>) {
   const nodeWidth = 180;
diff --git a/plugins/explore/src/components/GroupsExplorerContent/GroupsExplorerContent.tsx b/plugins/explore/src/components/GroupsExplorerContent/GroupsExplorerContent.tsx
index 62c4b093c0..61757a35b6 100644
--- a/plugins/explore/src/components/GroupsExplorerContent/GroupsExplorerContent.tsx
+++ b/plugins/explore/src/components/GroupsExplorerContent/GroupsExplorerContent.tsx
@@ -23,13 +23,16 @@ import {
 } from '@backstage/core-components';
 import { makeStyles } from '@material-ui/core/styles';
 
-const useStyles = makeStyles({
-  root: {
-    height: '100%',
-    maxHeight: '100%',
-    minHeight: 0,
+const useStyles = makeStyles(
+  {
+    root: {
+      height: '100%',
+      maxHeight: '100%',
+      minHeight: 0,
+    },
   },
-});
+  { name: 'ExploreGroupsContent' },
+);
 
 export const GroupsExplorerContent = (props: { title?: string }) => {
   const classes = useStyles();
diff --git a/plugins/explore/src/components/ToolCard/ToolCard.tsx b/plugins/explore/src/components/ToolCard/ToolCard.tsx
index a39806dceb..c2d9079f8f 100644
--- a/plugins/explore/src/components/ToolCard/ToolCard.tsx
+++ b/plugins/explore/src/components/ToolCard/ToolCard.tsx
@@ -32,27 +32,32 @@ import React from 'react';
 
 // TODO: Align styling between Domain and ToolCard
 
-const useStyles = makeStyles<BackstageTheme>(theme => ({
-  media: {
-    height: 128,
+const useStyles = makeStyles<BackstageTheme>(
+  theme => ({
+    media: {
+      height: 128,
+    },
+    mediaContain: {
+      backgroundSize: 'contain',
+    },
+    lifecycle: {
+      lineHeight: '0.8em',
+      color: theme.palette.common.white,
+    },
+    ga: {
+      backgroundColor: theme.palette.status.ok,
+    },
+    alpha: {
+      backgroundColor: theme.palette.status.error,
+    },
+    beta: {
+      backgroundColor: theme.palette.status.warning,
+    },
+  }),
+  {
+    name: 'ExploreToolCard',
   },
-  mediaContain: {
-    backgroundSize: 'contain',
-  },
-  lifecycle: {
-    lineHeight: '0.8em',
-    color: theme.palette.common.white,
-  },
-  ga: {
-    backgroundColor: theme.palette.status.ok,
-  },
-  alpha: {
-    backgroundColor: theme.palette.status.error,
-  },
-  beta: {
-    backgroundColor: theme.palette.status.warning,
-  },
-}));
+);
 
 type Props = {
   card: ExploreTool;
diff --git a/plugins/explore/src/components/ToolSearchResultListItem/ToolSearchResultListItem.tsx b/plugins/explore/src/components/ToolSearchResultListItem/ToolSearchResultListItem.tsx
index 1aad122ee6..cb99f1c125 100644
--- a/plugins/explore/src/components/ToolSearchResultListItem/ToolSearchResultListItem.tsx
+++ b/plugins/explore/src/components/ToolSearchResultListItem/ToolSearchResultListItem.tsx
@@ -29,16 +29,19 @@ import {
 } from '@backstage/plugin-search-common';
 import { HighlightedSearchResultText } from '@backstage/plugin-search-react';
 
-const useStyles = makeStyles({
-  flexContainer: {
-    flexWrap: 'wrap',
+const useStyles = makeStyles(
+  {
+    flexContainer: {
+      flexWrap: 'wrap',
+    },
+    itemText: {
+      width: '100%',
+      wordBreak: 'break-all',
+      marginBottom: '1rem',
+    },
   },
-  itemText: {
-    width: '100%',
-    wordBreak: 'break-all',
-    marginBottom: '1rem',
-  },
-});
+  { name: 'ExploreToolSearchResultListItem' },
+);
 
 /**
  * Props for {@link ToolSearchResultListItem}.
diff --git a/plugins/firehydrant/CHANGELOG.md b/plugins/firehydrant/CHANGELOG.md
index 05b2093663..7ceb848cf8 100644
--- a/plugins/firehydrant/CHANGELOG.md
+++ b/plugins/firehydrant/CHANGELOG.md
@@ -1,5 +1,59 @@
 # @backstage/plugin-firehydrant
 
+## 0.2.8-next.2
+
+### Patch Changes
+
+- 8cec7664e146: Removed `@types/node` dependency
+- Updated dependencies
+  - @backstage/core-components@0.13.5-next.2
+  - @backstage/core-plugin-api@1.6.0-next.2
+  - @backstage/plugin-catalog-react@1.8.4-next.2
+  - @backstage/catalog-model@1.4.2-next.1
+  - @backstage/theme@0.4.1
+
+## 0.2.8-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.8.4-next.1
+  - @backstage/core-components@0.13.5-next.1
+  - @backstage/catalog-model@1.4.2-next.0
+  - @backstage/core-plugin-api@1.6.0-next.1
+  - @backstage/theme@0.4.1
+
+## 0.2.7-next.0
+
+### Patch Changes
+
+- 482bb5c0bbf8: Moved `@types/react` to be a regular dependency
+- Updated dependencies
+  - @backstage/core-plugin-api@1.6.0-next.0
+  - @backstage/core-components@0.13.5-next.0
+  - @backstage/catalog-model@1.4.1
+  - @backstage/theme@0.4.1
+  - @backstage/plugin-catalog-react@1.8.3-next.0
+
+## 0.2.5
+
+### Patch Changes
+
+- 12a8c94eda8d: Add package repository and homepage metadata
+- Updated dependencies
+  - @backstage/core-components@0.13.4
+  - @backstage/plugin-catalog-react@1.8.1
+  - @backstage/core-plugin-api@1.5.3
+  - @backstage/catalog-model@1.4.1
+  - @backstage/theme@0.4.1
+
+## 0.2.5-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.8.1-next.1
+
 ## 0.2.5-next.1
 
 ### Patch Changes
diff --git a/plugins/firehydrant/api-report.md b/plugins/firehydrant/api-report.md
index 0ff5bbc62a..76ccd8f019 100644
--- a/plugins/firehydrant/api-report.md
+++ b/plugins/firehydrant/api-report.md
@@ -7,10 +7,11 @@
 
 import { BackstagePlugin } from '@backstage/core-plugin-api';
 import { Entity } from '@backstage/catalog-model';
+import { JSX as JSX_2 } from 'react';
 import { RouteRef } from '@backstage/core-plugin-api';
 
 // @public (undocumented)
-export const FirehydrantCard: () => JSX.Element;
+export const FirehydrantCard: () => JSX_2.Element;
 
 // @public (undocumented)
 export const firehydrantPlugin: BackstagePlugin<
diff --git a/plugins/firehydrant/catalog-info.yaml b/plugins/firehydrant/catalog-info.yaml
new file mode 100644
index 0000000000..89661726d3
--- /dev/null
+++ b/plugins/firehydrant/catalog-info.yaml
@@ -0,0 +1,10 @@
+apiVersion: backstage.io/v1alpha1
+kind: Component
+metadata:
+  name: backstage-plugin-firehydrant
+  title: '@backstage/plugin-firehydrant'
+  description: A Backstage plugin that integrates towards FireHydrant
+spec:
+  lifecycle: experimental
+  type: backstage-frontend-plugin
+  owner: maintainers
diff --git a/plugins/firehydrant/package.json b/plugins/firehydrant/package.json
index b955b6e129..9c4fe73b94 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.2.5-next.1",
+  "version": "0.2.8-next.2",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
@@ -19,6 +19,7 @@
     "url": "https://github.com/backstage/backstage",
     "directory": "plugins/firehydrant"
   },
+  "sideEffects": false,
   "scripts": {
     "build": "backstage-cli package build",
     "start": "backstage-cli package start",
@@ -37,6 +38,7 @@
     "@material-ui/core": "^4.12.2",
     "@material-ui/icons": "^4.9.1",
     "@material-ui/lab": "4.0.0-alpha.61",
+    "@types/react": "^16.13.1 || ^17.0.0",
     "luxon": "^3.0.0",
     "react-use": "^17.2.4"
   },
@@ -54,8 +56,6 @@
     "@testing-library/jest-dom": "^5.10.1",
     "@testing-library/react": "^12.1.3",
     "@testing-library/user-event": "^14.0.0",
-    "@types/node": "^16.11.26",
-    "@types/react": "^16.13.1 || ^17.0.0",
     "msw": "^1.0.0"
   },
   "files": [
diff --git a/plugins/fossa/CHANGELOG.md b/plugins/fossa/CHANGELOG.md
index 60e7d48bde..98b1865011 100644
--- a/plugins/fossa/CHANGELOG.md
+++ b/plugins/fossa/CHANGELOG.md
@@ -1,5 +1,62 @@
 # @backstage/plugin-fossa
 
+## 0.2.56-next.2
+
+### Patch Changes
+
+- 8cec7664e146: Removed `@types/node` dependency
+- Updated dependencies
+  - @backstage/core-components@0.13.5-next.2
+  - @backstage/core-plugin-api@1.6.0-next.2
+  - @backstage/plugin-catalog-react@1.8.4-next.2
+  - @backstage/catalog-model@1.4.2-next.1
+  - @backstage/errors@1.2.1
+  - @backstage/theme@0.4.1
+
+## 0.2.56-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.8.4-next.1
+  - @backstage/core-components@0.13.5-next.1
+  - @backstage/catalog-model@1.4.2-next.0
+  - @backstage/core-plugin-api@1.6.0-next.1
+  - @backstage/errors@1.2.1
+  - @backstage/theme@0.4.1
+
+## 0.2.55-next.0
+
+### Patch Changes
+
+- 482bb5c0bbf8: Moved `@types/react` to be a regular dependency
+- Updated dependencies
+  - @backstage/core-plugin-api@1.6.0-next.0
+  - @backstage/core-components@0.13.5-next.0
+  - @backstage/catalog-model@1.4.1
+  - @backstage/errors@1.2.1
+  - @backstage/theme@0.4.1
+  - @backstage/plugin-catalog-react@1.8.3-next.0
+
+## 0.2.53
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.13.4
+  - @backstage/plugin-catalog-react@1.8.1
+  - @backstage/core-plugin-api@1.5.3
+  - @backstage/catalog-model@1.4.1
+  - @backstage/errors@1.2.1
+  - @backstage/theme@0.4.1
+
+## 0.2.53-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.8.1-next.1
+
 ## 0.2.53-next.0
 
 ### Patch Changes
diff --git a/plugins/fossa/api-report.md b/plugins/fossa/api-report.md
index 45f0746ac3..ac76ff6af6 100644
--- a/plugins/fossa/api-report.md
+++ b/plugins/fossa/api-report.md
@@ -7,15 +7,16 @@
 
 import { BackstagePlugin } from '@backstage/core-plugin-api';
 import { InfoCardVariants } from '@backstage/core-components';
+import { JSX as JSX_2 } from 'react';
 import { RouteRef } from '@backstage/core-plugin-api';
 
 // @public (undocumented)
 export const EntityFossaCard: (props: {
   variant?: InfoCardVariants | undefined;
-}) => JSX.Element;
+}) => JSX_2.Element;
 
 // @public (undocumented)
-export const FossaPage: (props: FossaPageProps) => JSX.Element;
+export const FossaPage: (props: FossaPageProps) => JSX_2.Element;
 
 // @public (undocumented)
 export type FossaPageProps = {
diff --git a/plugins/fossa/catalog-info.yaml b/plugins/fossa/catalog-info.yaml
new file mode 100644
index 0000000000..ac705ea660
--- /dev/null
+++ b/plugins/fossa/catalog-info.yaml
@@ -0,0 +1,10 @@
+apiVersion: backstage.io/v1alpha1
+kind: Component
+metadata:
+  name: backstage-plugin-fossa
+  title: '@backstage/plugin-fossa'
+  description: A Backstage plugin that integrates towards FOSSA
+spec:
+  lifecycle: experimental
+  type: backstage-frontend-plugin
+  owner: sda-se-reviewers
diff --git a/plugins/fossa/package.json b/plugins/fossa/package.json
index b98741390d..0d26608026 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.53-next.0",
+  "version": "0.2.56-next.2",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
@@ -23,6 +23,7 @@
     "backstage",
     "fossa"
   ],
+  "sideEffects": false,
   "scripts": {
     "build": "backstage-cli package build",
     "start": "backstage-cli package start",
@@ -42,6 +43,7 @@
     "@material-ui/core": "^4.12.2",
     "@material-ui/icons": "^4.9.1",
     "@material-ui/lab": "4.0.0-alpha.61",
+    "@types/react": "^16.13.1 || ^17.0.0",
     "cross-fetch": "^3.1.5",
     "luxon": "^3.0.0",
     "p-limit": "^3.0.2",
@@ -61,8 +63,6 @@
     "@testing-library/jest-dom": "^5.10.1",
     "@testing-library/react": "^12.1.3",
     "@testing-library/user-event": "^14.0.0",
-    "@types/node": "^16.11.26",
-    "@types/react": "^16.13.1 || ^17.0.0",
     "msw": "^1.0.0"
   },
   "files": [
diff --git a/plugins/gcalendar/CHANGELOG.md b/plugins/gcalendar/CHANGELOG.md
index 28e754125f..bb38997167 100644
--- a/plugins/gcalendar/CHANGELOG.md
+++ b/plugins/gcalendar/CHANGELOG.md
@@ -1,5 +1,49 @@
 # @backstage/plugin-gcalendar
 
+## 0.3.18-next.2
+
+### Patch Changes
+
+- 8cec7664e146: Removed `@types/node` dependency
+- 814feeed7343: Update to handle invalid luxon values
+- Updated dependencies
+  - @backstage/core-components@0.13.5-next.2
+  - @backstage/core-plugin-api@1.6.0-next.2
+  - @backstage/errors@1.2.1
+  - @backstage/theme@0.4.1
+
+## 0.3.18-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.13.5-next.1
+  - @backstage/core-plugin-api@1.6.0-next.1
+  - @backstage/errors@1.2.1
+  - @backstage/theme@0.4.1
+
+## 0.3.18-next.0
+
+### Patch Changes
+
+- 482bb5c0bbf8: Moved `@types/react` to be a regular dependency
+- Updated dependencies
+  - @backstage/core-plugin-api@1.6.0-next.0
+  - @backstage/core-components@0.13.5-next.0
+  - @backstage/errors@1.2.1
+  - @backstage/theme@0.4.1
+
+## 0.3.17
+
+### Patch Changes
+
+- 12a8c94eda8d: Add package repository and homepage metadata
+- Updated dependencies
+  - @backstage/core-components@0.13.4
+  - @backstage/core-plugin-api@1.5.3
+  - @backstage/errors@1.2.1
+  - @backstage/theme@0.4.1
+
 ## 0.3.17-next.1
 
 ### Patch Changes
diff --git a/plugins/gcalendar/api-report.md b/plugins/gcalendar/api-report.md
index 8c86e4d2c9..3f1d42d239 100644
--- a/plugins/gcalendar/api-report.md
+++ b/plugins/gcalendar/api-report.md
@@ -9,6 +9,7 @@
 import { ApiRef } from '@backstage/core-plugin-api';
 import { BackstagePlugin } from '@backstage/core-plugin-api';
 import { FetchApi } from '@backstage/core-plugin-api';
+import { JSX as JSX_2 } from 'react';
 import { OAuthApi } from '@backstage/core-plugin-api';
 import { RouteRef } from '@backstage/core-plugin-api';
 
@@ -55,7 +56,7 @@ export const gcalendarPlugin: BackstagePlugin<
 >;
 
 // @public (undocumented)
-export const HomePageCalendar: () => JSX.Element;
+export const HomePageCalendar: () => JSX_2.Element;
 
 // @public (undocumented)
 export enum ResponseStatus {
diff --git a/plugins/gcalendar/catalog-info.yaml b/plugins/gcalendar/catalog-info.yaml
new file mode 100644
index 0000000000..b0c371cf5a
--- /dev/null
+++ b/plugins/gcalendar/catalog-info.yaml
@@ -0,0 +1,9 @@
+apiVersion: backstage.io/v1alpha1
+kind: Component
+metadata:
+  name: backstage-plugin-gcalendar
+  title: '@backstage/plugin-gcalendar'
+spec:
+  lifecycle: experimental
+  type: backstage-frontend-plugin
+  owner: maintainers
diff --git a/plugins/gcalendar/dev/mocks.ts b/plugins/gcalendar/dev/mocks.ts
index c566527590..b6a9f6793c 100644
--- a/plugins/gcalendar/dev/mocks.ts
+++ b/plugins/gcalendar/dev/mocks.ts
@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 import { DateTime } from 'luxon';
 import { GCalendar, GCalendarEvent } from '../src/api';
 
@@ -38,11 +39,11 @@ export const eventsMock: GCalendarEvent[] = [...Array(3).keys()].map(i => ({
   start: {
     dateTime: DateTime.now()
       .minus({ hour: i + 1 })
-      .toISO(),
+      .toISO()!,
     timeZone: 'Europe/London',
   },
   end: {
-    dateTime: DateTime.now().minus({ hour: i }).toISO(),
+    dateTime: DateTime.now().minus({ hour: i }).toISO()!,
     timeZone: 'Europe/London',
   },
   description: '<h3>Dummy title</h3><p>Dummy description</p>',
diff --git a/plugins/gcalendar/package.json b/plugins/gcalendar/package.json
index 9cbd9e6a36..83eb43e0b2 100644
--- a/plugins/gcalendar/package.json
+++ b/plugins/gcalendar/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-gcalendar",
-  "version": "0.3.17-next.1",
+  "version": "0.3.18-next.2",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
@@ -18,6 +18,7 @@
     "url": "https://github.com/backstage/backstage",
     "directory": "plugins/gcalendar"
   },
+  "sideEffects": false,
   "scripts": {
     "start": "backstage-cli package start",
     "build": "backstage-cli package build",
@@ -37,6 +38,7 @@
     "@material-ui/lab": "4.0.0-alpha.61",
     "@maxim_mazurok/gapi.client.calendar": "^3.0.20220408",
     "@tanstack/react-query": "^4.1.3",
+    "@types/react": "^16.13.1 || ^17.0.0",
     "classnames": "^2.3.1",
     "cross-fetch": "^3.1.5",
     "dompurify": "^2.3.6",
@@ -60,8 +62,6 @@
     "@testing-library/react": "^12.1.3",
     "@testing-library/user-event": "^14.0.0",
     "@types/dompurify": "^2.3.3",
-    "@types/node": "^16.11.26",
-    "@types/react": "^16.13.1 || ^17.0.0",
     "@types/sanitize-html": "^2.6.2",
     "msw": "^1.0.0"
   },
diff --git a/plugins/gcalendar/src/components/CalendarCard/CalendarCard.tsx b/plugins/gcalendar/src/components/CalendarCard/CalendarCard.tsx
index 0a9b517293..26d6f1eed0 100644
--- a/plugins/gcalendar/src/components/CalendarCard/CalendarCard.tsx
+++ b/plugins/gcalendar/src/components/CalendarCard/CalendarCard.tsx
@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 import { sortBy } from 'lodash';
 import { DateTime } from 'luxon';
 import React, { useState } from 'react';
@@ -67,9 +68,9 @@ export const CalendarCard = () => {
     calendars,
     selectedCalendars: storedCalendars,
     enabled: isSignedIn && calendars.length > 0,
-    timeMin: date.startOf('day').toISO(),
-    timeMax: date.endOf('day').toISO(),
-    timeZone: date.zoneName,
+    timeMin: date.startOf('day').toISO()!,
+    timeMax: date.endOf('day').toISO()!,
+    timeZone: date.zoneName ?? 'UTC', // TODO: Use browser timezone? This probably never happens anyway
   });
 
   const showLoader =
diff --git a/plugins/gcalendar/src/hooks/useEventsQuery.ts b/plugins/gcalendar/src/hooks/useEventsQuery.ts
index 5dd5fb9b32..59de67a1a9 100644
--- a/plugins/gcalendar/src/hooks/useEventsQuery.ts
+++ b/plugins/gcalendar/src/hooks/useEventsQuery.ts
@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 import { compact, unescape } from 'lodash';
 import { useMemo } from 'react';
 import { useQueries } from '@tanstack/react-query';
diff --git a/plugins/gcp-projects/CHANGELOG.md b/plugins/gcp-projects/CHANGELOG.md
index f6d7773c0f..0501237d89 100644
--- a/plugins/gcp-projects/CHANGELOG.md
+++ b/plugins/gcp-projects/CHANGELOG.md
@@ -1,5 +1,43 @@
 # @backstage/plugin-gcp-projects
 
+## 0.3.41-next.2
+
+### Patch Changes
+
+- 8cec7664e146: Removed `@types/node` dependency
+- Updated dependencies
+  - @backstage/core-components@0.13.5-next.2
+  - @backstage/core-plugin-api@1.6.0-next.2
+  - @backstage/theme@0.4.1
+
+## 0.3.41-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.13.5-next.1
+  - @backstage/core-plugin-api@1.6.0-next.1
+  - @backstage/theme@0.4.1
+
+## 0.3.41-next.0
+
+### Patch Changes
+
+- 482bb5c0bbf8: Moved `@types/react` to be a regular dependency
+- Updated dependencies
+  - @backstage/core-plugin-api@1.6.0-next.0
+  - @backstage/core-components@0.13.5-next.0
+  - @backstage/theme@0.4.1
+
+## 0.3.40
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.13.4
+  - @backstage/core-plugin-api@1.5.3
+  - @backstage/theme@0.4.1
+
 ## 0.3.40-next.0
 
 ### Patch Changes
diff --git a/plugins/gcp-projects/api-report.md b/plugins/gcp-projects/api-report.md
index 5b7604c935..fd156687c0 100644
--- a/plugins/gcp-projects/api-report.md
+++ b/plugins/gcp-projects/api-report.md
@@ -7,6 +7,7 @@
 
 import { ApiRef } from '@backstage/core-plugin-api';
 import { BackstagePlugin } from '@backstage/core-plugin-api';
+import { JSX as JSX_2 } from 'react';
 import { OAuthApi } from '@backstage/core-plugin-api';
 import { RouteRef } from '@backstage/core-plugin-api';
 
@@ -40,7 +41,7 @@ export class GcpClient implements GcpApi {
 }
 
 // @public (undocumented)
-export const GcpProjectsPage: () => JSX.Element;
+export const GcpProjectsPage: () => JSX_2.Element;
 
 // @public (undocumented)
 const gcpProjectsPlugin: BackstagePlugin<
diff --git a/plugins/gcp-projects/catalog-info.yaml b/plugins/gcp-projects/catalog-info.yaml
new file mode 100644
index 0000000000..53ea7f4f50
--- /dev/null
+++ b/plugins/gcp-projects/catalog-info.yaml
@@ -0,0 +1,10 @@
+apiVersion: backstage.io/v1alpha1
+kind: Component
+metadata:
+  name: backstage-plugin-gcp-projects
+  title: '@backstage/plugin-gcp-projects'
+  description: A Backstage plugin that helps you manage projects in GCP
+spec:
+  lifecycle: experimental
+  type: backstage-frontend-plugin
+  owner: maintainers
diff --git a/plugins/gcp-projects/package.json b/plugins/gcp-projects/package.json
index 6cc12dabed..77462dc45e 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.40-next.0",
+  "version": "0.3.41-next.2",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
@@ -23,6 +23,7 @@
     "backstage",
     "google cloud"
   ],
+  "sideEffects": false,
   "scripts": {
     "build": "backstage-cli package build",
     "start": "backstage-cli package start",
@@ -39,7 +40,8 @@
     "@material-ui/core": "^4.12.2",
     "@material-ui/icons": "^4.9.1",
     "@material-ui/lab": "4.0.0-alpha.61",
-    "@react-hookz/web": "^20.0.0"
+    "@react-hookz/web": "^20.0.0",
+    "@types/react": "^16.13.1 || ^17.0.0"
   },
   "peerDependencies": {
     "react": "^16.13.1 || ^17.0.0",
@@ -55,8 +57,6 @@
     "@testing-library/jest-dom": "^5.10.1",
     "@testing-library/react": "^12.1.3",
     "@testing-library/user-event": "^14.0.0",
-    "@types/node": "^16.11.26",
-    "@types/react": "^16.13.1 || ^17.0.0",
     "cross-fetch": "^3.1.5",
     "msw": "^1.0.0"
   },
diff --git a/plugins/git-release-manager/CHANGELOG.md b/plugins/git-release-manager/CHANGELOG.md
index 50a949c70a..ec4528218d 100644
--- a/plugins/git-release-manager/CHANGELOG.md
+++ b/plugins/git-release-manager/CHANGELOG.md
@@ -1,5 +1,47 @@
 # @backstage/plugin-git-release-manager
 
+## 0.3.37-next.2
+
+### Patch Changes
+
+- 8cec7664e146: Removed `@types/node` dependency
+- Updated dependencies
+  - @backstage/core-components@0.13.5-next.2
+  - @backstage/core-plugin-api@1.6.0-next.2
+  - @backstage/integration@1.7.0-next.2
+  - @backstage/theme@0.4.1
+
+## 0.3.37-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.13.5-next.1
+  - @backstage/integration@1.7.0-next.1
+  - @backstage/core-plugin-api@1.6.0-next.1
+  - @backstage/theme@0.4.1
+
+## 0.3.36-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/integration@1.7.0-next.0
+  - @backstage/core-plugin-api@1.6.0-next.0
+  - @backstage/core-components@0.13.5-next.0
+  - @backstage/theme@0.4.1
+
+## 0.3.34
+
+### Patch Changes
+
+- 12a8c94eda8d: Add package repository and homepage metadata
+- Updated dependencies
+  - @backstage/integration@1.6.0
+  - @backstage/core-components@0.13.4
+  - @backstage/core-plugin-api@1.5.3
+  - @backstage/theme@0.4.1
+
 ## 0.3.34-next.1
 
 ### Patch Changes
diff --git a/plugins/git-release-manager/api-report.md b/plugins/git-release-manager/api-report.md
index edc2e56ad9..a3215041f0 100644
--- a/plugins/git-release-manager/api-report.md
+++ b/plugins/git-release-manager/api-report.md
@@ -142,7 +142,7 @@ export interface CreateRcOnSuccessArgs {
 // 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;
+const Differ: ({ current, next, icon }: DifferProps) => React_2.JSX.Element;
 
 // 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)
 //
@@ -156,7 +156,7 @@ const DISABLE_CACHE: {
 // 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;
+const Divider: () => React_2.JSX.Element;
 
 // Warning: (ae-forgotten-export) The symbol "SemverTagParts" needs to be exported by the entry point index.d.ts
 //
@@ -285,7 +285,9 @@ declare namespace helpers {
 }
 
 // @public (undocumented)
-const InfoCardPlus: (props: { children?: React_2.ReactNode }) => JSX.Element;
+const InfoCardPlus: (props: {
+  children?: React_2.ReactNode;
+}) => React_2.JSX.Element;
 
 declare namespace internals {
   export { components, constants, helpers, testHelpers };
@@ -311,7 +313,7 @@ function isProjectValid(project: any): project is Project;
 function LinearProgressWithLabel(props: {
   progress: number;
   responseSteps: ResponseStep[];
-}): JSX.Element;
+}): React_2.JSX.Element;
 
 // 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)
 //
@@ -523,7 +525,7 @@ const mockUsername = 'mock_username';
 // 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;
+const NoLatestRelease: () => React_2.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)
 //
@@ -601,7 +603,7 @@ const ResponseStepDialog: ({
   progress,
   responseSteps,
   title,
-}: DialogProps) => JSX.Element;
+}: DialogProps) => React_2.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 part of the package's API, but it is missing a release tag (@alpha, @beta, @public, or @internal)
@@ -613,7 +615,7 @@ const ResponseStepList: ({
   loading,
   denseList,
   children,
-}: PropsWithChildren<ResponseStepListProps>) => JSX.Element;
+}: PropsWithChildren<ResponseStepListProps>) => React_2.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 part of the package's API, but it is missing a release tag (@alpha, @beta, @public, or @internal)
@@ -622,7 +624,7 @@ const ResponseStepList: ({
 const ResponseStepListItem: ({
   responseStep,
   animationDelay,
-}: ResponseStepListItemProps) => JSX.Element;
+}: ResponseStepListItemProps) => React_2.JSX.Element;
 
 // 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)
 //
diff --git a/plugins/git-release-manager/catalog-info.yaml b/plugins/git-release-manager/catalog-info.yaml
new file mode 100644
index 0000000000..a7c21731ab
--- /dev/null
+++ b/plugins/git-release-manager/catalog-info.yaml
@@ -0,0 +1,10 @@
+apiVersion: backstage.io/v1alpha1
+kind: Component
+metadata:
+  name: backstage-plugin-git-release-manager
+  title: '@backstage/plugin-git-release-manager'
+  description: A Backstage plugin that helps you manage releases in git
+spec:
+  lifecycle: experimental
+  type: backstage-frontend-plugin
+  owner: erikengervall
diff --git a/plugins/git-release-manager/package.json b/plugins/git-release-manager/package.json
index 80d8adc301..04d1ea06a7 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.34-next.1",
+  "version": "0.3.37-next.2",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
@@ -19,6 +19,7 @@
     "url": "https://github.com/backstage/backstage",
     "directory": "plugins/git-release-manager"
   },
+  "sideEffects": false,
   "scripts": {
     "build": "backstage-cli package build",
     "start": "backstage-cli package start",
@@ -58,7 +59,6 @@
     "@testing-library/react": "^12.1.3",
     "@testing-library/react-hooks": "^8.0.0",
     "@testing-library/user-event": "^14.0.0",
-    "@types/node": "^16.11.26",
     "@types/recharts": "^1.8.15",
     "msw": "^1.0.0"
   },
diff --git a/plugins/github-actions/CHANGELOG.md b/plugins/github-actions/CHANGELOG.md
index 00da125064..5a329354f1 100644
--- a/plugins/github-actions/CHANGELOG.md
+++ b/plugins/github-actions/CHANGELOG.md
@@ -1,5 +1,67 @@
 # @backstage/plugin-github-actions
 
+## 0.6.5-next.2
+
+### Patch Changes
+
+- 8cec7664e146: Removed `@types/node` dependency
+- Updated dependencies
+  - @backstage/integration-react@1.1.19-next.2
+  - @backstage/core-components@0.13.5-next.2
+  - @backstage/core-plugin-api@1.6.0-next.2
+  - @backstage/plugin-catalog-react@1.8.4-next.2
+  - @backstage/integration@1.7.0-next.2
+  - @backstage/catalog-model@1.4.2-next.1
+  - @backstage/theme@0.4.1
+
+## 0.6.5-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.8.4-next.1
+  - @backstage/core-components@0.13.5-next.1
+  - @backstage/integration@1.7.0-next.1
+  - @backstage/integration-react@1.1.19-next.1
+  - @backstage/catalog-model@1.4.2-next.0
+  - @backstage/core-plugin-api@1.6.0-next.1
+  - @backstage/theme@0.4.1
+
+## 0.6.4-next.0
+
+### Patch Changes
+
+- 482bb5c0bbf8: Moved `@types/react` to be a regular dependency
+- Updated dependencies
+  - @backstage/integration-react@1.1.18-next.0
+  - @backstage/integration@1.7.0-next.0
+  - @backstage/core-plugin-api@1.6.0-next.0
+  - @backstage/core-components@0.13.5-next.0
+  - @backstage/catalog-model@1.4.1
+  - @backstage/theme@0.4.1
+  - @backstage/plugin-catalog-react@1.8.3-next.0
+
+## 0.6.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/integration-react@1.1.16
+  - @backstage/integration@1.6.0
+  - @backstage/core-components@0.13.4
+  - @backstage/plugin-catalog-react@1.8.1
+  - @backstage/core-plugin-api@1.5.3
+  - @backstage/catalog-model@1.4.1
+  - @backstage/theme@0.4.1
+
+## 0.6.2-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.8.1-next.1
+  - @backstage/integration-react@1.1.16-next.1
+
 ## 0.6.2-next.1
 
 ### Patch Changes
diff --git a/plugins/github-actions/api-report.md b/plugins/github-actions/api-report.md
index 0c9d06d90e..e7c6114c93 100644
--- a/plugins/github-actions/api-report.md
+++ b/plugins/github-actions/api-report.md
@@ -10,6 +10,8 @@ import { BackstagePlugin } from '@backstage/core-plugin-api';
 import { ConfigApi } from '@backstage/core-plugin-api';
 import { Entity } from '@backstage/catalog-model';
 import { InfoCardVariants } from '@backstage/core-components';
+import { JSX as JSX_2 } from 'react';
+import { default as React_2 } from 'react';
 import { RestEndpointMethodTypes } from '@octokit/rest';
 import { RouteRef } from '@backstage/core-plugin-api';
 import { ScmAuthApi } from '@backstage/integration-react';
@@ -27,19 +29,19 @@ export enum BuildStatus {
 }
 
 // @public (undocumented)
-export const EntityGithubActionsContent: () => JSX.Element;
+export const EntityGithubActionsContent: () => JSX_2.Element;
 
 // @public (undocumented)
 export const EntityLatestGithubActionRunCard: (props: {
   branch: string;
   variant?: InfoCardVariants | undefined;
-}) => JSX.Element;
+}) => JSX_2.Element;
 
 // @public (undocumented)
 export const EntityLatestGithubActionsForBranchCard: (props: {
   branch: string;
   variant?: InfoCardVariants | undefined;
-}) => JSX.Element;
+}) => JSX_2.Element;
 
 // @public (undocumented)
 export const EntityRecentGithubActionsRunsCard: (props: {
@@ -47,7 +49,7 @@ export const EntityRecentGithubActionsRunsCard: (props: {
   dense?: boolean | undefined;
   limit?: number | undefined;
   variant?: InfoCardVariants | undefined;
-}) => JSX.Element;
+}) => JSX_2.Element;
 
 // @public (undocumented)
 export const GITHUB_ACTIONS_ANNOTATION = 'github.com/project-slug';
@@ -208,13 +210,13 @@ export type Jobs = {
 export const LatestWorkflowRunCard: (props: {
   branch: string;
   variant?: InfoCardVariants;
-}) => JSX.Element;
+}) => React_2.JSX.Element;
 
 // @public (undocumented)
 export const LatestWorkflowsForBranchCard: (props: {
   branch: string;
   variant?: InfoCardVariants;
-}) => JSX.Element;
+}) => React_2.JSX.Element;
 
 // @public (undocumented)
 export const RecentWorkflowRunsCard: (props: {
@@ -222,10 +224,10 @@ export const RecentWorkflowRunsCard: (props: {
   dense?: boolean;
   limit?: number;
   variant?: InfoCardVariants;
-}) => JSX.Element;
+}) => React_2.JSX.Element;
 
 // @public (undocumented)
-export const Router: () => JSX.Element;
+export const Router: () => React_2.JSX.Element;
 
 // @public (undocumented)
 export type Step = {
diff --git a/plugins/github-actions/catalog-info.yaml b/plugins/github-actions/catalog-info.yaml
new file mode 100644
index 0000000000..712b2f4be5
--- /dev/null
+++ b/plugins/github-actions/catalog-info.yaml
@@ -0,0 +1,10 @@
+apiVersion: backstage.io/v1alpha1
+kind: Component
+metadata:
+  name: backstage-plugin-github-actions
+  title: '@backstage/plugin-github-actions'
+  description: A Backstage plugin that integrates towards GitHub Actions
+spec:
+  lifecycle: experimental
+  type: backstage-frontend-plugin
+  owner: maintainers
diff --git a/plugins/github-actions/package.json b/plugins/github-actions/package.json
index 664da9fc91..d78cd363d0 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.6.2-next.1",
+  "version": "0.6.5-next.2",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
@@ -24,6 +24,7 @@
     "github",
     "github actions"
   ],
+  "sideEffects": false,
   "scripts": {
     "build": "backstage-cli package build",
     "start": "backstage-cli package start",
@@ -45,6 +46,7 @@
     "@material-ui/icons": "^4.9.1",
     "@material-ui/lab": "4.0.0-alpha.61",
     "@octokit/rest": "^19.0.3",
+    "@types/react": "^16.13.1 || ^17.0.0",
     "git-url-parse": "^13.0.0",
     "luxon": "^3.0.0",
     "react-use": "^17.2.4"
@@ -63,8 +65,6 @@
     "@testing-library/jest-dom": "^5.10.1",
     "@testing-library/react": "^12.1.3",
     "@testing-library/user-event": "^14.0.0",
-    "@types/node": "^16.11.26",
-    "@types/react": "^16.13.1 || ^17.0.0",
     "cross-fetch": "^3.1.5",
     "msw": "^1.0.0"
   },
diff --git a/plugins/github-deployments/CHANGELOG.md b/plugins/github-deployments/CHANGELOG.md
index 949c221a1f..e11f57d78e 100644
--- a/plugins/github-deployments/CHANGELOG.md
+++ b/plugins/github-deployments/CHANGELOG.md
@@ -1,5 +1,72 @@
 # @backstage/plugin-github-deployments
 
+## 0.1.55-next.2
+
+### Patch Changes
+
+- 8cec7664e146: Removed `@types/node` dependency
+- Updated dependencies
+  - @backstage/integration-react@1.1.19-next.2
+  - @backstage/core-components@0.13.5-next.2
+  - @backstage/core-plugin-api@1.6.0-next.2
+  - @backstage/plugin-catalog-react@1.8.4-next.2
+  - @backstage/integration@1.7.0-next.2
+  - @backstage/catalog-model@1.4.2-next.1
+  - @backstage/errors@1.2.1
+  - @backstage/theme@0.4.1
+
+## 0.1.55-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.8.4-next.1
+  - @backstage/core-components@0.13.5-next.1
+  - @backstage/integration@1.7.0-next.1
+  - @backstage/integration-react@1.1.19-next.1
+  - @backstage/catalog-model@1.4.2-next.0
+  - @backstage/core-plugin-api@1.6.0-next.1
+  - @backstage/errors@1.2.1
+  - @backstage/theme@0.4.1
+
+## 0.1.54-next.0
+
+### Patch Changes
+
+- 482bb5c0bbf8: Moved `@types/react` to be a regular dependency
+- Updated dependencies
+  - @backstage/integration-react@1.1.18-next.0
+  - @backstage/integration@1.7.0-next.0
+  - @backstage/core-plugin-api@1.6.0-next.0
+  - @backstage/core-components@0.13.5-next.0
+  - @backstage/catalog-model@1.4.1
+  - @backstage/errors@1.2.1
+  - @backstage/theme@0.4.1
+  - @backstage/plugin-catalog-react@1.8.3-next.0
+
+## 0.1.52
+
+### Patch Changes
+
+- 12a8c94eda8d: Add package repository and homepage metadata
+- Updated dependencies
+  - @backstage/integration-react@1.1.16
+  - @backstage/integration@1.6.0
+  - @backstage/core-components@0.13.4
+  - @backstage/plugin-catalog-react@1.8.1
+  - @backstage/core-plugin-api@1.5.3
+  - @backstage/catalog-model@1.4.1
+  - @backstage/errors@1.2.1
+  - @backstage/theme@0.4.1
+
+## 0.1.52-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.8.1-next.1
+  - @backstage/integration-react@1.1.16-next.1
+
 ## 0.1.52-next.1
 
 ### Patch Changes
diff --git a/plugins/github-deployments/api-report.md b/plugins/github-deployments/api-report.md
index 82d2222127..669bcd74ba 100644
--- a/plugins/github-deployments/api-report.md
+++ b/plugins/github-deployments/api-report.md
@@ -7,6 +7,8 @@
 
 import { BackstagePlugin } from '@backstage/core-plugin-api';
 import { Entity } from '@backstage/catalog-model';
+import { JSX as JSX_2 } from 'react';
+import { default as React_2 } from 'react';
 import { TableColumn } from '@backstage/core-components';
 
 // @public (undocumented)
@@ -14,7 +16,7 @@ export const EntityGithubDeploymentsCard: (props: {
   last?: number | undefined;
   lastStatuses?: number | undefined;
   columns?: TableColumn<GithubDeployment>[] | undefined;
-}) => JSX.Element;
+}) => JSX_2.Element;
 
 // @public (undocumented)
 export const GITHUB_PROJECT_SLUG_ANNOTATION = 'github.com/project-slug';
@@ -50,7 +52,7 @@ export const GithubDeploymentsTable: {
     isLoading: boolean;
     reload: () => void;
     columns: TableColumn<GithubDeployment>[];
-  }): JSX.Element;
+  }): React_2.JSX.Element;
   columns: Readonly<{
     createEnvironmentColumn(): TableColumn<GithubDeployment>;
     createStatusColumn(): TableColumn<GithubDeployment>;
diff --git a/plugins/github-deployments/catalog-info.yaml b/plugins/github-deployments/catalog-info.yaml
new file mode 100644
index 0000000000..43b901252f
--- /dev/null
+++ b/plugins/github-deployments/catalog-info.yaml
@@ -0,0 +1,10 @@
+apiVersion: backstage.io/v1alpha1
+kind: Component
+metadata:
+  name: backstage-plugin-github-deployments
+  title: '@backstage/plugin-github-deployments'
+  description: A Backstage plugin that integrates towards GitHub Deployments
+spec:
+  lifecycle: experimental
+  type: backstage-frontend-plugin
+  owner: maintainers
diff --git a/plugins/github-deployments/package.json b/plugins/github-deployments/package.json
index 1a31fab535..12f3d52328 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.52-next.1",
+  "version": "0.1.55-next.2",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
@@ -19,6 +19,7 @@
     "url": "https://github.com/backstage/backstage",
     "directory": "plugins/github-deployments"
   },
+  "sideEffects": false,
   "scripts": {
     "build": "backstage-cli package build",
     "start": "backstage-cli package start",
@@ -41,6 +42,7 @@
     "@material-ui/icons": "^4.9.1",
     "@material-ui/lab": "4.0.0-alpha.61",
     "@octokit/graphql": "^5.0.0",
+    "@types/react": "^16.13.1 || ^17.0.0",
     "luxon": "^3.0.0",
     "react-use": "^17.2.4"
   },
@@ -58,8 +60,6 @@
     "@testing-library/jest-dom": "^5.10.1",
     "@testing-library/react": "^12.1.3",
     "@testing-library/user-event": "^14.0.0",
-    "@types/node": "^16.11.26",
-    "@types/react": "^16.13.1 || ^17.0.0",
     "msw": "^1.0.0"
   },
   "files": [
diff --git a/plugins/github-issues/CHANGELOG.md b/plugins/github-issues/CHANGELOG.md
index 985b114cb1..915b93c63a 100644
--- a/plugins/github-issues/CHANGELOG.md
+++ b/plugins/github-issues/CHANGELOG.md
@@ -1,5 +1,67 @@
 # @backstage/plugin-github-issues
 
+## 0.2.13-next.2
+
+### Patch Changes
+
+- 8cec7664e146: Removed `@types/node` dependency
+- Updated dependencies
+  - @backstage/core-components@0.13.5-next.2
+  - @backstage/core-plugin-api@1.6.0-next.2
+  - @backstage/plugin-catalog-react@1.8.4-next.2
+  - @backstage/integration@1.7.0-next.2
+  - @backstage/catalog-model@1.4.2-next.1
+  - @backstage/errors@1.2.1
+  - @backstage/theme@0.4.1
+
+## 0.2.13-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.8.4-next.1
+  - @backstage/core-components@0.13.5-next.1
+  - @backstage/integration@1.7.0-next.1
+  - @backstage/catalog-model@1.4.2-next.0
+  - @backstage/core-plugin-api@1.6.0-next.1
+  - @backstage/errors@1.2.1
+  - @backstage/theme@0.4.1
+
+## 0.2.12-next.0
+
+### Patch Changes
+
+- 482bb5c0bbf8: Moved `@types/react` to be a regular dependency
+- Updated dependencies
+  - @backstage/integration@1.7.0-next.0
+  - @backstage/core-plugin-api@1.6.0-next.0
+  - @backstage/core-components@0.13.5-next.0
+  - @backstage/catalog-model@1.4.1
+  - @backstage/errors@1.2.1
+  - @backstage/theme@0.4.1
+  - @backstage/plugin-catalog-react@1.8.3-next.0
+
+## 0.2.10
+
+### Patch Changes
+
+- 12a8c94eda8d: Add package repository and homepage metadata
+- Updated dependencies
+  - @backstage/integration@1.6.0
+  - @backstage/core-components@0.13.4
+  - @backstage/plugin-catalog-react@1.8.1
+  - @backstage/core-plugin-api@1.5.3
+  - @backstage/catalog-model@1.4.1
+  - @backstage/errors@1.2.1
+  - @backstage/theme@0.4.1
+
+## 0.2.10-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.8.1-next.1
+
 ## 0.2.10-next.1
 
 ### Patch Changes
diff --git a/plugins/github-issues/api-report.md b/plugins/github-issues/api-report.md
index 4e57eeda46..3c7b616f82 100644
--- a/plugins/github-issues/api-report.md
+++ b/plugins/github-issues/api-report.md
@@ -6,6 +6,7 @@
 /// <reference types="react" />
 
 import { BackstagePlugin } from '@backstage/core-plugin-api';
+import { JSX as JSX_2 } from 'react';
 import { RouteRef } from '@backstage/core-plugin-api';
 
 // @public (undocumented)
@@ -17,7 +18,7 @@ export interface GithubIssuesByRepoOptions {
 }
 
 // @public (undocumented)
-export const GithubIssuesCard: (props: GithubIssuesProps) => JSX.Element;
+export const GithubIssuesCard: (props: GithubIssuesProps) => JSX_2.Element;
 
 // @public (undocumented)
 export interface GithubIssuesFilters {
@@ -44,7 +45,7 @@ export interface GithubIssuesOrdering {
 }
 
 // @public (undocumented)
-export const GithubIssuesPage: (props: GithubIssuesProps) => JSX.Element;
+export const GithubIssuesPage: (props: GithubIssuesProps) => JSX_2.Element;
 
 // @public (undocumented)
 export const githubIssuesPlugin: BackstagePlugin<
diff --git a/plugins/github-issues/catalog-info.yaml b/plugins/github-issues/catalog-info.yaml
new file mode 100644
index 0000000000..252bfe2a67
--- /dev/null
+++ b/plugins/github-issues/catalog-info.yaml
@@ -0,0 +1,9 @@
+apiVersion: backstage.io/v1alpha1
+kind: Component
+metadata:
+  name: backstage-plugin-github-issues
+  title: '@backstage/plugin-github-issues'
+spec:
+  lifecycle: experimental
+  type: backstage-frontend-plugin
+  owner: maintainers
diff --git a/plugins/github-issues/package.json b/plugins/github-issues/package.json
index 179364a725..ea499e4c43 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.10-next.1",
+  "version": "0.2.13-next.2",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
@@ -18,6 +18,7 @@
     "url": "https://github.com/backstage/backstage",
     "directory": "plugins/github-issues"
   },
+  "sideEffects": false,
   "scripts": {
     "start": "backstage-cli package start",
     "build": "backstage-cli package build",
@@ -38,6 +39,7 @@
     "@material-ui/core": "^4.12.4",
     "@material-ui/icons": "^4.9.1",
     "@material-ui/lab": "4.0.0-alpha.61",
+    "@types/react": "^16.13.1 || ^17.0.0",
     "luxon": "^3.0.0",
     "octokit": "^2.0.4",
     "react-use": "^17.4.0"
@@ -56,8 +58,6 @@
     "@testing-library/jest-dom": "^5.10.1",
     "@testing-library/react": "^12.1.3",
     "@testing-library/user-event": "^14.0.0",
-    "@types/node": "*",
-    "@types/react": "^16.13.1 || ^17.0.0",
     "msw": "^1.0.0"
   },
   "files": [
diff --git a/plugins/github-pull-requests-board/CHANGELOG.md b/plugins/github-pull-requests-board/CHANGELOG.md
index 4f27413a0c..582e6d9d3e 100644
--- a/plugins/github-pull-requests-board/CHANGELOG.md
+++ b/plugins/github-pull-requests-board/CHANGELOG.md
@@ -1,5 +1,62 @@
 # @backstage/plugin-github-pull-requests-board
 
+## 0.1.18-next.2
+
+### Patch Changes
+
+- 8cec7664e146: Removed `@types/node` dependency
+- Updated dependencies
+  - @backstage/core-components@0.13.5-next.2
+  - @backstage/core-plugin-api@1.6.0-next.2
+  - @backstage/plugin-catalog-react@1.8.4-next.2
+  - @backstage/integration@1.7.0-next.2
+  - @backstage/catalog-model@1.4.2-next.1
+  - @backstage/theme@0.4.1
+
+## 0.1.18-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.8.4-next.1
+  - @backstage/core-components@0.13.5-next.1
+  - @backstage/integration@1.7.0-next.1
+  - @backstage/catalog-model@1.4.2-next.0
+  - @backstage/core-plugin-api@1.6.0-next.1
+  - @backstage/theme@0.4.1
+
+## 0.1.17-next.0
+
+### Patch Changes
+
+- 482bb5c0bbf8: Moved `@types/react` to be a regular dependency
+- Updated dependencies
+  - @backstage/integration@1.7.0-next.0
+  - @backstage/core-plugin-api@1.6.0-next.0
+  - @backstage/core-components@0.13.5-next.0
+  - @backstage/catalog-model@1.4.1
+  - @backstage/theme@0.4.1
+  - @backstage/plugin-catalog-react@1.8.3-next.0
+
+## 0.1.15
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/integration@1.6.0
+  - @backstage/core-components@0.13.4
+  - @backstage/plugin-catalog-react@1.8.1
+  - @backstage/core-plugin-api@1.5.3
+  - @backstage/catalog-model@1.4.1
+  - @backstage/theme@0.4.1
+
+## 0.1.15-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.8.1-next.1
+
 ## 0.1.15-next.0
 
 ### Patch Changes
diff --git a/plugins/github-pull-requests-board/api-report.md b/plugins/github-pull-requests-board/api-report.md
index 81097118af..24a8f4d926 100644
--- a/plugins/github-pull-requests-board/api-report.md
+++ b/plugins/github-pull-requests-board/api-report.md
@@ -5,10 +5,12 @@
 ```ts
 /// <reference types="react" />
 
+import { JSX as JSX_2 } from 'react';
+
 // @public (undocumented)
 export const EntityTeamPullRequestsCard: (
   props: EntityTeamPullRequestsCardProps,
-) => JSX.Element;
+) => JSX_2.Element;
 
 // @public (undocumented)
 export interface EntityTeamPullRequestsCardProps {
@@ -19,7 +21,7 @@ export interface EntityTeamPullRequestsCardProps {
 // @public (undocumented)
 export const EntityTeamPullRequestsContent: (
   props: EntityTeamPullRequestsContentProps,
-) => JSX.Element;
+) => JSX_2.Element;
 
 // @public (undocumented)
 export interface EntityTeamPullRequestsContentProps {
diff --git a/plugins/github-pull-requests-board/catalog-info.yaml b/plugins/github-pull-requests-board/catalog-info.yaml
new file mode 100644
index 0000000000..c94722d538
--- /dev/null
+++ b/plugins/github-pull-requests-board/catalog-info.yaml
@@ -0,0 +1,12 @@
+apiVersion: backstage.io/v1alpha1
+kind: Component
+metadata:
+  name: backstage-plugin-github-pull-requests-board
+  title: '@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
+spec:
+  lifecycle: experimental
+  type: backstage-frontend-plugin
+  owner: maintainers
diff --git a/plugins/github-pull-requests-board/package.json b/plugins/github-pull-requests-board/package.json
index 614abfb617..2accb513b3 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.15-next.0",
+  "version": "0.1.18-next.2",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
@@ -24,6 +24,7 @@
     "github",
     "pull requests"
   ],
+  "sideEffects": false,
   "scripts": {
     "build": "backstage-cli package build",
     "start": "backstage-cli package start",
@@ -44,6 +45,7 @@
     "@material-ui/icons": "^4.9.1",
     "@material-ui/lab": "4.0.0-alpha.61",
     "@octokit/rest": "^19.0.3",
+    "@types/react": "^16.13.1 || ^17.0.0",
     "luxon": "^3.0.0",
     "p-limit": "^4.0.0",
     "react-use": "^17.2.4"
@@ -61,8 +63,6 @@
     "@testing-library/jest-dom": "^5.10.1",
     "@testing-library/react": "^12.1.3",
     "@testing-library/user-event": "^14.0.0",
-    "@types/node": "^16.11.26",
-    "@types/react": "^16.13.1 || ^17.0.0",
     "msw": "^1.0.0"
   },
   "files": [
diff --git a/plugins/gitops-profiles/CHANGELOG.md b/plugins/gitops-profiles/CHANGELOG.md
index e816fa3553..e06d22ec9d 100644
--- a/plugins/gitops-profiles/CHANGELOG.md
+++ b/plugins/gitops-profiles/CHANGELOG.md
@@ -1,5 +1,47 @@
 # @backstage/plugin-gitops-profiles
 
+## 0.3.40-next.2
+
+### Patch Changes
+
+- 8cec7664e146: Removed `@types/node` dependency
+- Updated dependencies
+  - @backstage/core-components@0.13.5-next.2
+  - @backstage/core-plugin-api@1.6.0-next.2
+  - @backstage/config@1.1.0-next.1
+  - @backstage/theme@0.4.1
+
+## 0.3.40-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.13.5-next.1
+  - @backstage/config@1.1.0-next.0
+  - @backstage/core-plugin-api@1.6.0-next.1
+  - @backstage/theme@0.4.1
+
+## 0.3.40-next.0
+
+### Patch Changes
+
+- 482bb5c0bbf8: Moved `@types/react` to be a regular dependency
+- Updated dependencies
+  - @backstage/core-plugin-api@1.6.0-next.0
+  - @backstage/core-components@0.13.5-next.0
+  - @backstage/config@1.0.8
+  - @backstage/theme@0.4.1
+
+## 0.3.39
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.13.4
+  - @backstage/core-plugin-api@1.5.3
+  - @backstage/config@1.0.8
+  - @backstage/theme@0.4.1
+
 ## 0.3.39-next.0
 
 ### Patch Changes
diff --git a/plugins/gitops-profiles/api-report.md b/plugins/gitops-profiles/api-report.md
index 9449417bba..3dc3c9add2 100644
--- a/plugins/gitops-profiles/api-report.md
+++ b/plugins/gitops-profiles/api-report.md
@@ -7,6 +7,7 @@
 
 import { ApiRef } from '@backstage/core-plugin-api';
 import { BackstagePlugin } from '@backstage/core-plugin-api';
+import { JSX as JSX_2 } from 'react';
 import { RouteRef } from '@backstage/core-plugin-api';
 
 // @public (undocumented)
@@ -105,13 +106,13 @@ export type GitOpsApi = {
 export const gitOpsApiRef: ApiRef<GitOpsApi>;
 
 // @public (undocumented)
-export const GitopsProfilesClusterListPage: () => JSX.Element;
+export const GitopsProfilesClusterListPage: () => JSX_2.Element;
 
 // @public (undocumented)
-export const GitopsProfilesClusterPage: () => JSX.Element;
+export const GitopsProfilesClusterPage: () => JSX_2.Element;
 
 // @public (undocumented)
-export const GitopsProfilesCreatePage: () => JSX.Element;
+export const GitopsProfilesCreatePage: () => JSX_2.Element;
 
 // @public (undocumented)
 const gitopsProfilesPlugin: BackstagePlugin<
diff --git a/plugins/gitops-profiles/catalog-info.yaml b/plugins/gitops-profiles/catalog-info.yaml
new file mode 100644
index 0000000000..9c8d04d5a5
--- /dev/null
+++ b/plugins/gitops-profiles/catalog-info.yaml
@@ -0,0 +1,10 @@
+apiVersion: backstage.io/v1alpha1
+kind: Component
+metadata:
+  name: backstage-plugin-gitops-profiles
+  title: '@backstage/plugin-gitops-profiles'
+  description: A Backstage plugin that helps you manage GitOps profiles
+spec:
+  lifecycle: experimental
+  type: backstage-frontend-plugin
+  owner: maintainers
diff --git a/plugins/gitops-profiles/package.json b/plugins/gitops-profiles/package.json
index 6e265197d8..9d650c007d 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.39-next.0",
+  "version": "0.3.40-next.2",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
@@ -23,6 +23,7 @@
     "backstage",
     "gitops"
   ],
+  "sideEffects": false,
   "scripts": {
     "build": "backstage-cli package build",
     "start": "backstage-cli package start",
@@ -40,6 +41,7 @@
     "@material-ui/core": "^4.12.2",
     "@material-ui/icons": "^4.9.1",
     "@material-ui/lab": "4.0.0-alpha.61",
+    "@types/react": "^16.13.1 || ^17.0.0",
     "react-use": "^17.2.4"
   },
   "peerDependencies": {
@@ -56,8 +58,6 @@
     "@testing-library/jest-dom": "^5.10.1",
     "@testing-library/react": "^12.1.3",
     "@testing-library/user-event": "^14.0.0",
-    "@types/node": "^16.11.26",
-    "@types/react": "^16.13.1 || ^17.0.0",
     "cross-fetch": "^3.1.5",
     "msw": "^1.0.0"
   },
diff --git a/plugins/gocd/CHANGELOG.md b/plugins/gocd/CHANGELOG.md
index 4f1ba08f4b..761f97e433 100644
--- a/plugins/gocd/CHANGELOG.md
+++ b/plugins/gocd/CHANGELOG.md
@@ -1,5 +1,61 @@
 # @backstage/plugin-gocd
 
+## 0.1.30-next.2
+
+### Patch Changes
+
+- 8cec7664e146: Removed `@types/node` dependency
+- Updated dependencies
+  - @backstage/core-components@0.13.5-next.2
+  - @backstage/core-plugin-api@1.6.0-next.2
+  - @backstage/plugin-catalog-react@1.8.4-next.2
+  - @backstage/catalog-model@1.4.2-next.1
+  - @backstage/errors@1.2.1
+  - @backstage/theme@0.4.1
+
+## 0.1.30-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.8.4-next.1
+  - @backstage/core-components@0.13.5-next.1
+  - @backstage/catalog-model@1.4.2-next.0
+  - @backstage/core-plugin-api@1.6.0-next.1
+  - @backstage/errors@1.2.1
+  - @backstage/theme@0.4.1
+
+## 0.1.29-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-plugin-api@1.6.0-next.0
+  - @backstage/core-components@0.13.5-next.0
+  - @backstage/catalog-model@1.4.1
+  - @backstage/errors@1.2.1
+  - @backstage/theme@0.4.1
+  - @backstage/plugin-catalog-react@1.8.3-next.0
+
+## 0.1.27
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.13.4
+  - @backstage/plugin-catalog-react@1.8.1
+  - @backstage/core-plugin-api@1.5.3
+  - @backstage/catalog-model@1.4.1
+  - @backstage/errors@1.2.1
+  - @backstage/theme@0.4.1
+
+## 0.1.27-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.8.1-next.1
+
 ## 0.1.27-next.0
 
 ### Patch Changes
diff --git a/plugins/gocd/catalog-info.yaml b/plugins/gocd/catalog-info.yaml
new file mode 100644
index 0000000000..ec85e55f61
--- /dev/null
+++ b/plugins/gocd/catalog-info.yaml
@@ -0,0 +1,10 @@
+apiVersion: backstage.io/v1alpha1
+kind: Component
+metadata:
+  name: backstage-plugin-gocd
+  title: '@backstage/plugin-gocd'
+  description: A Backstage plugin that integrates towards GoCD
+spec:
+  lifecycle: experimental
+  type: backstage-frontend-plugin
+  owner: maintainers
diff --git a/plugins/gocd/package.json b/plugins/gocd/package.json
index bd34adf50a..e76cdf4d83 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.27-next.0",
+  "version": "0.1.30-next.2",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
@@ -19,6 +19,7 @@
     "url": "https://github.com/backstage/backstage",
     "directory": "plugins/gocd"
   },
+  "sideEffects": false,
   "scripts": {
     "build": "backstage-cli package build",
     "start": "backstage-cli package start",
@@ -59,7 +60,6 @@
     "@testing-library/user-event": "^14.0.0",
     "@types/lodash": "^4.14.173",
     "@types/luxon": "^3.0.0",
-    "@types/node": "^16.11.26",
     "@types/react": "^16.13.1 || ^17.0.0",
     "msw": "^1.0.0"
   },
diff --git a/plugins/graphiql/CHANGELOG.md b/plugins/graphiql/CHANGELOG.md
index cf61708984..8602d67de0 100644
--- a/plugins/graphiql/CHANGELOG.md
+++ b/plugins/graphiql/CHANGELOG.md
@@ -1,5 +1,43 @@
 # @backstage/plugin-graphiql
 
+## 0.2.54-next.2
+
+### Patch Changes
+
+- 8cec7664e146: Removed `@types/node` dependency
+- Updated dependencies
+  - @backstage/core-components@0.13.5-next.2
+  - @backstage/core-plugin-api@1.6.0-next.2
+  - @backstage/theme@0.4.1
+
+## 0.2.54-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.13.5-next.1
+  - @backstage/core-plugin-api@1.6.0-next.1
+  - @backstage/theme@0.4.1
+
+## 0.2.54-next.0
+
+### Patch Changes
+
+- 482bb5c0bbf8: Moved `@types/react` to be a regular dependency
+- Updated dependencies
+  - @backstage/core-plugin-api@1.6.0-next.0
+  - @backstage/core-components@0.13.5-next.0
+  - @backstage/theme@0.4.1
+
+## 0.2.53
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.13.4
+  - @backstage/core-plugin-api@1.5.3
+  - @backstage/theme@0.4.1
+
 ## 0.2.53-next.0
 
 ### Patch Changes
diff --git a/plugins/graphiql/alpha-api-report.md b/plugins/graphiql/alpha-api-report.md
new file mode 100644
index 0000000000..31bad223b1
--- /dev/null
+++ b/plugins/graphiql/alpha-api-report.md
@@ -0,0 +1,33 @@
+## API Report File for "@backstage/plugin-graphiql"
+
+> Do not edit this file. It is a report generated by [API Extractor](https://api-extractor.com/).
+
+```ts
+import { BackstagePlugin } from '@backstage/frontend-plugin-api';
+import { Extension } from '@backstage/frontend-plugin-api';
+import { GraphQLEndpoint } from '@backstage/plugin-graphiql';
+import { PortableSchema } from '@backstage/frontend-plugin-api';
+
+// @alpha (undocumented)
+export function createEndpointExtension<TConfig extends {}>(options: {
+  id: string;
+  configSchema?: PortableSchema<TConfig>;
+  factory: (options: { config: TConfig }) => {
+    endpoint: GraphQLEndpoint;
+  };
+}): Extension<TConfig>;
+
+// @alpha (undocumented)
+const _default: BackstagePlugin;
+export default _default;
+
+// @alpha (undocumented)
+export const graphiqlBrowseApi: Extension<{}>;
+
+// @alpha (undocumented)
+export const GraphiqlPage: Extension<{
+  path: string;
+}>;
+
+// (No @packageDocumentation comment for this package)
+```
diff --git a/plugins/graphiql/api-report.md b/plugins/graphiql/api-report.md
index ea765d4d2b..788551476a 100644
--- a/plugins/graphiql/api-report.md
+++ b/plugins/graphiql/api-report.md
@@ -9,7 +9,9 @@ import { ApiRef } from '@backstage/core-plugin-api';
 import { BackstagePlugin } from '@backstage/core-plugin-api';
 import { ErrorApi } from '@backstage/core-plugin-api';
 import { IconComponent } from '@backstage/core-plugin-api';
+import { JSX as JSX_2 } from 'react';
 import { OAuthApi } from '@backstage/core-plugin-api';
+import { default as React_2 } from 'react';
 import { RouteRef } from '@backstage/core-plugin-api';
 
 // @public
@@ -36,7 +38,7 @@ export type GithubEndpointConfig = {
 export const GraphiQLIcon: IconComponent;
 
 // @public (undocumented)
-export const GraphiQLPage: () => JSX.Element;
+export const GraphiQLPage: () => JSX_2.Element;
 
 // @public (undocumented)
 const graphiqlPlugin: BackstagePlugin<{}, {}, {}>;
@@ -73,7 +75,7 @@ export class GraphQLEndpoints implements GraphQLBrowseApi {
 }
 
 // @public (undocumented)
-export const Router: () => JSX.Element;
+export const Router: () => React_2.JSX.Element;
 
 // (No @packageDocumentation comment for this package)
 ```
diff --git a/plugins/graphiql/catalog-info.yaml b/plugins/graphiql/catalog-info.yaml
new file mode 100644
index 0000000000..628d6d633e
--- /dev/null
+++ b/plugins/graphiql/catalog-info.yaml
@@ -0,0 +1,10 @@
+apiVersion: backstage.io/v1alpha1
+kind: Component
+metadata:
+  name: backstage-plugin-graphiql
+  title: '@backstage/plugin-graphiql'
+  description: Backstage plugin for browsing GraphQL APIs
+spec:
+  lifecycle: experimental
+  type: backstage-frontend-plugin
+  owner: maintainers
diff --git a/plugins/graphiql/package.json b/plugins/graphiql/package.json
index c96a43576a..da12ebe67d 100644
--- a/plugins/graphiql/package.json
+++ b/plugins/graphiql/package.json
@@ -1,11 +1,9 @@
 {
   "name": "@backstage/plugin-graphiql",
   "description": "Backstage plugin for browsing GraphQL APIs",
-  "version": "0.2.53-next.0",
+  "version": "0.2.54-next.2",
   "publishConfig": {
-    "access": "public",
-    "main": "dist/index.esm.js",
-    "types": "dist/index.d.ts"
+    "access": "public"
   },
   "backstage": {
     "role": "frontend-plugin"
@@ -19,9 +17,25 @@
   "keywords": [
     "backstage"
   ],
+  "exports": {
+    ".": "./src/index.ts",
+    "./alpha": "./src/alpha.tsx",
+    "./package.json": "./package.json"
+  },
+  "typesVersions": {
+    "*": {
+      "alpha": [
+        "src/alpha.tsx"
+      ],
+      "package.json": [
+        "package.json"
+      ]
+    }
+  },
   "license": "Apache-2.0",
   "main": "src/index.ts",
   "types": "src/index.ts",
+  "sideEffects": false,
   "scripts": {
     "build": "backstage-cli package build",
     "start": "backstage-cli package start",
@@ -34,10 +48,12 @@
   "dependencies": {
     "@backstage/core-components": "workspace:^",
     "@backstage/core-plugin-api": "workspace:^",
+    "@backstage/frontend-plugin-api": "workspace:^",
     "@backstage/theme": "workspace:^",
     "@material-ui/core": "^4.12.2",
     "@material-ui/icons": "^4.9.1",
     "@material-ui/lab": "4.0.0-alpha.61",
+    "@types/react": "^16.13.1 || ^17.0.0",
     "graphiql": "^1.5.12",
     "graphql": "^16.0.0",
     "graphql-ws": "^5.4.1",
@@ -58,8 +74,6 @@
     "@testing-library/react": "^12.1.3",
     "@testing-library/user-event": "^14.0.0",
     "@types/codemirror": "^5.0.0",
-    "@types/node": "^16.11.26",
-    "@types/react": "^16.13.1 || ^17.0.0",
     "cross-fetch": "^3.1.5",
     "msw": "^1.0.0"
   },
diff --git a/plugins/graphiql/src/alpha.tsx b/plugins/graphiql/src/alpha.tsx
new file mode 100644
index 0000000000..ded517e3c7
--- /dev/null
+++ b/plugins/graphiql/src/alpha.tsx
@@ -0,0 +1,105 @@
+/*
+ * 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 {
+  createApiExtension,
+  createExtension,
+  createExtensionDataRef,
+  createPageExtension,
+  createPlugin,
+  createSchemaFromZod,
+  PortableSchema,
+} from '@backstage/frontend-plugin-api';
+import {
+  graphQlBrowseApiRef,
+  GraphQLEndpoints,
+  GraphQLEndpoint,
+} from '@backstage/plugin-graphiql';
+import { createApiFactory } from '@backstage/core-plugin-api';
+
+/** @alpha */
+export const GraphiqlPage = createPageExtension({
+  id: 'plugin.graphiql.page',
+  defaultPath: '/graphiql',
+  component: () => import('./components').then(m => <m.GraphiQLPage />),
+});
+
+/** @internal */
+const endpointDataRef = createExtensionDataRef<GraphQLEndpoint>(
+  'plugin.graphiql.endpoint',
+);
+
+/** @alpha */
+export const graphiqlBrowseApi = createApiExtension({
+  api: graphQlBrowseApiRef, // apis.plugin.graphiql.browse
+  inputs: {
+    endpoints: {
+      extensionData: {
+        endpoint: endpointDataRef,
+      },
+    },
+  },
+  factory({ inputs }) {
+    return createApiFactory(
+      graphQlBrowseApiRef,
+      GraphQLEndpoints.from(inputs.endpoints.map(i => i.endpoint)),
+    );
+  },
+});
+
+/** @alpha */
+export function createEndpointExtension<TConfig extends {}>(options: {
+  id: string;
+  configSchema?: PortableSchema<TConfig>;
+  factory: (options: { config: TConfig }) => { endpoint: GraphQLEndpoint };
+}) {
+  return createExtension({
+    id: `apis.plugin.graphiql.browse.${options.id}`,
+    at: 'apis.plugin.graphiql.browse/endpoints',
+    configSchema: options.configSchema,
+    disabled: true,
+    output: {
+      endpoint: endpointDataRef,
+    },
+    factory({ bind, config }) {
+      bind({
+        endpoint: options.factory({ config }).endpoint,
+      });
+    },
+  });
+}
+
+/** @alpha */
+const gitlabGraphiQLBrowseExtension = createEndpointExtension({
+  id: 'gitlab',
+  configSchema: createSchemaFromZod(z =>
+    z
+      .object({
+        id: z.string().default('gitlab'),
+        title: z.string().default('GitLab'),
+        url: z.string().default('https://gitlab.com/api/graphql'),
+      })
+      .default({}),
+  ),
+  factory: ({ config }) => ({ endpoint: GraphQLEndpoints.create(config) }),
+});
+
+/** @alpha */
+export default createPlugin({
+  id: 'graphiql',
+  extensions: [GraphiqlPage, graphiqlBrowseApi, gitlabGraphiQLBrowseExtension],
+});
diff --git a/plugins/graphql-backend/CHANGELOG.md b/plugins/graphql-backend/CHANGELOG.md
index b8fc2982f7..fb3c13bde8 100644
--- a/plugins/graphql-backend/CHANGELOG.md
+++ b/plugins/graphql-backend/CHANGELOG.md
@@ -1,5 +1,48 @@
 # @backstage/plugin-graphql-backend
 
+## 0.1.41-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config@1.1.0-next.1
+  - @backstage/backend-common@0.19.5-next.2
+  - @backstage/plugin-catalog-graphql@0.3.23-next.1
+
+## 0.1.41-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config@1.1.0-next.0
+  - @backstage/backend-common@0.19.5-next.1
+  - @backstage/plugin-catalog-graphql@0.3.23-next.0
+
+## 0.1.40-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.19.4-next.0
+  - @backstage/config@1.0.8
+  - @backstage/plugin-catalog-graphql@0.3.22
+
+## 0.1.38
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.19.2
+  - @backstage/config@1.0.8
+  - @backstage/plugin-catalog-graphql@0.3.22
+
+## 0.1.38-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.19.2-next.2
+
 ## 0.1.38-next.1
 
 ### Patch Changes
diff --git a/plugins/graphql-backend/catalog-info.yaml b/plugins/graphql-backend/catalog-info.yaml
new file mode 100644
index 0000000000..4545c0def5
--- /dev/null
+++ b/plugins/graphql-backend/catalog-info.yaml
@@ -0,0 +1,10 @@
+apiVersion: backstage.io/v1alpha1
+kind: Component
+metadata:
+  name: backstage-plugin-graphql-backend
+  title: '@backstage/plugin-graphql-backend'
+  description: An experimental Backstage backend plugin for GraphQL
+spec:
+  lifecycle: experimental
+  type: backstage-backend-plugin
+  owner: maintainers
diff --git a/plugins/graphql-backend/package.json b/plugins/graphql-backend/package.json
index 530f814625..b8cbad01df 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.38-next.1",
+  "version": "0.1.41-next.2",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
diff --git a/plugins/graphql-voyager/CHANGELOG.md b/plugins/graphql-voyager/CHANGELOG.md
index 6106ce1684..7f91322c48 100644
--- a/plugins/graphql-voyager/CHANGELOG.md
+++ b/plugins/graphql-voyager/CHANGELOG.md
@@ -1,5 +1,51 @@
 # @backstage/plugin-graphql-voyager
 
+## 0.1.7-next.2
+
+### Patch Changes
+
+- 8cec7664e146: Removed `@types/node` dependency
+- Updated dependencies
+  - @backstage/core-components@0.13.5-next.2
+  - @backstage/core-plugin-api@1.6.0-next.2
+  - @backstage/theme@0.4.1
+
+## 0.1.7-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.13.5-next.1
+  - @backstage/core-plugin-api@1.6.0-next.1
+  - @backstage/theme@0.4.1
+
+## 0.1.7-next.0
+
+### Patch Changes
+
+- 482bb5c0bbf8: Moved `@types/react` to be a regular dependency
+- Updated dependencies
+  - @backstage/core-plugin-api@1.6.0-next.0
+  - @backstage/core-components@0.13.5-next.0
+  - @backstage/theme@0.4.1
+
+## 0.1.6
+
+### Patch Changes
+
+- bb1e1c2b26cc: Fix typo in install instructions.
+- 12a8c94eda8d: Add package repository and homepage metadata
+- Updated dependencies
+  - @backstage/core-components@0.13.4
+  - @backstage/core-plugin-api@1.5.3
+  - @backstage/theme@0.4.1
+
+## 0.1.6-next.2
+
+### Patch Changes
+
+- bb1e1c2b26cc: Fix typo in install instructions.
+
 ## 0.1.6-next.1
 
 ### Patch Changes
diff --git a/plugins/graphql-voyager/README.md b/plugins/graphql-voyager/README.md
index 2c903cd9e5..66ea63191b 100644
--- a/plugins/graphql-voyager/README.md
+++ b/plugins/graphql-voyager/README.md
@@ -27,7 +27,7 @@ In order to be able to navigate to the graphQL voyager page, a new route needs t
 
   const routes = (
     <FlatRoutes>
-      <Route path="/graphql-voyager" element={<GraphqlVoyagerPage title="This is Voyager!"/>}/>
+      <Route path="/graphql-voyager" element={<GraphQLVoyagerPage title="This is Voyager!"/>}/>
 ```
 
 ### Configuration
diff --git a/plugins/graphql-voyager/api-report.md b/plugins/graphql-voyager/api-report.md
index 9b488f9356..257a8ca7b7 100644
--- a/plugins/graphql-voyager/api-report.md
+++ b/plugins/graphql-voyager/api-report.md
@@ -7,6 +7,8 @@
 
 import { ApiRef } from '@backstage/core-plugin-api';
 import { BackstagePlugin } from '@backstage/core-plugin-api';
+import { JSX as JSX_2 } from 'react';
+import { default as React_2 } from 'react';
 import { RouteRef } from '@backstage/core-plugin-api';
 import { VoyagerDisplayOptions } from 'graphql-voyager/typings/components/Voyager';
 import { WorkerCallback } from 'graphql-voyager/typings/utils/types';
@@ -45,7 +47,7 @@ export class GraphQLVoyagerEndpoints implements GraphQLVoyagerApi {
 // @public (undocumented)
 export const GraphqlVoyagerPage: (
   props: GraphQLVoyagerPageProps,
-) => JSX.Element;
+) => JSX_2.Element;
 
 // @public (undocumented)
 export type GraphQLVoyagerPageProps = {
@@ -65,7 +67,7 @@ export const graphqlVoyagerPlugin: BackstagePlugin<
 export const introspectionQuery: string;
 
 // @public (undocumented)
-export const Router: (props: GraphQLVoyagerPageProps) => JSX.Element;
+export const Router: (props: GraphQLVoyagerPageProps) => React_2.JSX.Element;
 
 // (No @packageDocumentation comment for this package)
 ```
diff --git a/plugins/graphql-voyager/catalog-info.yaml b/plugins/graphql-voyager/catalog-info.yaml
new file mode 100644
index 0000000000..649454d9c4
--- /dev/null
+++ b/plugins/graphql-voyager/catalog-info.yaml
@@ -0,0 +1,10 @@
+apiVersion: backstage.io/v1alpha1
+kind: Component
+metadata:
+  name: backstage-plugin-graphql-voyager
+  title: '@backstage/plugin-graphql-voyager'
+  description: Backstage plugin for GraphQL Voyager
+spec:
+  lifecycle: experimental
+  type: backstage-frontend-plugin
+  owner: maintainers
diff --git a/plugins/graphql-voyager/package.json b/plugins/graphql-voyager/package.json
index 7cfe6e3147..6e91382759 100644
--- a/plugins/graphql-voyager/package.json
+++ b/plugins/graphql-voyager/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@backstage/plugin-graphql-voyager",
   "description": "Backstage plugin for GraphQL Voyager",
-  "version": "0.1.6-next.1",
+  "version": "0.1.7-next.2",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
@@ -19,6 +19,7 @@
     "url": "https://github.com/backstage/backstage",
     "directory": "plugins/graphql-voyager"
   },
+  "sideEffects": false,
   "scripts": {
     "start": "backstage-cli package start",
     "build": "backstage-cli package build",
@@ -35,6 +36,7 @@
     "@material-ui/core": "^4.12.2",
     "@material-ui/icons": "^4.9.1",
     "@material-ui/lab": "4.0.0-alpha.61",
+    "@types/react": "^16.13.1 || ^17.0.0",
     "graphql-voyager": "^1.0.0-rc.31",
     "react-use": "^17.2.4"
   },
@@ -52,8 +54,6 @@
     "@testing-library/jest-dom": "^5.10.1",
     "@testing-library/react": "^12.1.3",
     "@testing-library/user-event": "^14.0.0",
-    "@types/node": "*",
-    "@types/react": "^16.13.1 || ^17.0.0",
     "msw": "^1.0.0"
   },
   "files": [
diff --git a/plugins/home-react/CHANGELOG.md b/plugins/home-react/CHANGELOG.md
index 6d328ceb6a..0da5ffcdf8 100644
--- a/plugins/home-react/CHANGELOG.md
+++ b/plugins/home-react/CHANGELOG.md
@@ -1,5 +1,40 @@
 # @backstage/plugin-home-react
 
+## 0.1.3-next.2
+
+### Patch Changes
+
+- 8cec7664e146: Removed `@types/node` dependency
+- Updated dependencies
+  - @backstage/core-components@0.13.5-next.2
+  - @backstage/core-plugin-api@1.6.0-next.2
+
+## 0.1.3-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.13.5-next.1
+  - @backstage/core-plugin-api@1.6.0-next.1
+
+## 0.1.3-next.0
+
+### Patch Changes
+
+- 482bb5c0bbf8: Moved `@types/react` to be a regular dependency
+- Updated dependencies
+  - @backstage/core-plugin-api@1.6.0-next.0
+  - @backstage/core-components@0.13.5-next.0
+
+## 0.1.2
+
+### Patch Changes
+
+- bf67dce73174: Make `title` optional when defining the `createCardExtension`
+- Updated dependencies
+  - @backstage/core-components@0.13.4
+  - @backstage/core-plugin-api@1.5.3
+
 ## 0.1.2-next.0
 
 ### Patch Changes
diff --git a/plugins/home-react/api-report.md b/plugins/home-react/api-report.md
index 4806cf7be0..268f598a63 100644
--- a/plugins/home-react/api-report.md
+++ b/plugins/home-react/api-report.md
@@ -3,9 +3,8 @@
 > Do not edit this file. It is a report generated by [API Extractor](https://api-extractor.com/).
 
 ```ts
-/// <reference types="react" />
-
 import { Extension } from '@backstage/core-plugin-api';
+import { default as React_2 } from 'react';
 import { RJSFSchema } from '@rjsf/utils';
 import { UiSchema } from '@rjsf/utils';
 
@@ -61,7 +60,7 @@ export function createCardExtension<T>(options: {
   description?: string;
   layout?: CardLayout;
   settings?: CardSettings;
-}): Extension<(props: CardExtensionProps<T>) => JSX.Element>;
+}): Extension<(props: CardExtensionProps<T>) => React_2.JSX.Element>;
 
 // @public (undocumented)
 export type RendererProps = {
@@ -74,5 +73,5 @@ export const SettingsModal: (props: {
   close: Function;
   componentName?: string;
   children: JSX.Element;
-}) => JSX.Element;
+}) => React_2.JSX.Element;
 ```
diff --git a/plugins/home-react/catalog-info.yaml b/plugins/home-react/catalog-info.yaml
new file mode 100644
index 0000000000..28109b9ddc
--- /dev/null
+++ b/plugins/home-react/catalog-info.yaml
@@ -0,0 +1,12 @@
+apiVersion: backstage.io/v1alpha1
+kind: Component
+metadata:
+  name: backstage-plugin-home-react
+  title: '@backstage/plugin-home-react'
+  description: >-
+    A Backstage plugin that contains react components helps you build a home
+    page
+spec:
+  lifecycle: experimental
+  type: backstage-web-library
+  owner: discoverability-maintainers
diff --git a/plugins/home-react/package.json b/plugins/home-react/package.json
index c9bcc3ca61..45144ab4c4 100644
--- a/plugins/home-react/package.json
+++ b/plugins/home-react/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@backstage/plugin-home-react",
   "description": "A Backstage plugin that contains react components helps you build a home page",
-  "version": "0.1.2-next.0",
+  "version": "0.1.3-next.2",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
@@ -23,6 +23,7 @@
     "backstage",
     "homepage"
   ],
+  "sideEffects": false,
   "scripts": {
     "build": "backstage-cli package build",
     "start": "backstage-cli package start",
@@ -37,7 +38,8 @@
     "@backstage/core-plugin-api": "workspace:^",
     "@material-ui/core": "^4.12.2",
     "@material-ui/icons": "^4.9.1",
-    "@rjsf/utils": "5.7.3"
+    "@rjsf/utils": "5.7.3",
+    "@types/react": "^16.13.1 || ^17.0.0"
   },
   "peerDependencies": {
     "react": "^16.13.1 || ^17.0.0",
@@ -53,8 +55,6 @@
     "@testing-library/jest-dom": "^5.10.1",
     "@testing-library/react": "^12.1.3",
     "@testing-library/user-event": "^14.0.0",
-    "@types/node": "^16.11.26",
-    "@types/react": "^16.13.1 || ^17.0.0",
     "@types/react-grid-layout": "^1.3.2",
     "cross-fetch": "^3.1.5",
     "msw": "^1.0.0"
diff --git a/plugins/home/CHANGELOG.md b/plugins/home/CHANGELOG.md
index 9becea45ad..7cf03984c0 100644
--- a/plugins/home/CHANGELOG.md
+++ b/plugins/home/CHANGELOG.md
@@ -1,5 +1,70 @@
 # @backstage/plugin-home
 
+## 0.5.8-next.2
+
+### Patch Changes
+
+- 8cec7664e146: Removed `@types/node` dependency
+- Updated dependencies
+  - @backstage/core-components@0.13.5-next.2
+  - @backstage/core-plugin-api@1.6.0-next.2
+  - @backstage/plugin-home-react@0.1.3-next.2
+  - @backstage/config@1.1.0-next.1
+  - @backstage/plugin-catalog-react@1.8.4-next.2
+  - @backstage/catalog-model@1.4.2-next.1
+  - @backstage/theme@0.4.1
+
+## 0.5.8-next.1
+
+### Patch Changes
+
+- 98bb77c1f0b8: Align zod dependency to align with other packages.
+- 1853ffa09b50: Allow specifying static widgets to custom home page
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.8.4-next.1
+  - @backstage/core-components@0.13.5-next.1
+  - @backstage/config@1.1.0-next.0
+  - @backstage/plugin-home-react@0.1.3-next.1
+  - @backstage/catalog-model@1.4.2-next.0
+  - @backstage/core-plugin-api@1.6.0-next.1
+  - @backstage/theme@0.4.1
+
+## 0.5.7-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-home-react@0.1.3-next.0
+  - @backstage/core-plugin-api@1.6.0-next.0
+  - @backstage/core-components@0.13.5-next.0
+  - @backstage/catalog-model@1.4.1
+  - @backstage/config@1.0.8
+  - @backstage/theme@0.4.1
+  - @backstage/plugin-catalog-react@1.8.3-next.0
+
+## 0.5.5
+
+### Patch Changes
+
+- a559ff68de7e: Now, user can provide a language (optional) as input to receive a greeting in that specific language. Example: `<WelcomeTitle language={['English', 'Spanish']} />`
+- 6743d3917a52: Make sure the widget name is never empty in the `AddWidgetDialog`. If the title was set to "", the entry would contain an empty string. Use the name as a fallback
+- Updated dependencies
+  - @backstage/plugin-home-react@0.1.2
+  - @backstage/core-components@0.13.4
+  - @backstage/plugin-catalog-react@1.8.1
+  - @backstage/core-plugin-api@1.5.3
+  - @backstage/catalog-model@1.4.1
+  - @backstage/config@1.0.8
+  - @backstage/theme@0.4.1
+
+## 0.5.5-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.8.1-next.1
+  - @backstage/plugin-home-react@0.1.2-next.0
+
 ## 0.5.5-next.0
 
 ### Patch Changes
diff --git a/plugins/home/README.md b/plugins/home/README.md
index 57c2a4d243..e147cdfbdf 100644
--- a/plugins/home/README.md
+++ b/plugins/home/README.md
@@ -233,6 +233,9 @@ const defaultConfig = [
     y: 0,
     width: 12,
     height: 1,
+    movable: true,
+    resizable: false,
+    deletable: false,
   },
 ];
 
diff --git a/plugins/home/api-report.md b/plugins/home/api-report.md
index 32c1c0eb9d..450bc054fa 100644
--- a/plugins/home/api-report.md
+++ b/plugins/home/api-report.md
@@ -13,6 +13,7 @@ import { CardSettings as CardSettings_2 } from '@backstage/plugin-home-react';
 import { ComponentParts as ComponentParts_2 } from '@backstage/plugin-home-react';
 import { ComponentRenderer as ComponentRenderer_2 } from '@backstage/plugin-home-react';
 import { createCardExtension as createCardExtension_2 } from '@backstage/plugin-home-react';
+import { JSX as JSX_2 } from 'react';
 import { default as React_2 } from 'react';
 import { ReactElement } from 'react';
 import { ReactNode } from 'react';
@@ -48,7 +49,7 @@ export const ComponentAccordion: (props: {
   Actions?: (() => JSX.Element) | undefined;
   Settings?: (() => JSX.Element) | undefined;
   ContextProvider?: ((props: any) => JSX.Element) | undefined;
-}) => JSX.Element;
+}) => JSX_2.Element;
 
 // @public @deprecated (undocumented)
 export type ComponentParts = ComponentParts_2;
@@ -61,7 +62,7 @@ export const ComponentTab: (props: {
   title: string;
   Content: () => JSX.Element;
   ContextProvider?: ((props: any) => JSX.Element) | undefined;
-}) => JSX.Element;
+}) => JSX_2.Element;
 
 // @public (undocumented)
 export const ComponentTabs: (props: {
@@ -70,7 +71,7 @@ export const ComponentTabs: (props: {
     label: string;
     Component: () => JSX.Element;
   }[];
-}) => JSX.Element;
+}) => JSX_2.Element;
 
 // @public @deprecated (undocumented)
 export const createCardExtension: typeof createCardExtension_2;
@@ -78,7 +79,7 @@ export const createCardExtension: typeof createCardExtension_2;
 // @public
 export const CustomHomepageGrid: (
   props: CustomHomepageGridProps,
-) => JSX.Element;
+) => React_2.JSX.Element;
 
 // @public
 export type CustomHomepageGridProps = {
@@ -100,36 +101,36 @@ export type CustomHomepageGridProps = {
 export const HeaderWorldClock: (props: {
   clockConfigs: ClockConfig[];
   customTimeFormat?: Intl.DateTimeFormatOptions | undefined;
-}) => JSX.Element | null;
+}) => JSX_2.Element | null;
 
 // @public
 export const HomePageCompanyLogo: (props: {
   logo?: ReactNode;
   className?: string | undefined;
-}) => JSX.Element;
+}) => JSX_2.Element;
 
 // @public (undocumented)
 export const HomepageCompositionRoot: (props: {
   title?: string | undefined;
   children?: ReactNode;
-}) => JSX.Element;
+}) => JSX_2.Element;
 
 // @public (undocumented)
 export const HomePageRandomJoke: (
   props: CardExtensionProps_2<{
     defaultCategory?: 'any' | 'programming' | undefined;
   }>,
-) => JSX.Element;
+) => JSX_2.Element;
 
 // @public
 export const HomePageStarredEntities: (
   props: CardExtensionProps_2<unknown>,
-) => JSX.Element;
+) => JSX_2.Element;
 
 // @public
 export const HomePageToolkit: (
   props: CardExtensionProps_2<ToolkitContentProps>,
-) => JSX.Element;
+) => JSX_2.Element;
 
 // @public (undocumented)
 export const homePlugin: BackstagePlugin<
@@ -147,6 +148,9 @@ export type LayoutConfiguration = {
   y: number;
   width: number;
   height: number;
+  movable?: boolean;
+  deletable?: boolean;
+  resizable?: boolean;
 };
 
 // @public @deprecated (undocumented)
@@ -158,7 +162,7 @@ export const SettingsModal: (props: {
   close: Function;
   componentName?: string | undefined;
   children: JSX.Element;
-}) => JSX.Element;
+}) => JSX_2.Element;
 
 // @public (undocumented)
 export const TemplateBackstageLogo: (props: {
@@ -166,10 +170,10 @@ export const TemplateBackstageLogo: (props: {
     svg: string;
     path: string;
   };
-}) => JSX.Element;
+}) => React_2.JSX.Element;
 
 // @public (undocumented)
-export const TemplateBackstageLogoIcon: () => JSX.Element;
+export const TemplateBackstageLogoIcon: () => React_2.JSX.Element;
 
 // @public (undocumented)
 export type Tool = {
@@ -186,7 +190,7 @@ export type ToolkitContentProps = {
 // @public
 export const WelcomeTitle: ({
   language,
-}: WelcomeTitleLanguageProps) => JSX.Element;
+}: WelcomeTitleLanguageProps) => JSX_2.Element;
 
 // @public (undocumented)
 export type WelcomeTitleLanguageProps = {
diff --git a/plugins/home/catalog-info.yaml b/plugins/home/catalog-info.yaml
new file mode 100644
index 0000000000..1b23d4b83b
--- /dev/null
+++ b/plugins/home/catalog-info.yaml
@@ -0,0 +1,10 @@
+apiVersion: backstage.io/v1alpha1
+kind: Component
+metadata:
+  name: backstage-plugin-home
+  title: '@backstage/plugin-home'
+  description: A Backstage plugin that helps you build a home page
+spec:
+  lifecycle: experimental
+  type: backstage-frontend-plugin
+  owner: discoverability-maintainers
diff --git a/plugins/home/package.json b/plugins/home/package.json
index f9e97b2760..631ca2480f 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.5.5-next.0",
+  "version": "0.5.8-next.2",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
@@ -23,6 +23,7 @@
     "backstage",
     "homepage"
   ],
+  "sideEffects": false,
   "scripts": {
     "build": "backstage-cli package build",
     "start": "backstage-cli package start",
@@ -52,7 +53,7 @@
     "react-grid-layout": "^1.3.4",
     "react-resizable": "^3.0.4",
     "react-use": "^17.2.4",
-    "zod": "~3.21.4"
+    "zod": "^3.21.4"
   },
   "peerDependencies": {
     "react": "^16.13.1 || ^17.0.0",
@@ -68,7 +69,6 @@
     "@testing-library/jest-dom": "^5.10.1",
     "@testing-library/react": "^12.1.3",
     "@testing-library/user-event": "^14.0.0",
-    "@types/node": "^16.11.26",
     "@types/react-grid-layout": "^1.3.2",
     "msw": "^1.0.0"
   },
diff --git a/plugins/home/src/components/CustomHomepage/CustomHomepageGrid.tsx b/plugins/home/src/components/CustomHomepage/CustomHomepageGrid.tsx
index f5ee8f3ddc..590a96bf09 100644
--- a/plugins/home/src/components/CustomHomepage/CustomHomepageGrid.tsx
+++ b/plugins/home/src/components/CustomHomepage/CustomHomepageGrid.tsx
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-import React, { ReactNode, useCallback, useMemo } from 'react';
+import React, { useCallback, useMemo } from 'react';
 import { Layout, Layouts, Responsive, WidthProvider } from 'react-grid-layout';
 import {
   ElementCollection,
@@ -40,6 +40,7 @@ import { WidgetSettingsOverlay } from './WidgetSettingsOverlay';
 import { AddWidgetDialog } from './AddWidgetDialog';
 import { CustomHomepageButtons } from './CustomHomepageButtons';
 import {
+  CustomHomepageGridProps,
   CustomHomepageGridStateV1,
   CustomHomepageGridStateV1Schema,
   GridWidget,
@@ -68,7 +69,6 @@ const useStyles = makeStyles((theme: Theme) =>
       marginLeft: theme.spacing(2),
     },
     widgetWrapper: {
-      overflow: 'hidden',
       '& > div[class*="MuiCard-root"]': {
         width: '100%',
         height: '100%',
@@ -158,6 +158,9 @@ const convertConfigToDefaultWidgets = (
         isResizable: false,
       },
       settings: {},
+      movable: conf.movable,
+      deletable: conf.deletable,
+      resizable: conf.resizable,
     };
   });
   return compact(ret);
@@ -190,82 +193,6 @@ const availableWidgetsFilter = (elements: ElementCollection) => {
     });
 };
 
-/**
- * Breakpoint options for <CustomHomepageGridProps/>
- *
- * @public
- */
-export type Breakpoint = 'xxs' | 'xs' | 'sm' | 'md' | 'lg' | 'xl';
-
-/**
- * Props customizing the <CustomHomepageGrid/> component.
- *
- * @public
- */
-export type CustomHomepageGridProps = {
-  /**
-   * Children contain all widgets user can configure on their own homepage.
-   */
-  children?: ReactNode;
-  /**
-   * Default layout for the homepage before users have modified it.
-   */
-  config?: LayoutConfiguration[];
-  /**
-   * Height of grid row in pixels.
-   * @defaultValue 60
-   */
-  rowHeight?: number;
-  /**
-   * Screen width in pixels for different breakpoints.
-   * @defaultValue theme breakpoints
-   */
-  breakpoints?: Record<Breakpoint, number>;
-  /**
-   * Number of grid columns for different breakpoints.
-   * @defaultValue \{ lg: 12, md: 10, sm: 6, xs: 4, xxs: 2 \}
-   */
-  cols?: Record<Breakpoint, number>;
-  /**
-   * Grid container padding (x, y) in pixels for all or specific breakpoints.
-   * @defaultValue [0, 0]
-   * @example [10, 10]
-   * @example \{ lg: [10, 10] \}
-   */
-  containerPadding?: [number, number] | Record<Breakpoint, [number, number]>;
-  /**
-   * Grid container margin (x, y) in pixels for all or specific breakpoints.
-   * @defaultValue [0, 0]
-   * @example [10, 10]
-   * @example \{ lg: [10, 10] \}
-   */
-  containerMargin?: [number, number] | Record<Breakpoint, [number, number]>;
-  /**
-   * Maximum number of rows user can have in the grid.
-   * @defaultValue unlimited
-   */
-  maxRows?: number;
-  /**
-   * Custom style for grid.
-   */
-  style?: React.CSSProperties;
-  /**
-   * Compaction type of widgets in the grid. This controls where widgets are moved in case
-   * they are overlapping in the grid.
-   */
-  compactType?: 'vertical' | 'horizontal' | null;
-  /**
-   * Controls if widgets can overlap in the grid. If true, grid can be placed one over the other.
-   * @defaultValue false
-   */
-  allowOverlap?: boolean;
-  /**
-   * Controls if widgets can collide with each other. If true, grid items won't change position when being dragged over.
-   * @defaultValue false
-   */
-  preventCollision?: boolean;
-};
-
 /**
  * A component that allows customizing components in home grid layout.
  *
@@ -318,6 +245,9 @@ export const CustomHomepageGrid = (props: CustomHomepageGridProps) => {
           isDraggable: editMode,
         },
         settings: {},
+        movable: widget.movable,
+        deletable: widget.deletable,
+        resizable: widget.resizable,
       },
     ]);
     setAddWidgetDialogOpen(false);
@@ -348,9 +278,11 @@ export const CustomHomepageGrid = (props: CustomHomepageGridProps) => {
     setEditMode(mode);
     setWidgets(
       widgets.map(w => {
+        const resizable = w.resizable === false ? false : mode;
+        const movable = w.movable === false ? false : mode;
         return {
           ...w,
-          layout: { ...w.layout, isDraggable: mode, isResizable: mode },
+          layout: { ...w.layout, isDraggable: movable, isResizable: resizable },
         };
       }),
     );
@@ -370,7 +302,20 @@ export const CustomHomepageGrid = (props: CustomHomepageGridProps) => {
   };
 
   const handleRestoreDefaultConfig = () => {
-    setWidgets(defaultLayout);
+    setWidgets(
+      defaultLayout.map(w => {
+        const resizable = w.resizable === false ? false : editMode;
+        const movable = w.movable === false ? false : editMode;
+        return {
+          ...w,
+          layout: {
+            ...w.layout,
+            isDraggable: movable,
+            isResizable: resizable,
+          },
+        };
+      }),
+    );
   };
 
   return (
@@ -404,7 +349,7 @@ export const CustomHomepageGrid = (props: CustomHomepageGridProps) => {
         style={props.style}
         allowOverlap={props.allowOverlap}
         preventCollision={props.preventCollision}
-        draggableCancel=".overlayGridItem,.widgetSettingsDialog"
+        draggableCancel=".overlayGridItem,.widgetSettingsDialog,.disabled"
         containerPadding={props.containerPadding}
         margin={props.containerMargin}
         breakpoints={
@@ -435,7 +380,9 @@ export const CustomHomepageGrid = (props: CustomHomepageGridProps) => {
           return (
             <div
               key={l.i}
-              className={`${styles.widgetWrapper} ${editMode && 'edit'}`}
+              className={`${styles.widgetWrapper} ${editMode && 'edit'} ${
+                w.movable === false && 'disabled'
+              }`}
             >
               <ErrorBoundary>
                 <widget.component.type {...widgetProps} />
@@ -447,6 +394,7 @@ export const CustomHomepageGrid = (props: CustomHomepageGridProps) => {
                   handleRemove={handleRemove}
                   handleSettingsSave={handleSettingsSave}
                   settings={w.settings}
+                  deletable={w.deletable}
                 />
               )}
             </div>
diff --git a/plugins/home/src/components/CustomHomepage/WidgetSettingsOverlay.tsx b/plugins/home/src/components/CustomHomepage/WidgetSettingsOverlay.tsx
index 261dabb833..2c3a1d9ab9 100644
--- a/plugins/home/src/components/CustomHomepage/WidgetSettingsOverlay.tsx
+++ b/plugins/home/src/components/CustomHomepage/WidgetSettingsOverlay.tsx
@@ -58,10 +58,12 @@ interface WidgetSettingsOverlayProps {
   handleRemove: (id: string) => void;
   handleSettingsSave: (id: string, settings: Record<string, any>) => void;
   settings?: Record<string, any>;
+  deletable?: boolean;
 }
 
 export const WidgetSettingsOverlay = (props: WidgetSettingsOverlayProps) => {
-  const { id, widget, settings, handleRemove, handleSettingsSave } = props;
+  const { id, widget, settings, handleRemove, handleSettingsSave, deletable } =
+    props;
   const [settingsDialogOpen, setSettingsDialogOpen] = React.useState(false);
   const styles = useStyles();
 
@@ -110,13 +112,15 @@ export const WidgetSettingsOverlay = (props: WidgetSettingsOverlayProps) => {
             </Tooltip>
           </Grid>
         )}
-        <Grid item className="overlayGridItem">
-          <Tooltip title="Delete widget">
-            <IconButton color="secondary" onClick={() => handleRemove(id)}>
-              <DeleteIcon fontSize="large" />
-            </IconButton>
-          </Tooltip>
-        </Grid>
+        {deletable !== false && (
+          <Grid item className="overlayGridItem">
+            <Tooltip title="Delete widget">
+              <IconButton color="secondary" onClick={() => handleRemove(id)}>
+                <DeleteIcon fontSize="large" />
+              </IconButton>
+            </Tooltip>
+          </Grid>
+        )}
       </Grid>
     </div>
   );
diff --git a/plugins/home/src/components/CustomHomepage/index.ts b/plugins/home/src/components/CustomHomepage/index.ts
index eed597cca3..380fdb4b25 100644
--- a/plugins/home/src/components/CustomHomepage/index.ts
+++ b/plugins/home/src/components/CustomHomepage/index.ts
@@ -14,5 +14,8 @@
  * limitations under the License.
  */
 export { CustomHomepageGrid } from './CustomHomepageGrid';
-export type { CustomHomepageGridProps, Breakpoint } from './CustomHomepageGrid';
-export type { LayoutConfiguration } from './types';
+export type {
+  CustomHomepageGridProps,
+  Breakpoint,
+  LayoutConfiguration,
+} from './types';
diff --git a/plugins/home/src/components/CustomHomepage/types.ts b/plugins/home/src/components/CustomHomepage/types.ts
index 8e9c6f403e..79e94c5f03 100644
--- a/plugins/home/src/components/CustomHomepage/types.ts
+++ b/plugins/home/src/components/CustomHomepage/types.ts
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-import { ReactElement } from 'react';
+import React, { ReactElement, ReactNode } from 'react';
 import { Layout } from 'react-grid-layout';
 import { z } from 'zod';
 import { RJSFSchema, UiSchema } from '@rjsf/utils';
@@ -24,12 +24,91 @@ const RSJFTypeUiSchema: z.ZodType<UiSchema> = z.any();
 const ReactElementSchema: z.ZodType<ReactElement> = z.any();
 const LayoutSchema: z.ZodType<Layout> = z.any();
 
+/**
+ * Breakpoint options for <CustomHomepageGridProps/>
+ *
+ * @public
+ */
+export type Breakpoint = 'xxs' | 'xs' | 'sm' | 'md' | 'lg' | 'xl';
+
+/**
+ * Props customizing the <CustomHomepageGrid/> component.
+ *
+ * @public
+ */
+export type CustomHomepageGridProps = {
+  /**
+   * Children contain all widgets user can configure on their own homepage.
+   */
+  children?: ReactNode;
+  /**
+   * Default layout for the homepage before users have modified it.
+   */
+  config?: LayoutConfiguration[];
+  /**
+   * Height of grid row in pixels.
+   * @defaultValue 60
+   */
+  rowHeight?: number;
+  /**
+   * Screen width in pixels for different breakpoints.
+   * @defaultValue theme breakpoints
+   */
+  breakpoints?: Record<Breakpoint, number>;
+  /**
+   * Number of grid columns for different breakpoints.
+   * @defaultValue \{ lg: 12, md: 10, sm: 6, xs: 4, xxs: 2 \}
+   */
+  cols?: Record<Breakpoint, number>;
+  /**
+   * Grid container padding (x, y) in pixels for all or specific breakpoints.
+   * @defaultValue [0, 0]
+   * @example [10, 10]
+   * @example \{ lg: [10, 10] \}
+   */
+  containerPadding?: [number, number] | Record<Breakpoint, [number, number]>;
+  /**
+   * Grid container margin (x, y) in pixels for all or specific breakpoints.
+   * @defaultValue [0, 0]
+   * @example [10, 10]
+   * @example \{ lg: [10, 10] \}
+   */
+  containerMargin?: [number, number] | Record<Breakpoint, [number, number]>;
+  /**
+   * Maximum number of rows user can have in the grid.
+   * @defaultValue unlimited
+   */
+  maxRows?: number;
+  /**
+   * Custom style for grid.
+   */
+  style?: React.CSSProperties;
+  /**
+   * Compaction type of widgets in the grid. This controls where widgets are moved in case
+   * they are overlapping in the grid.
+   */
+  compactType?: 'vertical' | 'horizontal' | null;
+  /**
+   * Controls if widgets can overlap in the grid. If true, grid can be placed one over the other.
+   * @defaultValue false
+   */
+  allowOverlap?: boolean;
+  /**
+   * Controls if widgets can collide with each other. If true, grid items won't change position when being dragged over.
+   * @defaultValue false
+   */
+  preventCollision?: boolean;
+};
+
 export const LayoutConfigurationSchema = z.object({
   component: ReactElementSchema,
   x: z.number().nonnegative('x must be positive number'),
   y: z.number().nonnegative('y must be positive number'),
   width: z.number().positive('width must be positive number'),
   height: z.number().positive('height must be positive number'),
+  movable: z.boolean().optional(),
+  deletable: z.boolean().optional(),
+  resizable: z.boolean().optional(),
 });
 
 /**
@@ -43,6 +122,9 @@ export type LayoutConfiguration = {
   y: number;
   width: number;
   height: number;
+  movable?: boolean;
+  deletable?: boolean;
+  resizable?: boolean;
 };
 
 export const WidgetSchema = z.object({
@@ -64,6 +146,9 @@ export const WidgetSchema = z.object({
     .optional(),
   settingsSchema: RSJFTypeSchema.optional(),
   uiSchema: RSJFTypeUiSchema.optional(),
+  movable: z.boolean().optional(),
+  deletable: z.boolean().optional(),
+  resizable: z.boolean().optional(),
 });
 
 export type Widget = z.infer<typeof WidgetSchema>;
@@ -72,6 +157,9 @@ const GridWidgetSchema = z.object({
   id: z.string(),
   layout: LayoutSchema,
   settings: z.record(z.string(), z.any()),
+  movable: z.boolean().optional(),
+  deletable: z.boolean().optional(),
+  resizable: z.boolean().optional(),
 });
 
 export type GridWidget = z.infer<typeof GridWidgetSchema>;
diff --git a/plugins/ilert/CHANGELOG.md b/plugins/ilert/CHANGELOG.md
index 5a30c11db7..e273244b70 100644
--- a/plugins/ilert/CHANGELOG.md
+++ b/plugins/ilert/CHANGELOG.md
@@ -1,5 +1,64 @@
 # @backstage/plugin-ilert
 
+## 0.2.13-next.2
+
+### Patch Changes
+
+- 8cec7664e146: Removed `@types/node` dependency
+- 814feeed7343: Update to handle invalid luxon values
+- Updated dependencies
+  - @backstage/core-components@0.13.5-next.2
+  - @backstage/core-plugin-api@1.6.0-next.2
+  - @backstage/plugin-catalog-react@1.8.4-next.2
+  - @backstage/catalog-model@1.4.2-next.1
+  - @backstage/errors@1.2.1
+  - @backstage/theme@0.4.1
+
+## 0.2.13-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.8.4-next.1
+  - @backstage/core-components@0.13.5-next.1
+  - @backstage/catalog-model@1.4.2-next.0
+  - @backstage/core-plugin-api@1.6.0-next.1
+  - @backstage/errors@1.2.1
+  - @backstage/theme@0.4.1
+
+## 0.2.12-next.0
+
+### Patch Changes
+
+- 482bb5c0bbf8: Moved `@types/react` to be a regular dependency
+- Updated dependencies
+  - @backstage/core-plugin-api@1.6.0-next.0
+  - @backstage/core-components@0.13.5-next.0
+  - @backstage/catalog-model@1.4.1
+  - @backstage/errors@1.2.1
+  - @backstage/theme@0.4.1
+  - @backstage/plugin-catalog-react@1.8.3-next.0
+
+## 0.2.10
+
+### Patch Changes
+
+- 12a8c94eda8d: Add package repository and homepage metadata
+- Updated dependencies
+  - @backstage/core-components@0.13.4
+  - @backstage/plugin-catalog-react@1.8.1
+  - @backstage/core-plugin-api@1.5.3
+  - @backstage/catalog-model@1.4.1
+  - @backstage/errors@1.2.1
+  - @backstage/theme@0.4.1
+
+## 0.2.10-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.8.1-next.1
+
 ## 0.2.10-next.1
 
 ### Patch Changes
diff --git a/plugins/ilert/api-report.md b/plugins/ilert/api-report.md
index 6cc0c12a8f..b2081e049e 100644
--- a/plugins/ilert/api-report.md
+++ b/plugins/ilert/api-report.md
@@ -11,6 +11,8 @@ import { ConfigApi } from '@backstage/core-plugin-api';
 import { DiscoveryApi } from '@backstage/core-plugin-api';
 import { Entity } from '@backstage/catalog-model';
 import { IconComponent } from '@backstage/core-plugin-api';
+import { JSX as JSX_2 } from 'react';
+import { default as React_2 } from 'react';
 import { RouteRef } from '@backstage/core-plugin-api';
 
 // @public (undocumented)
@@ -302,7 +304,7 @@ export type AlertStatus = typeof PENDING | typeof ACCEPTED | typeof RESOLVED;
 export const DEGRADED = 'DEGRADED';
 
 // @public (undocumented)
-export const EntityILertCard: () => JSX.Element;
+export const EntityILertCard: () => JSX_2.Element;
 
 // @public (undocumented)
 export interface EscalationPolicy {
@@ -442,7 +444,7 @@ export interface ILertApi {
 export const ilertApiRef: ApiRef<ILertApi>;
 
 // @public (undocumented)
-export const ILertCard: () => JSX.Element;
+export const ILertCard: () => React_2.JSX.Element;
 
 // @public (undocumented)
 export class ILertClient implements ILertApi {
@@ -530,7 +532,7 @@ export class ILertClient implements ILertApi {
 export const ILertIcon: IconComponent;
 
 // @public (undocumented)
-export const ILertPage: () => JSX.Element;
+export const ILertPage: () => JSX_2.Element;
 
 // @public (undocumented)
 const ilertPlugin: BackstagePlugin<
@@ -649,7 +651,7 @@ export interface Responder {
 }
 
 // @public (undocumented)
-export const Router: () => JSX.Element;
+export const Router: () => React_2.JSX.Element;
 
 // @public (undocumented)
 export interface Schedule {
diff --git a/plugins/ilert/catalog-info.yaml b/plugins/ilert/catalog-info.yaml
new file mode 100644
index 0000000000..a73c82cbfe
--- /dev/null
+++ b/plugins/ilert/catalog-info.yaml
@@ -0,0 +1,10 @@
+apiVersion: backstage.io/v1alpha1
+kind: Component
+metadata:
+  name: backstage-plugin-ilert
+  title: '@backstage/plugin-ilert'
+  description: A Backstage plugin that integrates towards iLert
+spec:
+  lifecycle: experimental
+  type: backstage-frontend-plugin
+  owner: maintainers
diff --git a/plugins/ilert/package.json b/plugins/ilert/package.json
index 1ff95f665d..4562774da1 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.10-next.1",
+  "version": "0.2.13-next.2",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
@@ -19,6 +19,7 @@
     "url": "https://github.com/backstage/backstage",
     "directory": "plugins/ilert"
   },
+  "sideEffects": false,
   "scripts": {
     "build": "backstage-cli package build",
     "start": "backstage-cli package start",
@@ -40,6 +41,7 @@
     "@material-ui/icons": "^4.9.1",
     "@material-ui/lab": "4.0.0-alpha.61",
     "@material-ui/pickers": "^3.3.10",
+    "@types/react": "^16.13.1 || ^17.0.0",
     "humanize-duration": "^3.26.0",
     "luxon": "^3.0.0",
     "prop-types": "^15.7.2",
@@ -59,8 +61,6 @@
     "@testing-library/jest-dom": "^5.10.1",
     "@testing-library/react": "^12.1.3",
     "@testing-library/user-event": "^14.0.0",
-    "@types/node": "^16.11.26",
-    "@types/react": "^16.13.1 || ^17.0.0",
     "msw": "^1.0.0"
   },
   "files": [
diff --git a/plugins/ilert/src/components/Shift/ShiftOverrideModal.tsx b/plugins/ilert/src/components/Shift/ShiftOverrideModal.tsx
index 618c35dbc3..63af27c725 100644
--- a/plugins/ilert/src/components/Shift/ShiftOverrideModal.tsx
+++ b/plugins/ilert/src/components/Shift/ShiftOverrideModal.tsx
@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 import React from 'react';
 import { makeStyles } from '@material-ui/core/styles';
 import Button from '@material-ui/core/Button';
@@ -161,7 +162,7 @@ export const ShiftOverrideModal = ({
             value={start}
             className={classes.formControl}
             onChange={date => {
-              setStart(date ? date.toISO() : '');
+              setStart(date?.toISO() ?? '');
             }}
           />
           <DateTimePicker
@@ -173,7 +174,7 @@ export const ShiftOverrideModal = ({
             value={end}
             className={classes.formControl}
             onChange={date => {
-              setEnd(date ? date.toISO() : '');
+              setEnd(date?.toISO() ?? '');
             }}
           />
         </MuiPickersUtilsProvider>
diff --git a/plugins/jenkins-backend/CHANGELOG.md b/plugins/jenkins-backend/CHANGELOG.md
index d03a2646df..3d1b1f3556 100644
--- a/plugins/jenkins-backend/CHANGELOG.md
+++ b/plugins/jenkins-backend/CHANGELOG.md
@@ -1,5 +1,76 @@
 # @backstage/plugin-jenkins-backend
 
+## 0.2.6-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config@1.1.0-next.1
+  - @backstage/backend-common@0.19.5-next.2
+  - @backstage/plugin-auth-node@0.3.0-next.2
+  - @backstage/plugin-permission-node@0.7.14-next.2
+  - @backstage/catalog-model@1.4.2-next.1
+  - @backstage/plugin-permission-common@0.7.8-next.1
+  - @backstage/catalog-client@1.4.4-next.1
+  - @backstage/errors@1.2.1
+  - @backstage/plugin-jenkins-common@0.1.19-next.1
+
+## 0.2.6-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config@1.1.0-next.0
+  - @backstage/backend-common@0.19.5-next.1
+  - @backstage/catalog-model@1.4.2-next.0
+  - @backstage/plugin-auth-node@0.3.0-next.1
+  - @backstage/plugin-permission-common@0.7.8-next.0
+  - @backstage/plugin-permission-node@0.7.14-next.1
+  - @backstage/catalog-client@1.4.4-next.0
+  - @backstage/errors@1.2.1
+  - @backstage/plugin-jenkins-common@0.1.19-next.0
+
+## 0.2.5-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-auth-node@0.3.0-next.0
+  - @backstage/backend-common@0.19.4-next.0
+  - @backstage/catalog-client@1.4.3
+  - @backstage/catalog-model@1.4.1
+  - @backstage/config@1.0.8
+  - @backstage/errors@1.2.1
+  - @backstage/plugin-jenkins-common@0.1.18
+  - @backstage/plugin-permission-common@0.7.7
+  - @backstage/plugin-permission-node@0.7.13-next.0
+
+## 0.2.3
+
+### Patch Changes
+
+- 12a8c94eda8d: Add package repository and homepage metadata
+- 4b82382ed8c2: Fixed invalid configuration schema. The configuration schema may be more strict as a result.
+- Updated dependencies
+  - @backstage/backend-common@0.19.2
+  - @backstage/plugin-jenkins-common@0.1.18
+  - @backstage/plugin-auth-node@0.2.17
+  - @backstage/plugin-permission-node@0.7.11
+  - @backstage/catalog-client@1.4.3
+  - @backstage/catalog-model@1.4.1
+  - @backstage/config@1.0.8
+  - @backstage/errors@1.2.1
+  - @backstage/plugin-permission-common@0.7.7
+
+## 0.2.3-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.19.2-next.2
+  - @backstage/plugin-permission-node@0.7.11-next.2
+  - @backstage/plugin-auth-node@0.2.17-next.2
+
 ## 0.2.3-next.1
 
 ### Patch Changes
diff --git a/plugins/jenkins-backend/catalog-info.yaml b/plugins/jenkins-backend/catalog-info.yaml
new file mode 100644
index 0000000000..d3345d60dd
--- /dev/null
+++ b/plugins/jenkins-backend/catalog-info.yaml
@@ -0,0 +1,10 @@
+apiVersion: backstage.io/v1alpha1
+kind: Component
+metadata:
+  name: backstage-plugin-jenkins-backend
+  title: '@backstage/plugin-jenkins-backend'
+  description: A Backstage backend plugin that integrates towards Jenkins
+spec:
+  lifecycle: experimental
+  type: backstage-backend-plugin
+  owner: maintainers
diff --git a/plugins/jenkins-backend/package.json b/plugins/jenkins-backend/package.json
index 942a623ad0..9ea6a51cb8 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.2.3-next.1",
+  "version": "0.2.6-next.2",
   "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 b7c7da027b..95db160a9f 100644
--- a/plugins/jenkins-common/CHANGELOG.md
+++ b/plugins/jenkins-common/CHANGELOG.md
@@ -1,5 +1,30 @@
 # @backstage/plugin-jenkins-common
 
+## 0.1.19-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-permission-common@0.7.8-next.1
+  - @backstage/plugin-catalog-common@1.0.16-next.1
+
+## 0.1.19-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-permission-common@0.7.8-next.0
+  - @backstage/plugin-catalog-common@1.0.16-next.0
+
+## 0.1.18
+
+### Patch Changes
+
+- 12a8c94eda8d: Add package repository and homepage metadata
+- Updated dependencies
+  - @backstage/plugin-catalog-common@1.0.15
+  - @backstage/plugin-permission-common@0.7.7
+
 ## 0.1.18-next.0
 
 ### Patch Changes
diff --git a/plugins/jenkins-common/catalog-info.yaml b/plugins/jenkins-common/catalog-info.yaml
new file mode 100644
index 0000000000..1fbf7971f1
--- /dev/null
+++ b/plugins/jenkins-common/catalog-info.yaml
@@ -0,0 +1,9 @@
+apiVersion: backstage.io/v1alpha1
+kind: Component
+metadata:
+  name: backstage-plugin-jenkins-common
+  title: '@backstage/plugin-jenkins-common'
+spec:
+  lifecycle: experimental
+  type: backstage-common-library
+  owner: maintainers
diff --git a/plugins/jenkins-common/package.json b/plugins/jenkins-common/package.json
index 6d99a808bf..231e1cd73e 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.18-next.0",
+  "version": "0.1.19-next.1",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
@@ -19,6 +19,7 @@
     "url": "https://github.com/backstage/backstage",
     "directory": "plugins/jenkins-common"
   },
+  "sideEffects": false,
   "scripts": {
     "build": "backstage-cli package build",
     "lint": "backstage-cli package lint",
diff --git a/plugins/jenkins/CHANGELOG.md b/plugins/jenkins/CHANGELOG.md
index bb28eeeaf5..c8e5a45dce 100644
--- a/plugins/jenkins/CHANGELOG.md
+++ b/plugins/jenkins/CHANGELOG.md
@@ -1,5 +1,66 @@
 # @backstage/plugin-jenkins
 
+## 0.8.6-next.2
+
+### Patch Changes
+
+- 8cec7664e146: Removed `@types/node` dependency
+- Updated dependencies
+  - @backstage/core-components@0.13.5-next.2
+  - @backstage/core-plugin-api@1.6.0-next.2
+  - @backstage/plugin-catalog-react@1.8.4-next.2
+  - @backstage/catalog-model@1.4.2-next.1
+  - @backstage/errors@1.2.1
+  - @backstage/theme@0.4.1
+  - @backstage/plugin-jenkins-common@0.1.19-next.1
+
+## 0.8.6-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.8.4-next.1
+  - @backstage/core-components@0.13.5-next.1
+  - @backstage/catalog-model@1.4.2-next.0
+  - @backstage/core-plugin-api@1.6.0-next.1
+  - @backstage/errors@1.2.1
+  - @backstage/theme@0.4.1
+  - @backstage/plugin-jenkins-common@0.1.19-next.0
+
+## 0.8.5-next.0
+
+### Patch Changes
+
+- 482bb5c0bbf8: Moved `@types/react` to be a regular dependency
+- Updated dependencies
+  - @backstage/core-plugin-api@1.6.0-next.0
+  - @backstage/core-components@0.13.5-next.0
+  - @backstage/catalog-model@1.4.1
+  - @backstage/errors@1.2.1
+  - @backstage/theme@0.4.1
+  - @backstage/plugin-catalog-react@1.8.3-next.0
+  - @backstage/plugin-jenkins-common@0.1.18
+
+## 0.8.3
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-jenkins-common@0.1.18
+  - @backstage/core-components@0.13.4
+  - @backstage/plugin-catalog-react@1.8.1
+  - @backstage/core-plugin-api@1.5.3
+  - @backstage/catalog-model@1.4.1
+  - @backstage/errors@1.2.1
+  - @backstage/theme@0.4.1
+
+## 0.8.3-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.8.1-next.1
+
 ## 0.8.3-next.1
 
 ### Patch Changes
diff --git a/plugins/jenkins/api-report.md b/plugins/jenkins/api-report.md
index a2ae16988b..0782f0abd2 100644
--- a/plugins/jenkins/api-report.md
+++ b/plugins/jenkins/api-report.md
@@ -12,16 +12,18 @@ import { DiscoveryApi } from '@backstage/core-plugin-api';
 import { Entity } from '@backstage/catalog-model';
 import { IdentityApi } from '@backstage/core-plugin-api';
 import { InfoCardVariants } from '@backstage/core-components';
+import { JSX as JSX_2 } from 'react';
+import { default as React_2 } from 'react';
 import { RouteRef } from '@backstage/core-plugin-api';
 
 // @public (undocumented)
-export const EntityJenkinsContent: () => JSX.Element;
+export const EntityJenkinsContent: () => JSX_2.Element;
 
 // @public (undocumented)
 export const EntityLatestJenkinsRunCard: (props: {
   branch: string;
   variant?: InfoCardVariants | undefined;
-}) => JSX.Element;
+}) => JSX_2.Element;
 
 // @public (undocumented)
 const isJenkinsAvailable: (entity: Entity) => boolean;
@@ -109,7 +111,7 @@ export { jenkinsPlugin as plugin };
 export const LatestRunCard: (props: {
   branch: string;
   variant?: InfoCardVariants;
-}) => JSX.Element;
+}) => React_2.JSX.Element;
 
 // 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)
 //
@@ -119,5 +121,5 @@ export const LEGACY_JENKINS_ANNOTATION = 'jenkins.io/github-folder';
 // 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;
+export const Router: () => React_2.JSX.Element;
 ```
diff --git a/plugins/jenkins/catalog-info.yaml b/plugins/jenkins/catalog-info.yaml
new file mode 100644
index 0000000000..097034481d
--- /dev/null
+++ b/plugins/jenkins/catalog-info.yaml
@@ -0,0 +1,10 @@
+apiVersion: backstage.io/v1alpha1
+kind: Component
+metadata:
+  name: backstage-plugin-jenkins
+  title: '@backstage/plugin-jenkins'
+  description: A Backstage plugin that integrates towards Jenkins
+spec:
+  lifecycle: experimental
+  type: backstage-frontend-plugin
+  owner: maintainers
diff --git a/plugins/jenkins/package.json b/plugins/jenkins/package.json
index a44861de23..fd2ab214d3 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.8.3-next.1",
+  "version": "0.8.6-next.2",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
@@ -23,6 +23,7 @@
     "backstage",
     "jenkins"
   ],
+  "sideEffects": false,
   "scripts": {
     "build": "backstage-cli package build",
     "start": "backstage-cli package start",
@@ -43,6 +44,7 @@
     "@material-ui/core": "^4.12.2",
     "@material-ui/icons": "^4.9.1",
     "@material-ui/lab": "4.0.0-alpha.61",
+    "@types/react": "^16.13.1 || ^17.0.0",
     "luxon": "^3.0.0",
     "react-use": "^17.2.4"
   },
@@ -60,8 +62,6 @@
     "@testing-library/jest-dom": "^5.10.1",
     "@testing-library/react": "^12.1.3",
     "@testing-library/user-event": "^14.0.0",
-    "@types/node": "^16.11.26",
-    "@types/react": "^16.13.1 || ^17.0.0",
     "@types/testing-library__jest-dom": "^5.9.1",
     "cross-fetch": "^3.1.5",
     "msw": "^1.0.0"
diff --git a/plugins/kafka-backend/CHANGELOG.md b/plugins/kafka-backend/CHANGELOG.md
index 48291adcc1..89f8672d0e 100644
--- a/plugins/kafka-backend/CHANGELOG.md
+++ b/plugins/kafka-backend/CHANGELOG.md
@@ -1,5 +1,58 @@
 # @backstage/plugin-kafka-backend
 
+## 0.2.44-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config@1.1.0-next.1
+  - @backstage/backend-common@0.19.5-next.2
+  - @backstage/backend-plugin-api@0.6.3-next.2
+  - @backstage/catalog-model@1.4.2-next.1
+  - @backstage/errors@1.2.1
+
+## 0.2.44-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config@1.1.0-next.0
+  - @backstage/backend-common@0.19.5-next.1
+  - @backstage/backend-plugin-api@0.6.3-next.1
+  - @backstage/catalog-model@1.4.2-next.0
+  - @backstage/errors@1.2.1
+
+## 0.2.43-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.19.4-next.0
+  - @backstage/backend-plugin-api@0.6.2-next.0
+  - @backstage/catalog-model@1.4.1
+  - @backstage/config@1.0.8
+  - @backstage/errors@1.2.1
+
+## 0.2.41
+
+### Patch Changes
+
+- 629cbd194a87: Use `coreServices.rootConfig` instead of `coreService.config`
+- Updated dependencies
+  - @backstage/backend-common@0.19.2
+  - @backstage/backend-plugin-api@0.6.0
+  - @backstage/catalog-model@1.4.1
+  - @backstage/config@1.0.8
+  - @backstage/errors@1.2.1
+
+## 0.2.41-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@0.6.0-next.2
+  - @backstage/backend-common@0.19.2-next.2
+
 ## 0.2.41-next.1
 
 ### Patch Changes
diff --git a/plugins/kafka-backend/api-report.md b/plugins/kafka-backend/api-report.md
index a748a543d9..b03bad12e5 100644
--- a/plugins/kafka-backend/api-report.md
+++ b/plugins/kafka-backend/api-report.md
@@ -12,7 +12,8 @@ import { Logger } from 'winston';
 export function createRouter(options: RouterOptions): Promise<express.Router>;
 
 // @alpha
-export const kafkaPlugin: () => BackendFeature;
+const kafkaPlugin: () => BackendFeature;
+export default kafkaPlugin;
 
 // @public (undocumented)
 export interface RouterOptions {
diff --git a/plugins/kafka-backend/catalog-info.yaml b/plugins/kafka-backend/catalog-info.yaml
new file mode 100644
index 0000000000..13dc9fd963
--- /dev/null
+++ b/plugins/kafka-backend/catalog-info.yaml
@@ -0,0 +1,10 @@
+apiVersion: backstage.io/v1alpha1
+kind: Component
+metadata:
+  name: backstage-plugin-kafka-backend
+  title: '@backstage/plugin-kafka-backend'
+  description: A Backstage backend plugin that integrates towards Kafka
+spec:
+  lifecycle: experimental
+  type: backstage-backend-plugin
+  owner: andrewthauer
diff --git a/plugins/kafka-backend/package.json b/plugins/kafka-backend/package.json
index c3cf662208..f2f023332e 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.41-next.1",
+  "version": "0.2.44-next.2",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
diff --git a/plugins/kafka-backend/src/index.ts b/plugins/kafka-backend/src/index.ts
index 2000c8b89a..d87d313941 100644
--- a/plugins/kafka-backend/src/index.ts
+++ b/plugins/kafka-backend/src/index.ts
@@ -22,4 +22,4 @@
 
 export type { RouterOptions } from './service/router';
 export { createRouter } from './service/router';
-export { kafkaPlugin } from './plugin';
+export { kafkaPlugin as default } from './plugin';
diff --git a/plugins/kafka/CHANGELOG.md b/plugins/kafka/CHANGELOG.md
index 80751d23b8..d11e53714b 100644
--- a/plugins/kafka/CHANGELOG.md
+++ b/plugins/kafka/CHANGELOG.md
@@ -1,5 +1,63 @@
 # @backstage/plugin-kafka
 
+## 0.3.24-next.2
+
+### Patch Changes
+
+- 8cec7664e146: Removed `@types/node` dependency
+- Updated dependencies
+  - @backstage/core-components@0.13.5-next.2
+  - @backstage/core-plugin-api@1.6.0-next.2
+  - @backstage/config@1.1.0-next.1
+  - @backstage/plugin-catalog-react@1.8.4-next.2
+  - @backstage/catalog-model@1.4.2-next.1
+  - @backstage/theme@0.4.1
+
+## 0.3.24-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.8.4-next.1
+  - @backstage/core-components@0.13.5-next.1
+  - @backstage/config@1.1.0-next.0
+  - @backstage/catalog-model@1.4.2-next.0
+  - @backstage/core-plugin-api@1.6.0-next.1
+  - @backstage/theme@0.4.1
+
+## 0.3.23-next.0
+
+### Patch Changes
+
+- 482bb5c0bbf8: Moved `@types/react` to be a regular dependency
+- Updated dependencies
+  - @backstage/core-plugin-api@1.6.0-next.0
+  - @backstage/core-components@0.13.5-next.0
+  - @backstage/catalog-model@1.4.1
+  - @backstage/config@1.0.8
+  - @backstage/theme@0.4.1
+  - @backstage/plugin-catalog-react@1.8.3-next.0
+
+## 0.3.21
+
+### Patch Changes
+
+- 12a8c94eda8d: Add package repository and homepage metadata
+- Updated dependencies
+  - @backstage/core-components@0.13.4
+  - @backstage/plugin-catalog-react@1.8.1
+  - @backstage/core-plugin-api@1.5.3
+  - @backstage/catalog-model@1.4.1
+  - @backstage/config@1.0.8
+  - @backstage/theme@0.4.1
+
+## 0.3.21-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.8.1-next.1
+
 ## 0.3.21-next.1
 
 ### Patch Changes
diff --git a/plugins/kafka/api-report.md b/plugins/kafka/api-report.md
index 18b51b77fa..990a4da295 100644
--- a/plugins/kafka/api-report.md
+++ b/plugins/kafka/api-report.md
@@ -7,10 +7,12 @@
 
 import { BackstagePlugin } from '@backstage/core-plugin-api';
 import { Entity } from '@backstage/catalog-model';
+import { JSX as JSX_2 } from 'react';
+import { default as React_2 } from 'react';
 import { RouteRef } from '@backstage/core-plugin-api';
 
 // @public (undocumented)
-export const EntityKafkaContent: () => JSX.Element;
+export const EntityKafkaContent: () => JSX_2.Element;
 
 // @public (undocumented)
 const isPluginApplicableToEntity: (entity: Entity) => boolean;
@@ -33,5 +35,5 @@ export { kafkaPlugin };
 export { kafkaPlugin as plugin };
 
 // @public (undocumented)
-export const Router: () => JSX.Element;
+export const Router: () => React_2.JSX.Element;
 ```
diff --git a/plugins/kafka/catalog-info.yaml b/plugins/kafka/catalog-info.yaml
new file mode 100644
index 0000000000..cf0e0a6d9d
--- /dev/null
+++ b/plugins/kafka/catalog-info.yaml
@@ -0,0 +1,10 @@
+apiVersion: backstage.io/v1alpha1
+kind: Component
+metadata:
+  name: backstage-plugin-kafka
+  title: '@backstage/plugin-kafka'
+  description: A Backstage plugin that integrates towards Kafka
+spec:
+  lifecycle: experimental
+  type: backstage-frontend-plugin
+  owner: andrewthauer
diff --git a/plugins/kafka/package.json b/plugins/kafka/package.json
index 46ec0e8e51..b029e42bb6 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.21-next.1",
+  "version": "0.3.24-next.2",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
@@ -20,6 +20,7 @@
     "directory": "plugins/kafka"
   },
   "configSchema": "config.d.ts",
+  "sideEffects": false,
   "scripts": {
     "build": "backstage-cli package build",
     "start": "backstage-cli package start",
@@ -39,6 +40,7 @@
     "@material-ui/core": "^4.12.2",
     "@material-ui/icons": "^4.9.1",
     "@material-ui/lab": "4.0.0-alpha.61",
+    "@types/react": "^16.13.1 || ^17.0.0",
     "react-use": "^17.2.4"
   },
   "peerDependencies": {
@@ -56,8 +58,6 @@
     "@testing-library/react": "^12.1.3",
     "@testing-library/react-hooks": "^8.0.0",
     "@testing-library/user-event": "^14.0.0",
-    "@types/node": "^16.11.26",
-    "@types/react": "^16.13.1 || ^17.0.0",
     "jest-when": "^3.1.0",
     "msw": "^1.0.0"
   },
diff --git a/plugins/kubernetes-backend/CHANGELOG.md b/plugins/kubernetes-backend/CHANGELOG.md
index 532d0e0618..77fe7dec76 100644
--- a/plugins/kubernetes-backend/CHANGELOG.md
+++ b/plugins/kubernetes-backend/CHANGELOG.md
@@ -1,5 +1,94 @@
 # @backstage/plugin-kubernetes-backend
 
+## 0.11.6-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config@1.1.0-next.1
+  - @backstage/backend-common@0.19.5-next.2
+  - @backstage/plugin-auth-node@0.3.0-next.2
+  - @backstage/plugin-catalog-node@1.4.4-next.2
+  - @backstage/plugin-permission-node@0.7.14-next.2
+  - @backstage/integration-aws-node@0.1.6-next.1
+  - @backstage/backend-plugin-api@0.6.3-next.2
+  - @backstage/catalog-model@1.4.2-next.1
+  - @backstage/plugin-permission-common@0.7.8-next.1
+  - @backstage/catalog-client@1.4.4-next.1
+  - @backstage/errors@1.2.1
+  - @backstage/types@1.1.0
+  - @backstage/plugin-kubernetes-common@0.6.6-next.1
+
+## 0.11.6-next.1
+
+### Patch Changes
+
+- ccf00accb408: Add AWS Annotations to Kubernetes Cluster Resource
+- 47ea122590f5: fix "undefined" kind for custom resources
+- Updated dependencies
+  - @backstage/plugin-kubernetes-common@0.6.6-next.0
+  - @backstage/config@1.1.0-next.0
+  - @backstage/backend-common@0.19.5-next.1
+  - @backstage/backend-plugin-api@0.6.3-next.1
+  - @backstage/catalog-model@1.4.2-next.0
+  - @backstage/integration-aws-node@0.1.6-next.0
+  - @backstage/plugin-auth-node@0.3.0-next.1
+  - @backstage/plugin-permission-common@0.7.8-next.0
+  - @backstage/plugin-permission-node@0.7.14-next.1
+  - @backstage/plugin-catalog-node@1.4.4-next.1
+  - @backstage/catalog-client@1.4.4-next.0
+  - @backstage/errors@1.2.1
+  - @backstage/types@1.1.0
+
+## 0.11.5-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-auth-node@0.3.0-next.0
+  - @backstage/backend-common@0.19.4-next.0
+  - @backstage/backend-plugin-api@0.6.2-next.0
+  - @backstage/catalog-client@1.4.3
+  - @backstage/catalog-model@1.4.1
+  - @backstage/config@1.0.8
+  - @backstage/errors@1.2.1
+  - @backstage/integration-aws-node@0.1.5
+  - @backstage/plugin-catalog-node@1.4.3-next.0
+  - @backstage/plugin-kubernetes-common@0.6.5
+  - @backstage/plugin-permission-common@0.7.7
+  - @backstage/plugin-permission-node@0.7.13-next.0
+
+## 0.11.3
+
+### Patch Changes
+
+- 629cbd194a87: Use `coreServices.rootConfig` instead of `coreService.config`
+- bbf4e9c894b5: Fixed a bug where the proxy was not rewriting WebSocket request paths properly.
+- Updated dependencies
+  - @backstage/backend-common@0.19.2
+  - @backstage/backend-plugin-api@0.6.0
+  - @backstage/plugin-catalog-node@1.4.1
+  - @backstage/plugin-auth-node@0.2.17
+  - @backstage/plugin-permission-node@0.7.11
+  - @backstage/integration-aws-node@0.1.5
+  - @backstage/catalog-client@1.4.3
+  - @backstage/catalog-model@1.4.1
+  - @backstage/config@1.0.8
+  - @backstage/errors@1.2.1
+  - @backstage/plugin-kubernetes-common@0.6.5
+  - @backstage/plugin-permission-common@0.7.7
+
+## 0.11.3-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@0.6.0-next.2
+  - @backstage/backend-common@0.19.2-next.2
+  - @backstage/plugin-catalog-node@1.4.1-next.2
+  - @backstage/plugin-permission-node@0.7.11-next.2
+  - @backstage/plugin-auth-node@0.2.17-next.2
+
 ## 0.11.3-next.1
 
 ### Patch Changes
diff --git a/plugins/kubernetes-backend/alpha-api-report.md b/plugins/kubernetes-backend/alpha-api-report.md
index f95c1414f3..f6eeec5b4c 100644
--- a/plugins/kubernetes-backend/alpha-api-report.md
+++ b/plugins/kubernetes-backend/alpha-api-report.md
@@ -6,7 +6,8 @@
 import { BackendFeature } from '@backstage/backend-plugin-api';
 
 // @alpha
-export const kubernetesPlugin: () => BackendFeature;
+const kubernetesPlugin: () => BackendFeature;
+export default kubernetesPlugin;
 
 // (No @packageDocumentation comment for this package)
 ```
diff --git a/plugins/kubernetes-backend/catalog-info.yaml b/plugins/kubernetes-backend/catalog-info.yaml
new file mode 100644
index 0000000000..cd1026d01d
--- /dev/null
+++ b/plugins/kubernetes-backend/catalog-info.yaml
@@ -0,0 +1,10 @@
+apiVersion: backstage.io/v1alpha1
+kind: Component
+metadata:
+  name: backstage-plugin-kubernetes-backend
+  title: '@backstage/plugin-kubernetes-backend'
+  description: A Backstage backend plugin that integrates towards Kubernetes
+spec:
+  lifecycle: experimental
+  type: backstage-backend-plugin
+  owner: kubernetes-maintainers
diff --git a/plugins/kubernetes-backend/package.json b/plugins/kubernetes-backend/package.json
index 6663479f5e..c75b7cbd69 100644
--- a/plugins/kubernetes-backend/package.json
+++ b/plugins/kubernetes-backend/package.json
@@ -1,14 +1,12 @@
 {
   "name": "@backstage/plugin-kubernetes-backend",
   "description": "A Backstage backend plugin that integrates towards Kubernetes",
-  "version": "0.11.3-next.1",
+  "version": "0.11.6-next.2",
   "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"
+    "access": "public"
   },
   "exports": {
     ".": "./src/index.ts",
@@ -65,6 +63,7 @@
     "@backstage/plugin-kubernetes-common": "workspace:^",
     "@backstage/plugin-permission-common": "workspace:^",
     "@backstage/plugin-permission-node": "workspace:^",
+    "@backstage/types": "workspace:^",
     "@google-cloud/container": "^4.0.0",
     "@jest-mock/express": "^2.0.1",
     "@kubernetes/client-node": "0.18.1",
diff --git a/plugins/kubernetes-backend/src/alpha.ts b/plugins/kubernetes-backend/src/alpha.ts
index 3041a5682c..9171964f7c 100644
--- a/plugins/kubernetes-backend/src/alpha.ts
+++ b/plugins/kubernetes-backend/src/alpha.ts
@@ -13,4 +13,4 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-export { kubernetesPlugin } from './plugin';
+export { kubernetesPlugin as default } from './plugin';
diff --git a/plugins/kubernetes-backend/src/cluster-locator/CatalogClusterLocator.test.ts b/plugins/kubernetes-backend/src/cluster-locator/CatalogClusterLocator.test.ts
index 81ee863cb7..f436024131 100644
--- a/plugins/kubernetes-backend/src/cluster-locator/CatalogClusterLocator.test.ts
+++ b/plugins/kubernetes-backend/src/cluster-locator/CatalogClusterLocator.test.ts
@@ -29,7 +29,7 @@ const mockCatalogApi = {
           annotations: {
             'kubernetes.io/api-server': 'https://apiserver.com',
             'kubernetes.io/api-server-certificate-authority': 'caData',
-            'kubernetes.io/auth-provider': 'aws',
+            'kubernetes.io/auth-provider': 'oidc',
             'kubernetes.io/oidc-token-provider': 'google',
             'kubernetes.io/skip-metrics-lookup': 'true',
             'kubernetes.io/skip-tls-verify': 'true',
@@ -40,6 +40,24 @@ const mockCatalogApi = {
           namespace: 'default',
         },
       },
+      {
+        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/aws-assume-role': 'my-role',
+            'kubernetes.io/aws-external-id': 'my-id',
+            'kubernetes.io/oidc-token-provider': 'google',
+            'kubernetes.io/dashboard-url': 'my-url',
+            'kubernetes.io/dashboard-app': 'my-app',
+          },
+          name: 'owned',
+          namespace: 'default',
+        },
+      },
     ],
   }),
 } as unknown as CatalogApi;
@@ -67,12 +85,12 @@ describe('CatalogClusterLocator', () => {
 
     const result = await clusterSupplier.getClusters();
 
-    expect(result).toHaveLength(1);
+    expect(result).toHaveLength(2);
     expect(result[0]).toStrictEqual({
       name: 'owned',
       url: 'https://apiserver.com',
       caData: 'caData',
-      authProvider: 'aws',
+      authProvider: 'oidc',
       oidcTokenProvider: 'google',
       skipMetricsLookup: true,
       skipTLSVerify: true,
@@ -80,4 +98,25 @@ describe('CatalogClusterLocator', () => {
       dashboardApp: 'my-app',
     });
   });
+
+  it('returns the aws cluster details provided by annotations', async () => {
+    const clusterSupplier = CatalogClusterLocator.fromConfig(mockCatalogApi);
+
+    const result = await clusterSupplier.getClusters();
+
+    expect(result).toHaveLength(2);
+    expect(result[1]).toStrictEqual({
+      name: 'owned',
+      url: 'https://apiserver.com',
+      caData: 'caData',
+      authProvider: 'aws',
+      assumeRole: 'my-role',
+      externalId: 'my-id',
+      oidcTokenProvider: 'google',
+      skipMetricsLookup: false,
+      skipTLSVerify: false,
+      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 b952aefccf..c48cc99eb6 100644
--- a/plugins/kubernetes-backend/src/cluster-locator/CatalogClusterLocator.ts
+++ b/plugins/kubernetes-backend/src/cluster-locator/CatalogClusterLocator.ts
@@ -14,7 +14,11 @@
  * limitations under the License.
  */
 
-import { ClusterDetails, KubernetesClustersSupplier } from '../types/types';
+import {
+  AWSClusterDetails,
+  ClusterDetails,
+  KubernetesClustersSupplier,
+} from '../types/types';
 import { CATALOG_FILTER_EXISTS, CatalogApi } from '@backstage/catalog-client';
 import {
   ANNOTATION_KUBERNETES_API_SERVER,
@@ -25,6 +29,8 @@ import {
   ANNOTATION_KUBERNETES_SKIP_TLS_VERIFY,
   ANNOTATION_KUBERNETES_DASHBOARD_URL,
   ANNOTATION_KUBERNETES_DASHBOARD_APP,
+  ANNOTATION_KUBERNETES_AWS_EXTERNAL_ID,
+  ANNOTATION_KUBERNETES_AWS_ASSUME_ROLE,
 } from '@backstage/plugin-kubernetes-common';
 
 export class CatalogClusterLocator implements KubernetesClustersSupplier {
@@ -69,21 +75,31 @@ export class CatalogClusterLocator implements KubernetesClustersSupplier {
         skipMetricsLookup:
           entity.metadata.annotations![
             ANNOTATION_KUBERNETES_SKIP_METRICS_LOOKUP
-          ]! === 'true'
-            ? true
-            : false,
+          ]! === 'true',
         skipTLSVerify:
           entity.metadata.annotations![
             ANNOTATION_KUBERNETES_SKIP_TLS_VERIFY
-          ]! === 'true'
-            ? true
-            : false,
+          ]! === 'true',
         dashboardUrl:
           entity.metadata.annotations![ANNOTATION_KUBERNETES_DASHBOARD_URL]!,
         dashboardApp:
           entity.metadata.annotations![ANNOTATION_KUBERNETES_DASHBOARD_APP]!,
       };
 
+      if (clusterDetails.authProvider === 'aws') {
+        return {
+          ...clusterDetails,
+          assumeRole:
+            entity.metadata.annotations![
+              ANNOTATION_KUBERNETES_AWS_ASSUME_ROLE
+            ]!,
+          externalId:
+            entity.metadata.annotations![
+              ANNOTATION_KUBERNETES_AWS_EXTERNAL_ID
+            ]!,
+        } as AWSClusterDetails;
+      }
+
       return clusterDetails;
     });
   }
diff --git a/plugins/kubernetes-backend/src/service/KubernetesFetcher.test.ts b/plugins/kubernetes-backend/src/service/KubernetesFetcher.test.ts
index 9800780077..1a603a7a98 100644
--- a/plugins/kubernetes-backend/src/service/KubernetesFetcher.test.ts
+++ b/plugins/kubernetes-backend/src/service/KubernetesFetcher.test.ts
@@ -351,6 +351,7 @@ describe('KubernetesFetcher', () => {
           res(
             checkToken(req, ctx, 'token'),
             withLabels(req, ctx, {
+              kind: 'PodList',
               items: [{ metadata: { name: 'pod-name' } }],
             }),
           ),
@@ -359,6 +360,7 @@ describe('KubernetesFetcher', () => {
           res(
             checkToken(req, ctx, 'token'),
             withLabels(req, ctx, {
+              kind: 'ServiceList',
               items: [{ metadata: { name: 'service-name' } }],
             }),
           ),
@@ -369,6 +371,7 @@ describe('KubernetesFetcher', () => {
             res(
               checkToken(req, ctx, 'token'),
               withLabels(req, ctx, {
+                kind: 'ThingList',
                 items: [{ metadata: { name: 'something-else' } }],
               }),
             ),
@@ -424,6 +427,7 @@ describe('KubernetesFetcher', () => {
             type: 'customresources',
             resources: [
               {
+                kind: 'Thing',
                 metadata: {
                   name: 'something-else',
                   labels: { 'backstage.io/kubernetes-id': 'some-service' },
diff --git a/plugins/kubernetes-backend/src/service/KubernetesFetcher.ts b/plugins/kubernetes-backend/src/service/KubernetesFetcher.ts
index b2be199d50..25bade3e97 100644
--- a/plugins/kubernetes-backend/src/service/KubernetesFetcher.ts
+++ b/plugins/kubernetes-backend/src/service/KubernetesFetcher.ts
@@ -41,6 +41,7 @@ import {
 import fetch, { RequestInit, Response } from 'node-fetch';
 import * as https from 'https';
 import fs from 'fs-extra';
+import { JsonObject } from '@backstage/types';
 
 export interface KubernetesClientBasedFetcherOptions {
   logger: Logger;
@@ -104,9 +105,15 @@ export class KubernetesClientBasedFetcher implements KubernetesFetcher {
           (r: Response): Promise<FetchResult> =>
             r.ok
               ? r.json().then(
-                  ({ items }): FetchResponse => ({
+                  ({ kind, items }): FetchResponse => ({
                     type: objectType,
-                    resources: items,
+                    resources:
+                      objectType === 'customresources'
+                        ? items.map((item: JsonObject) => ({
+                            ...item,
+                            kind: kind.replace(/(List)$/, ''),
+                          }))
+                        : items,
                   }),
                 )
               : this.handleUnsuccessfulResponse(params.clusterDetails.name, r),
diff --git a/plugins/kubernetes-common/CHANGELOG.md b/plugins/kubernetes-common/CHANGELOG.md
index 6ff3e84e07..610e94cca3 100644
--- a/plugins/kubernetes-common/CHANGELOG.md
+++ b/plugins/kubernetes-common/CHANGELOG.md
@@ -1,5 +1,22 @@
 # @backstage/plugin-kubernetes-common
 
+## 0.6.6-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/catalog-model@1.4.2-next.1
+  - @backstage/plugin-permission-common@0.7.8-next.1
+
+## 0.6.6-next.0
+
+### Patch Changes
+
+- ccf00accb408: Add AWS Annotations to Kubernetes Cluster Resource
+- Updated dependencies
+  - @backstage/catalog-model@1.4.2-next.0
+  - @backstage/plugin-permission-common@0.7.8-next.0
+
 ## 0.6.5
 
 ### Patch Changes
diff --git a/plugins/kubernetes-common/api-report.md b/plugins/kubernetes-common/api-report.md
index 56faeea7d9..aae72d6f1e 100644
--- a/plugins/kubernetes-common/api-report.md
+++ b/plugins/kubernetes-common/api-report.md
@@ -31,6 +31,14 @@ export const ANNOTATION_KUBERNETES_API_SERVER_CA =
 export const ANNOTATION_KUBERNETES_AUTH_PROVIDER =
   'kubernetes.io/auth-provider';
 
+// @public
+export const ANNOTATION_KUBERNETES_AWS_ASSUME_ROLE =
+  'kubernetes.io/aws-assume-role';
+
+// @public
+export const ANNOTATION_KUBERNETES_AWS_EXTERNAL_ID =
+  'kubernetes.io/aws-external-id';
+
 // @public
 export const ANNOTATION_KUBERNETES_DASHBOARD_APP =
   'kubernetes.io/dashboard-app';
diff --git a/plugins/kubernetes-common/catalog-info.yaml b/plugins/kubernetes-common/catalog-info.yaml
new file mode 100644
index 0000000000..be2e47bbbe
--- /dev/null
+++ b/plugins/kubernetes-common/catalog-info.yaml
@@ -0,0 +1,12 @@
+apiVersion: backstage.io/v1alpha1
+kind: Component
+metadata:
+  name: backstage-plugin-kubernetes-common
+  title: '@backstage/plugin-kubernetes-common'
+  description: >-
+    Common functionalities for kubernetes, to be shared between kubernetes and
+    kubernetes-backend plugin
+spec:
+  lifecycle: experimental
+  type: backstage-common-library
+  owner: kubernetes-maintainers
diff --git a/plugins/kubernetes-common/package.json b/plugins/kubernetes-common/package.json
index 0e59a22987..8b934533b1 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.6.5",
+  "version": "0.6.6-next.1",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
@@ -26,6 +26,7 @@
   "files": [
     "dist"
   ],
+  "sideEffects": false,
   "scripts": {
     "build": "backstage-cli package build",
     "lint": "backstage-cli package lint",
diff --git a/plugins/kubernetes-common/src/catalog-entity-constants.ts b/plugins/kubernetes-common/src/catalog-entity-constants.ts
index a1a1996777..8a826d4316 100644
--- a/plugins/kubernetes-common/src/catalog-entity-constants.ts
+++ b/plugins/kubernetes-common/src/catalog-entity-constants.ts
@@ -76,3 +76,19 @@ export const ANNOTATION_KUBERNETES_DASHBOARD_URL =
  */
 export const ANNOTATION_KUBERNETES_DASHBOARD_APP =
   'kubernetes.io/dashboard-app';
+
+/**
+ * Annotation for specifying the assume role use to authenticate with AWS.
+ *
+ * @public
+ */
+export const ANNOTATION_KUBERNETES_AWS_ASSUME_ROLE =
+  'kubernetes.io/aws-assume-role';
+
+/**
+ * Annotation for specifying an external id when communicating with AWS
+ *
+ * @public
+ */
+export const ANNOTATION_KUBERNETES_AWS_EXTERNAL_ID =
+  'kubernetes.io/aws-external-id';
diff --git a/plugins/kubernetes/CHANGELOG.md b/plugins/kubernetes/CHANGELOG.md
index 600363e960..bc64f49fc2 100644
--- a/plugins/kubernetes/CHANGELOG.md
+++ b/plugins/kubernetes/CHANGELOG.md
@@ -1,5 +1,78 @@
 # @backstage/plugin-kubernetes
 
+## 0.10.3-next.2
+
+### Patch Changes
+
+- 8cec7664e146: Removed `@types/node` dependency
+- Updated dependencies
+  - @backstage/core-components@0.13.5-next.2
+  - @backstage/core-plugin-api@1.6.0-next.2
+  - @backstage/config@1.1.0-next.1
+  - @backstage/plugin-catalog-react@1.8.4-next.2
+  - @backstage/catalog-model@1.4.2-next.1
+  - @backstage/errors@1.2.1
+  - @backstage/theme@0.4.1
+  - @backstage/plugin-kubernetes-common@0.6.6-next.1
+
+## 0.10.3-next.1
+
+### Patch Changes
+
+- 6a5e04e20e6e: fix logs dialog min height
+- Updated dependencies
+  - @backstage/plugin-kubernetes-common@0.6.6-next.0
+  - @backstage/plugin-catalog-react@1.8.4-next.1
+  - @backstage/core-components@0.13.5-next.1
+  - @backstage/config@1.1.0-next.0
+  - @backstage/catalog-model@1.4.2-next.0
+  - @backstage/core-plugin-api@1.6.0-next.1
+  - @backstage/errors@1.2.1
+  - @backstage/theme@0.4.1
+
+## 0.10.2-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-plugin-api@1.6.0-next.0
+  - @backstage/core-components@0.13.5-next.0
+  - @backstage/catalog-model@1.4.1
+  - @backstage/config@1.0.8
+  - @backstage/errors@1.2.1
+  - @backstage/theme@0.4.1
+  - @backstage/plugin-catalog-react@1.8.3-next.0
+  - @backstage/plugin-kubernetes-common@0.6.5
+
+## 0.10.0
+
+### Minor Changes
+
+- 4b6d41737aad: **BREAKING**: Fixed typos in exported module attributes. Many users may see no changes, but if you have customized the plugin output, you may have to rename the following:
+
+  - Component attribute: `<ResourceUtilization totalFormated={} />` to `<ResourceUtilization totalFormatted={} />`
+  - Interface attribute: `DetectedError.occuranceCount` to `DetectedError.occurrenceCount`.
+
+### Patch Changes
+
+- 562e34d2693f: Fix container memory limits
+- Updated dependencies
+  - @backstage/core-components@0.13.4
+  - @backstage/plugin-catalog-react@1.8.1
+  - @backstage/core-plugin-api@1.5.3
+  - @backstage/catalog-model@1.4.1
+  - @backstage/config@1.0.8
+  - @backstage/errors@1.2.1
+  - @backstage/theme@0.4.1
+  - @backstage/plugin-kubernetes-common@0.6.5
+
+## 0.9.4-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.8.1-next.1
+
 ## 0.9.4-next.0
 
 ### Patch Changes
diff --git a/plugins/kubernetes/api-report.md b/plugins/kubernetes/api-report.md
index 7cef17af7b..77ec8dd19c 100644
--- a/plugins/kubernetes/api-report.md
+++ b/plugins/kubernetes/api-report.md
@@ -30,6 +30,7 @@ import { OpenIdConnectApi } from '@backstage/core-plugin-api';
 import { Pod } from 'kubernetes-models/v1/Pod';
 import { Pod as Pod_2 } from 'kubernetes-models/v1';
 import { default as React_2 } from 'react';
+import * as React_3 from 'react';
 import { RouteRef } from '@backstage/core-plugin-api';
 import { TypeMeta } from '@kubernetes-models/base';
 import { V1ConfigMap } from '@kubernetes/client-node';
@@ -52,7 +53,7 @@ import { WorkloadsByEntityRequest } from '@backstage/plugin-kubernetes-common';
 export const Cluster: ({
   clusterObjects,
   podsWithErrors,
-}: ClusterProps) => JSX.Element;
+}: ClusterProps) => React_2.JSX.Element;
 
 // 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)
 //
@@ -110,13 +111,13 @@ export interface ContainerScope extends PodScope {
 // 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;
+export const CronJobsAccordions: ({}: CronJobsAccordionsProps) => React_2.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 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;
+export const CustomResources: ({}: CustomResourcesProps) => React_2.JSX.Element;
 
 // 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)
 //
@@ -137,7 +138,7 @@ export interface DetectedError {
   // (undocumented)
   message: string;
   // (undocumented)
-  occuranceCount: number;
+  occurrenceCount: number;
   // Warning: (ae-forgotten-export) The symbol "ProposedFix" needs to be exported by the entry point index.d.ts
   //
   // (undocumented)
@@ -174,7 +175,9 @@ export type EntityKubernetesContentProps = {
 };
 
 // @public
-export const ErrorList: ({ podAndErrors }: ErrorListProps) => JSX.Element;
+export const ErrorList: ({
+  podAndErrors,
+}: ErrorListProps) => React_2.JSX.Element;
 
 // @public
 export interface ErrorListProps {
@@ -195,7 +198,7 @@ export const ErrorPanel: ({
   entityName,
   errorMessage,
   clustersWithErrors,
-}: ErrorPanelProps) => JSX.Element;
+}: ErrorPanelProps) => React_2.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 part of the package's API, but it is missing a release tag (@alpha, @beta, @public, or @internal)
@@ -203,7 +206,7 @@ export const ErrorPanel: ({
 // @public (undocumented)
 export const ErrorReporting: ({
   detectedErrors,
-}: ErrorReportingProps) => JSX.Element;
+}: ErrorReportingProps) => React_3.JSX.Element;
 
 // @public
 export type ErrorSeverity = 0 | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 10;
@@ -214,13 +217,13 @@ export const Events: ({
   namespace,
   clusterName,
   warningEventsOnly,
-}: EventsProps) => JSX.Element;
+}: EventsProps) => React_2.JSX.Element;
 
 // @public
 export const EventsContent: ({
   events,
   warningEventsOnly,
-}: EventsContentProps) => JSX.Element;
+}: EventsContentProps) => React_2.JSX.Element;
 
 // @public
 export interface EventsContentProps {
@@ -323,13 +326,13 @@ export const HorizontalPodAutoscalerDrawer: (props: {
   hpa: V1HorizontalPodAutoscaler;
   expanded?: boolean;
   children?: React_2.ReactNode;
-}) => JSX.Element;
+}) => React_2.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 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;
+export const IngressesAccordions: ({}: IngressesAccordionsProps) => React_2.JSX.Element;
 
 // 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)
 //
@@ -340,7 +343,9 @@ export const isKubernetesAvailable: (entity: Entity) => boolean;
 // 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;
+export const JobsAccordions: ({
+  jobs,
+}: JobsAccordionsProps) => React_2.JSX.Element;
 
 // 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)
 //
@@ -464,7 +469,7 @@ export class KubernetesBackendClient implements KubernetesApi {
 export const KubernetesContent: ({
   entity,
   refreshIntervalMs,
-}: KubernetesContentProps) => JSX.Element;
+}: KubernetesContentProps) => React_2.JSX.Element;
 
 // 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 part of the package's API, but it is missing a release tag (@alpha, @beta, @public, or @internal)
@@ -476,7 +481,7 @@ export const KubernetesDrawer: ({
   drawerContentsHeader,
   kubernetesObject,
   children,
-}: KubernetesDrawerProps) => JSX.Element;
+}: KubernetesDrawerProps) => React_2.JSX.Element;
 
 // Warning: (ae-forgotten-export) The symbol "KubernetesDrawerContentProps" needs to be exported by the entry point index.d.ts
 // Warning: (ae-missing-release-tag) "KubernetesDrawerContent" is part of the package's API, but it is missing a release tag (@alpha, @beta, @public, or @internal)
@@ -487,7 +492,7 @@ export const KubernetesDrawerContent: ({
   header,
   kubernetesObject,
   close,
-}: KubernetesDrawerContentProps) => JSX.Element;
+}: KubernetesDrawerContentProps) => React_2.JSX.Element;
 
 // 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)
 //
@@ -586,7 +591,7 @@ export const KubernetesStructuredMetadataTableDrawer: <
   buttonVariant,
   expanded,
   children,
-}: KubernetesStructuredMetadataTableDrawerProps<T>) => JSX.Element;
+}: KubernetesStructuredMetadataTableDrawerProps<T>) => React_2.JSX.Element;
 
 // Warning: (ae-forgotten-export) The symbol "ErrorPanelProps_2" needs to be exported by the entry point index.d.ts
 // Warning: (ae-missing-release-tag) "LinkErrorPanel" is part of the package's API, but it is missing a release tag (@alpha, @beta, @public, or @internal)
@@ -595,12 +600,12 @@ export const KubernetesStructuredMetadataTableDrawer: <
 export const LinkErrorPanel: ({
   cluster,
   errorMessage,
-}: ErrorPanelProps_2) => JSX.Element;
+}: ErrorPanelProps_2) => React_2.JSX.Element;
 
 // @public
 export const PendingPodContent: ({
   pod,
-}: PendingPodContentProps) => JSX.Element;
+}: PendingPodContentProps) => React_2.JSX.Element;
 
 // @public
 export interface PendingPodContentProps {
@@ -621,7 +626,32 @@ export interface PodAndErrors {
 // Warning: (ae-forgotten-export) The symbol "PodDrawerProps" needs to be exported by the entry point index.d.ts
 //
 // @public
-export const PodDrawer: ({ podAndErrors, open }: PodDrawerProps) => JSX.Element;
+export const PodDrawer: ({
+  podAndErrors,
+  open,
+}: PodDrawerProps) => React_2.JSX.Element;
+
+// @public
+export const PodExecTerminal: (
+  props: PodExecTerminalProps,
+) => React_2.JSX.Element;
+
+// @public
+export const PodExecTerminalDialog: (
+  props: PodExecTerminalProps,
+) => React_2.JSX.Element;
+
+// @public
+export interface PodExecTerminalProps {
+  // (undocumented)
+  clusterName: string;
+  // (undocumented)
+  containerName: string;
+  // (undocumented)
+  podName: string;
+  // (undocumented)
+  podNamespace: string;
+}
 
 // @public
 export const PodLogs: React_2.FC<PodLogsProps>;
@@ -629,7 +659,7 @@ export const PodLogs: React_2.FC<PodLogsProps>;
 // @public
 export const PodLogsDialog: ({
   containerScope,
-}: PodLogsDialogProps) => JSX.Element;
+}: PodLogsDialogProps) => React_2.JSX.Element;
 
 // @public
 export interface PodLogsDialogProps {
@@ -692,7 +722,7 @@ export interface PodScope {
 export const PodsTable: ({
   pods,
   extraColumns,
-}: PodsTablesProps) => JSX.Element;
+}: PodsTablesProps) => React_2.JSX.Element;
 
 // @public
 export interface ResourceRef {
@@ -714,13 +744,15 @@ export const ResourceUtilization: ({
   title,
   usage,
   total,
-  totalFormated,
-}: ResourceUtilizationProps) => JSX.Element;
+  totalFormatted,
+}: ResourceUtilizationProps) => React_2.JSX.Element;
 
 // 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;
+export const Router: (props: {
+  refreshIntervalMs?: number;
+}) => React_2.JSX.Element;
 
 // @public
 export class ServerSideKubernetesAuthProvider
@@ -738,7 +770,7 @@ export class ServerSideKubernetesAuthProvider
 // 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;
+export const ServicesAccordions: ({}: ServicesAccordionsProps) => React_2.JSX.Element;
 
 // @public
 export const useCustomResources: (
diff --git a/plugins/kubernetes/catalog-info.yaml b/plugins/kubernetes/catalog-info.yaml
new file mode 100644
index 0000000000..8f96a0c10c
--- /dev/null
+++ b/plugins/kubernetes/catalog-info.yaml
@@ -0,0 +1,10 @@
+apiVersion: backstage.io/v1alpha1
+kind: Component
+metadata:
+  name: backstage-plugin-kubernetes
+  title: '@backstage/plugin-kubernetes'
+  description: A Backstage plugin that integrates towards Kubernetes
+spec:
+  lifecycle: experimental
+  type: backstage-frontend-plugin
+  owner: kubernetes-maintainers
diff --git a/plugins/kubernetes/package.json b/plugins/kubernetes/package.json
index 1f137a6240..46a52c37bd 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.9.4-next.0",
+  "version": "0.10.3-next.2",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
@@ -23,6 +23,7 @@
     "backstage",
     "kubernetes"
   ],
+  "sideEffects": false,
   "scripts": {
     "build": "backstage-cli package build",
     "start": "backstage-cli package start",
@@ -53,7 +54,10 @@
     "kubernetes-models": "^4.1.0",
     "lodash": "^4.17.21",
     "luxon": "^3.0.0",
-    "react-use": "^17.2.4"
+    "react-use": "^17.2.4",
+    "xterm": "^5.2.1",
+    "xterm-addon-attach": "^0.8.0",
+    "xterm-addon-fit": "^0.7.0"
   },
   "peerDependencies": {
     "react": "^16.13.1 || ^17.0.0",
@@ -71,6 +75,7 @@
     "@testing-library/react-hooks": "^8.0.0",
     "@testing-library/user-event": "^14.0.0",
     "@types/node": "^16.11.26",
+    "jest-websocket-mock": "^2.4.1",
     "msw": "^1.0.0"
   },
   "files": [
diff --git a/plugins/kubernetes/src/components/PodExecTerminal/PodExecTerminal.test.tsx b/plugins/kubernetes/src/components/PodExecTerminal/PodExecTerminal.test.tsx
new file mode 100644
index 0000000000..1c913a7726
--- /dev/null
+++ b/plugins/kubernetes/src/components/PodExecTerminal/PodExecTerminal.test.tsx
@@ -0,0 +1,95 @@
+/*
+ * 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 { DiscoveryApi, discoveryApiRef } from '@backstage/core-plugin-api';
+import {
+  renderInTestApp,
+  TestApiProvider,
+  textContentMatcher,
+} from '@backstage/test-utils';
+import '@testing-library/jest-dom';
+import { screen } from '@testing-library/react';
+import WS from 'jest-websocket-mock';
+import React from 'react';
+import './matchMedia.mock';
+import { PodExecTerminal } from './PodExecTerminal';
+
+const textEncoder = new TextEncoder();
+
+describe('PodExecTerminal', () => {
+  const clusterName = 'cluster1';
+  const containerName = 'container2';
+  const podName = 'pod1';
+  const podNamespace = 'podNamespace';
+
+  const mockDiscoveryApi: Partial<DiscoveryApi> = {
+    getBaseUrl: () => Promise.resolve('http://localhost'),
+  };
+
+  it('Should render an XTerm web terminal', async () => {
+    await renderInTestApp(
+      <TestApiProvider apis={[[discoveryApiRef, mockDiscoveryApi]]}>
+        <PodExecTerminal
+          clusterName={clusterName}
+          containerName={containerName}
+          podName={podName}
+          podNamespace={podNamespace}
+        />
+      </TestApiProvider>,
+    );
+
+    await expect(
+      screen.findByText(
+        textContentMatcher('Starting terminal, please wait...'),
+      ),
+    ).resolves.toBeInTheDocument();
+  });
+
+  it('Should connect to WebSocket server & render response', async () => {
+    const server = new WS(
+      'ws://localhost/proxy/api/v1/namespaces/podNamespace/pods/pod1/exec?container=container2&stdin=true&stdout=true&stderr=true&tty=true&command=%2Fbin%2Fsh',
+    );
+
+    await renderInTestApp(
+      <TestApiProvider apis={[[discoveryApiRef, mockDiscoveryApi]]}>
+        <PodExecTerminal
+          clusterName={clusterName}
+          containerName={containerName}
+          podName={podName}
+          podNamespace={podNamespace}
+        />
+      </TestApiProvider>,
+    );
+
+    // xterm uses a "W" character as a "measure element" -- if it exists, the terminal rendered correctly
+    await expect(
+      screen.findByText(textContentMatcher('W')),
+    ).resolves.toBeInTheDocument();
+
+    await server.connected;
+
+    const { buffer } = Uint8Array.from([
+      1,
+      ...textEncoder.encode('hello world'),
+    ]);
+
+    server.send(buffer);
+
+    await expect(
+      screen.findByText(textContentMatcher('hello world')),
+    ).resolves.toBeInTheDocument();
+  });
+});
diff --git a/plugins/kubernetes/src/components/PodExecTerminal/PodExecTerminal.tsx b/plugins/kubernetes/src/components/PodExecTerminal/PodExecTerminal.tsx
new file mode 100644
index 0000000000..a741f4e189
--- /dev/null
+++ b/plugins/kubernetes/src/components/PodExecTerminal/PodExecTerminal.tsx
@@ -0,0 +1,131 @@
+/*
+ * 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 'xterm/css/xterm.css';
+
+import { discoveryApiRef, useApi } from '@backstage/core-plugin-api';
+import React, { useEffect, useMemo, useState } from 'react';
+import { Terminal } from 'xterm';
+import { FitAddon } from 'xterm-addon-fit';
+
+import { PodExecTerminalAttachAddon } from './PodExecTerminalAttachAddon';
+
+/**
+ * Props drilled down to the PodExecTerminal component
+ *
+ * @public
+ */
+export interface PodExecTerminalProps {
+  clusterName: string;
+  containerName: string;
+  podName: string;
+  podNamespace: string;
+}
+
+const hasSocketProtocol = (url: string | URL) =>
+  /wss?:\/\//.test(url.toString());
+
+/**
+ * Executes a `/bin/sh` process in the given pod's container and opens a terminal connected to it
+ *
+ * @public
+ */
+export const PodExecTerminal = (props: PodExecTerminalProps) => {
+  const { containerName, podNamespace, podName } = props;
+
+  const [baseUrl, setBaseUrl] = useState(window.location.host);
+
+  const terminalRef = React.useRef(null);
+  const discoveryApi = useApi(discoveryApiRef);
+  const namespace = podNamespace ?? 'default';
+
+  useEffect(() => {
+    discoveryApi
+      .getBaseUrl('kubernetes')
+      .then(url => url ?? window.location.host)
+      .then(url => url.replace(/^http(s?):\/\//, 'ws$1://'))
+      .then(url => setBaseUrl(url));
+  }, [discoveryApi]);
+
+  const urlParams = useMemo(() => {
+    const params = new URLSearchParams({
+      container: containerName,
+      stdin: 'true',
+      stdout: 'true',
+      stderr: 'true',
+      tty: 'true',
+      command: '/bin/sh',
+    });
+    return params;
+  }, [containerName]);
+
+  const socketUrl = useMemo(() => {
+    if (!hasSocketProtocol(baseUrl)) {
+      return '';
+    }
+
+    return new URL(
+      `${baseUrl}/proxy/api/v1/namespaces/${namespace}/pods/${podName}/exec?${urlParams}`,
+    );
+  }, [baseUrl, namespace, podName, urlParams]);
+
+  useEffect(() => {
+    if (!hasSocketProtocol(socketUrl)) {
+      return () => {};
+    }
+
+    const terminal = new Terminal();
+    const fitAddon = new FitAddon();
+    terminal.loadAddon(fitAddon);
+
+    if (terminalRef.current) {
+      terminal.open(terminalRef.current);
+      fitAddon.fit();
+    }
+
+    terminal.writeln('Starting terminal, please wait...');
+
+    const socket = new WebSocket(socketUrl, ['channel.k8s.io']);
+
+    socket.onopen = () => {
+      terminal.clear();
+      const attachAddon = new PodExecTerminalAttachAddon(socket, {
+        bidirectional: true,
+      });
+
+      terminal.loadAddon(attachAddon);
+    };
+
+    socket.onclose = () => {
+      terminal.writeln('Socket connection closed');
+    };
+
+    return () => {
+      terminal?.clear();
+      socket?.close();
+    };
+  }, [baseUrl, socketUrl]);
+
+  return (
+    <div
+      data-testid="terminal"
+      ref={terminalRef}
+      style={{
+        width: '100%',
+        height: '100%',
+      }}
+    />
+  );
+};
diff --git a/plugins/kubernetes/src/components/PodExecTerminal/PodExecTerminalAttachAddon.ts b/plugins/kubernetes/src/components/PodExecTerminal/PodExecTerminalAttachAddon.ts
new file mode 100644
index 0000000000..fb80472f73
--- /dev/null
+++ b/plugins/kubernetes/src/components/PodExecTerminal/PodExecTerminalAttachAddon.ts
@@ -0,0 +1,46 @@
+/*
+ * 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 { AttachAddon, IAttachOptions } from 'xterm-addon-attach';
+
+const textEncoder = new TextEncoder();
+
+export class PodExecTerminalAttachAddon extends AttachAddon {
+  constructor(socket: WebSocket, options?: IAttachOptions) {
+    super(socket, options);
+
+    const thisAddon = this as any;
+
+    // These methods are private in the original AttachAddon,
+    // thus have to override at runtime like this
+    thisAddon._sendBinary = (data: string) => {
+      if (!thisAddon._checkOpenSocket()) {
+        return;
+      }
+
+      const buffer = Uint8Array.from([0, ...textEncoder.encode(data)]);
+
+      thisAddon._socket.send(buffer);
+    };
+
+    thisAddon._sendData = (data: string) => {
+      if (!thisAddon._checkOpenSocket()) {
+        return;
+      }
+
+      thisAddon._sendBinary(data);
+    };
+  }
+}
diff --git a/plugins/kubernetes/src/components/PodExecTerminal/PodExecTerminalDialog.tsx b/plugins/kubernetes/src/components/PodExecTerminal/PodExecTerminalDialog.tsx
new file mode 100644
index 0000000000..5ed8c8c0d1
--- /dev/null
+++ b/plugins/kubernetes/src/components/PodExecTerminal/PodExecTerminalDialog.tsx
@@ -0,0 +1,110 @@
+/*
+ * 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 {
+  Button,
+  createStyles,
+  Dialog,
+  DialogContent,
+  DialogTitle,
+  IconButton,
+  makeStyles,
+  Theme,
+} from '@material-ui/core';
+import CloseIcon from '@material-ui/icons/Close';
+import OpenInBrowserIcon from '@material-ui/icons/OpenInBrowser';
+import React, { useState } from 'react';
+
+import { useIsPodExecTerminalSupported } from '../../hooks';
+import { PodExecTerminal, PodExecTerminalProps } from './PodExecTerminal';
+
+const useStyles = makeStyles((theme: Theme) =>
+  createStyles({
+    dialogPaper: { minHeight: 'calc(100% - 64px)' },
+    dialogContent: { flexBasis: 0 },
+    closeButton: {
+      position: 'absolute',
+      right: theme.spacing(1),
+      top: theme.spacing(1),
+      color: theme.palette.grey[500],
+    },
+  }),
+);
+
+/**
+ * Opens a terminal connected to the given pod's container in a dialog
+ *
+ * @public
+ */
+export const PodExecTerminalDialog = (props: PodExecTerminalProps) => {
+  const classes = useStyles();
+  const { clusterName, containerName, podName } = props;
+
+  const [open, setOpen] = useState(false);
+
+  const isPodExecTerminalSupported = useIsPodExecTerminalSupported();
+
+  const openDialog = () => {
+    setOpen(true);
+  };
+
+  const closeDialog = () => {
+    setOpen(false);
+  };
+
+  return (
+    <>
+      {!isPodExecTerminalSupported.loading &&
+        isPodExecTerminalSupported.value && (
+          <Dialog
+            maxWidth={false}
+            fullWidth
+            open={open}
+            onClose={closeDialog}
+            PaperProps={{ className: classes.dialogPaper }}
+          >
+            <DialogTitle id="dialog-title">
+              {podName} - {containerName} terminal shell on cluster{' '}
+              {clusterName}
+              <IconButton
+                aria-label="close"
+                className={classes.closeButton}
+                onClick={closeDialog}
+              >
+                <CloseIcon />
+              </IconButton>
+            </DialogTitle>
+            <DialogContent className={classes.dialogContent}>
+              <PodExecTerminal {...props} />
+            </DialogContent>
+          </Dialog>
+        )}
+
+      <Button
+        variant="outlined"
+        aria-label="open terminal"
+        component="label"
+        disabled={
+          isPodExecTerminalSupported.loading ||
+          !isPodExecTerminalSupported.value
+        }
+        onClick={openDialog}
+        startIcon={<OpenInBrowserIcon />}
+      >
+        Terminal
+      </Button>
+    </>
+  );
+};
diff --git a/plugins/kubernetes/src/components/PodExecTerminal/index.ts b/plugins/kubernetes/src/components/PodExecTerminal/index.ts
new file mode 100644
index 0000000000..2581a35669
--- /dev/null
+++ b/plugins/kubernetes/src/components/PodExecTerminal/index.ts
@@ -0,0 +1,17 @@
+/*
+ * Copyright 2023 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+export * from './PodExecTerminal';
+export * from './PodExecTerminalDialog';
diff --git a/plugins/kubernetes/src/components/PodExecTerminal/matchMedia.mock.ts b/plugins/kubernetes/src/components/PodExecTerminal/matchMedia.mock.ts
new file mode 100644
index 0000000000..52661d07e8
--- /dev/null
+++ b/plugins/kubernetes/src/components/PodExecTerminal/matchMedia.mock.ts
@@ -0,0 +1,31 @@
+/*
+ * 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.
+ */
+
+Object.defineProperty(window, 'matchMedia', {
+  writable: true,
+  value: jest.fn().mockImplementation(query => ({
+    matches: false,
+    media: query,
+    onchange: null,
+    addListener: jest.fn(), // deprecated
+    removeListener: jest.fn(), // deprecated
+    addEventListener: jest.fn(),
+    removeEventListener: jest.fn(),
+    dispatchEvent: jest.fn(),
+  })),
+});
+
+export {};
diff --git a/plugins/kubernetes/src/components/Pods/ErrorList/ErrorList.test.tsx b/plugins/kubernetes/src/components/Pods/ErrorList/ErrorList.test.tsx
index 3ee755becb..b05b4d2d9e 100644
--- a/plugins/kubernetes/src/components/Pods/ErrorList/ErrorList.test.tsx
+++ b/plugins/kubernetes/src/components/Pods/ErrorList/ErrorList.test.tsx
@@ -38,7 +38,7 @@ describe('ErrorList', () => {
                 type: 'some-error',
                 severity: 10,
                 message: 'some error message',
-                occuranceCount: 1,
+                occurrenceCount: 1,
                 sourceRef: {
                   name: 'some-pod',
                   namespace: 'some-namespace',
diff --git a/plugins/kubernetes/src/components/Pods/FixDialog/FixDialog.test.tsx b/plugins/kubernetes/src/components/Pods/FixDialog/FixDialog.test.tsx
index e779ab5f0d..68bfce9c96 100644
--- a/plugins/kubernetes/src/components/Pods/FixDialog/FixDialog.test.tsx
+++ b/plugins/kubernetes/src/components/Pods/FixDialog/FixDialog.test.tsx
@@ -50,7 +50,7 @@ describe('FixDialog', () => {
           type: 'some error type',
           severity: 10,
           message: 'some error message',
-          occuranceCount: 1,
+          occurrenceCount: 1,
           sourceRef: {
             name: 'some-pod',
             namespace: 'some-namespace',
@@ -91,7 +91,7 @@ describe('FixDialog', () => {
           type: 'some error type',
           severity: 10,
           message: 'some error message',
-          occuranceCount: 1,
+          occurrenceCount: 1,
           sourceRef: {
             name: 'some-pod',
             namespace: 'some-namespace',
@@ -132,7 +132,7 @@ describe('FixDialog', () => {
           type: 'some error type',
           severity: 10,
           message: 'some error message',
-          occuranceCount: 1,
+          occurrenceCount: 1,
           sourceRef: {
             name: 'some-pod',
             namespace: 'some-namespace',
diff --git a/plugins/kubernetes/src/components/Pods/PodDrawer/ContainerCard.test.tsx b/plugins/kubernetes/src/components/Pods/PodDrawer/ContainerCard.test.tsx
index 7bc7c989ed..bdea9dd0be 100644
--- a/plugins/kubernetes/src/components/Pods/PodDrawer/ContainerCard.test.tsx
+++ b/plugins/kubernetes/src/components/Pods/PodDrawer/ContainerCard.test.tsx
@@ -22,6 +22,8 @@ import { wrapInTestApp } from '@backstage/test-utils';
 import { ContainerCard } from './ContainerCard';
 import { DateTime } from 'luxon';
 
+jest.mock('../../../hooks/useIsPodExecTerminalSupported');
+
 const now = DateTime.now();
 const oneHourAgo = now.minus({ hours: 1 }).toISO();
 const twoHoursAgo = now.minus({ hours: 2 }).toISO();
diff --git a/plugins/kubernetes/src/components/Pods/PodDrawer/ContainerCard.tsx b/plugins/kubernetes/src/components/Pods/PodDrawer/ContainerCard.tsx
index 9c4272248b..db70f92160 100644
--- a/plugins/kubernetes/src/components/Pods/PodDrawer/ContainerCard.tsx
+++ b/plugins/kubernetes/src/components/Pods/PodDrawer/ContainerCard.tsx
@@ -13,9 +13,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import React from 'react';
-
-import { IContainer, IContainerStatus } from 'kubernetes-models/v1';
+import { StructuredMetadataTable } from '@backstage/core-components';
+import { ClientContainerStatus } from '@backstage/plugin-kubernetes-common';
 import {
   Card,
   CardActions,
@@ -24,14 +23,14 @@ import {
   Grid,
   Typography,
 } from '@material-ui/core';
-
+import { IContainer, IContainerStatus } from 'kubernetes-models/v1';
 import { DateTime } from 'luxon';
+import React from 'react';
 
-import { PodScope, PodLogsDialog } from '../PodLogs';
-import { StructuredMetadataTable } from '@backstage/core-components';
-import { ClientContainerStatus } from '@backstage/plugin-kubernetes-common';
+import { bytesToMiB, formatMillicores } from '../../../utils/resources';
+import { PodExecTerminalDialog } from '../../PodExecTerminal/PodExecTerminalDialog';
 import { ResourceUtilization } from '../../ResourceUtilization';
-import { bytesToMiB, formatMilicores } from '../../../utils/resources';
+import { PodLogsDialog, PodScope } from '../PodLogs';
 
 const getContainerHealthChecks = (
   containerSpec: IContainer,
@@ -186,7 +185,7 @@ export const ContainerCard: React.FC<ContainerCardProps> = ({
                   title="CPU requests"
                   usage={containerMetrics.cpuUsage.currentUsage}
                   total={containerMetrics.cpuUsage.requestTotal}
-                  totalFormated={formatMilicores(
+                  totalFormatted={formatMillicores(
                     containerMetrics.cpuUsage.requestTotal,
                   )}
                 />
@@ -195,7 +194,7 @@ export const ContainerCard: React.FC<ContainerCardProps> = ({
                   title="CPU limits"
                   usage={containerMetrics.cpuUsage.currentUsage}
                   total={containerMetrics.cpuUsage.limitTotal}
-                  totalFormated={formatMilicores(
+                  totalFormatted={formatMillicores(
                     containerMetrics.cpuUsage.limitTotal,
                   )}
                 />
@@ -204,7 +203,7 @@ export const ContainerCard: React.FC<ContainerCardProps> = ({
                   title="Memory requests"
                   usage={containerMetrics.memoryUsage.currentUsage}
                   total={containerMetrics.memoryUsage.requestTotal}
-                  totalFormated={bytesToMiB(
+                  totalFormatted={bytesToMiB(
                     containerMetrics.memoryUsage.requestTotal,
                   )}
                 />
@@ -213,8 +212,8 @@ export const ContainerCard: React.FC<ContainerCardProps> = ({
                   title="Memory limits"
                   usage={containerMetrics.memoryUsage.currentUsage}
                   total={containerMetrics.memoryUsage.limitTotal}
-                  totalFormated={bytesToMiB(
-                    containerMetrics.memoryUsage.requestTotal,
+                  totalFormatted={bytesToMiB(
+                    containerMetrics.memoryUsage.limitTotal,
                   )}
                 />
               </Grid>
@@ -222,13 +221,19 @@ export const ContainerCard: React.FC<ContainerCardProps> = ({
           )}
         </Grid>
       </CardContent>
-      <CardActions disableSpacing>
+      <CardActions>
         <PodLogsDialog
           containerScope={{
             containerName: containerStatus.name,
             ...podScope,
           }}
         />
+        <PodExecTerminalDialog
+          clusterName={podScope.clusterName}
+          containerName={containerStatus.name}
+          podName={podScope.podName}
+          podNamespace={podScope.podNamespace}
+        />
       </CardActions>
     </Card>
   );
diff --git a/plugins/kubernetes/src/components/Pods/PodDrawer/PendingPodContent.test.tsx b/plugins/kubernetes/src/components/Pods/PodDrawer/PendingPodContent.test.tsx
index e4d042217b..8896654696 100644
--- a/plugins/kubernetes/src/components/Pods/PodDrawer/PendingPodContent.test.tsx
+++ b/plugins/kubernetes/src/components/Pods/PodDrawer/PendingPodContent.test.tsx
@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 import React from 'react';
 
 import { render } from '@testing-library/react';
@@ -44,7 +45,7 @@ const podWithConditions = (conditions: IPodCondition[]): any => {
 
 describe('PendingPodContent', () => {
   it('show startup conditions - all healthy', async () => {
-    const oneDayAgo = DateTime.now().minus({ days: 1 }).toISO();
+    const oneDayAgo = DateTime.now().minus({ days: 1 }).toISO()!;
     const { getByText, queryByLabelText, queryAllByLabelText } = render(
       wrapInTestApp(
         <PendingPodContent
@@ -87,7 +88,7 @@ describe('PendingPodContent', () => {
     expect(queryByLabelText('Status error')).not.toBeInTheDocument();
   });
   it('show startup conditions - all fail', async () => {
-    const oneHourAgo = DateTime.now().minus({ hours: 1 }).toISO();
+    const oneHourAgo = DateTime.now().minus({ hours: 1 }).toISO()!;
     const { getByText, queryByLabelText, queryAllByLabelText } = render(
       wrapInTestApp(
         <PendingPodContent
@@ -154,7 +155,7 @@ describe('PendingPodContent', () => {
     expect(queryAllByLabelText('Status error')).toHaveLength(4);
   });
   it('show startup conditions - show unknown', async () => {
-    const oneHourAgo = DateTime.now().minus({ hours: 1 }).toISO();
+    const oneHourAgo = DateTime.now().minus({ hours: 1 }).toISO()!;
     const { getByText, queryByLabelText, getByLabelText } = render(
       wrapInTestApp(
         <PendingPodContent
diff --git a/plugins/kubernetes/src/components/Pods/PodDrawer/PodDrawer.test.tsx b/plugins/kubernetes/src/components/Pods/PodDrawer/PodDrawer.test.tsx
index 2b71976d8a..393b834392 100644
--- a/plugins/kubernetes/src/components/Pods/PodDrawer/PodDrawer.test.tsx
+++ b/plugins/kubernetes/src/components/Pods/PodDrawer/PodDrawer.test.tsx
@@ -17,66 +17,75 @@
 import React from 'react';
 
 import { render } from '@testing-library/react';
-import { wrapInTestApp } from '@backstage/test-utils';
+import { TestApiProvider, wrapInTestApp } from '@backstage/test-utils';
 import '@testing-library/jest-dom';
 
 import { PodDrawer } from '.';
+import { DiscoveryApi, discoveryApiRef } from '@backstage/core-plugin-api';
+
+jest.mock('../../../hooks/useIsPodExecTerminalSupported');
 
 describe('PodDrawer', () => {
   it('Should show title and container names', async () => {
+    const mockDiscoveryApi: Partial<DiscoveryApi> = {
+      getBaseUrl: () => Promise.resolve('http://localhost'),
+    };
+
     const { getAllByText, getByText } = render(
       wrapInTestApp(
-        <PodDrawer
-          {...({
-            open: true,
-            podAndErrors: {
-              clusterName: 'some-cluster-1',
-              pod: {
-                metadata: {
-                  name: 'some-pod',
-                },
-                spec: {
-                  containers: [
-                    {
-                      name: 'some-container',
-                    },
-                  ],
-                },
-                status: {
-                  podIP: '127.0.0.1',
-                  containerStatuses: [
-                    {
-                      name: 'some-container',
-                    },
-                  ],
-                },
-              },
-              errors: [
-                {
-                  type: 'some-error',
-                  severity: 10,
-                  message: 'some error message',
-                  occuranceCount: 1,
-                  sourceRef: {
+        <TestApiProvider apis={[[discoveryApiRef, mockDiscoveryApi]]}>
+          <PodDrawer
+            {...({
+              open: true,
+              podAndErrors: {
+                clusterName: 'some-cluster-1',
+                pod: {
+                  metadata: {
                     name: 'some-pod',
-                    namespace: 'some-namespace',
-                    kind: 'Pod',
-                    apiGroup: 'v1',
                   },
-                  proposedFix: [
-                    {
-                      type: 'logs',
-                      container: 'some-container',
-                      errorType: 'some error type',
-                      rootCauseExplanation: 'some root cause',
-                      actions: ['fix1', 'fix2'],
-                    },
-                  ],
+                  spec: {
+                    containers: [
+                      {
+                        name: 'some-container',
+                      },
+                    ],
+                  },
+                  status: {
+                    podIP: '127.0.0.1',
+                    containerStatuses: [
+                      {
+                        name: 'some-container',
+                      },
+                    ],
+                  },
                 },
-              ],
-            },
-          } as any)}
-        />,
+                errors: [
+                  {
+                    type: 'some-error',
+                    severity: 10,
+                    message: 'some error message',
+                    occurrenceCount: 1,
+                    sourceRef: {
+                      name: 'some-pod',
+                      namespace: 'some-namespace',
+                      kind: 'Pod',
+                      apiGroup: 'v1',
+                    },
+                    proposedFix: [
+                      {
+                        type: 'logs',
+                        container: 'some-container',
+                        errorType: 'some error type',
+                        rootCauseExplanation: 'some root cause',
+                        actions: ['fix1', 'fix2'],
+                      },
+                    ],
+                  },
+                ],
+              },
+            } as any)}
+          />
+        </TestApiProvider>,
       ),
     );
 
diff --git a/plugins/kubernetes/src/components/Pods/PodDrawer/PodDrawer.tsx b/plugins/kubernetes/src/components/Pods/PodDrawer/PodDrawer.tsx
index 82739be0fb..30588cd347 100644
--- a/plugins/kubernetes/src/components/Pods/PodDrawer/PodDrawer.tsx
+++ b/plugins/kubernetes/src/components/Pods/PodDrawer/PodDrawer.tsx
@@ -35,7 +35,7 @@ import { PendingPodContent } from './PendingPodContent';
 import { ErrorList } from '../ErrorList';
 import { usePodMetrics } from '../../../hooks/usePodMetrics';
 import { ResourceUtilization } from '../../ResourceUtilization';
-import { bytesToMiB, formatMilicores } from '../../../utils/resources';
+import { bytesToMiB, formatMillicores } from '../../../utils/resources';
 
 const useDrawerContentStyles = makeStyles((_theme: Theme) =>
   createStyles({
@@ -109,13 +109,13 @@ export const PodDrawer = ({ podAndErrors, open }: PodDrawerProps) => {
                 title="CPU requests"
                 usage={podMetrics.cpu.currentUsage}
                 total={podMetrics.cpu.requestTotal}
-                totalFormated={formatMilicores(podMetrics.cpu.requestTotal)}
+                totalFormatted={formatMillicores(podMetrics.cpu.requestTotal)}
               />
               <ResourceUtilization
                 title="CPU limits"
                 usage={podMetrics.cpu.currentUsage}
                 total={podMetrics.cpu.limitTotal}
-                totalFormated={formatMilicores(podMetrics.cpu.limitTotal)}
+                totalFormatted={formatMillicores(podMetrics.cpu.limitTotal)}
               />
             </Grid>
             <Grid item xs={6}>
@@ -123,13 +123,13 @@ export const PodDrawer = ({ podAndErrors, open }: PodDrawerProps) => {
                 title="Memory requests"
                 usage={podMetrics.memory.currentUsage}
                 total={podMetrics.memory.requestTotal}
-                totalFormated={bytesToMiB(podMetrics.memory.requestTotal)}
+                totalFormatted={bytesToMiB(podMetrics.memory.requestTotal)}
               />
               <ResourceUtilization
                 title="Memory limits"
                 usage={podMetrics.memory.currentUsage}
                 total={podMetrics.memory.limitTotal}
-                totalFormated={bytesToMiB(podMetrics.memory.requestTotal)}
+                totalFormatted={bytesToMiB(podMetrics.memory.requestTotal)}
               />
             </Grid>
           </Grid>
diff --git a/plugins/kubernetes/src/components/Pods/PodLogs/PodLogs.tsx b/plugins/kubernetes/src/components/Pods/PodLogs/PodLogs.tsx
index de9341508e..5c08de047c 100644
--- a/plugins/kubernetes/src/components/Pods/PodLogs/PodLogs.tsx
+++ b/plugins/kubernetes/src/components/Pods/PodLogs/PodLogs.tsx
@@ -64,7 +64,7 @@ export const PodLogs: React.FC<PodLogsProps> = ({
       )}
       <Paper
         elevation={1}
-        style={{ height: '100%', width: '100%', minHeight: '15rem' }}
+        style={{ height: '100%', width: '100%', minHeight: '55rem' }}
       >
         {loading && <Skeleton variant="rect" width="100%" height="100%" />}
         {!loading &&
diff --git a/plugins/kubernetes/src/components/Pods/PodsTable.test.tsx b/plugins/kubernetes/src/components/Pods/PodsTable.test.tsx
index 4478d8c031..35402527f8 100644
--- a/plugins/kubernetes/src/components/Pods/PodsTable.test.tsx
+++ b/plugins/kubernetes/src/components/Pods/PodsTable.test.tsx
@@ -124,7 +124,7 @@ describe('PodsTable', () => {
     expect(getByText('requests: 1% of 64MiB')).toBeInTheDocument();
     expect(getByText('limits: 0% of 128MiB')).toBeInTheDocument();
   });
-  it('should render placehoplder when empty metrics context', async () => {
+  it('should render placeholder when empty metrics context', async () => {
     const podNameToClientPodStatus = new Map<string, ClientPodStatus[]>();
 
     const wrapper = kubernetesProviders(
diff --git a/plugins/kubernetes/src/components/ResourceUtilization/ResourceUtilization.test.tsx b/plugins/kubernetes/src/components/ResourceUtilization/ResourceUtilization.test.tsx
index 56ba0b7ef0..60087022a5 100644
--- a/plugins/kubernetes/src/components/ResourceUtilization/ResourceUtilization.test.tsx
+++ b/plugins/kubernetes/src/components/ResourceUtilization/ResourceUtilization.test.tsx
@@ -27,7 +27,7 @@ describe('ResourceUtilization', () => {
           title="some-title"
           usage="1000"
           total="10000"
-          totalFormated="15%"
+          totalFormatted="15%"
         />,
       ),
     );
@@ -43,7 +43,7 @@ describe('ResourceUtilization', () => {
           title="some-title"
           usage="1000"
           total="10000"
-          totalFormated="15%"
+          totalFormatted="15%"
         />,
       ),
     );
diff --git a/plugins/kubernetes/src/components/ResourceUtilization/ResourceUtilization.tsx b/plugins/kubernetes/src/components/ResourceUtilization/ResourceUtilization.tsx
index 492ec0469b..75927958e6 100644
--- a/plugins/kubernetes/src/components/ResourceUtilization/ResourceUtilization.tsx
+++ b/plugins/kubernetes/src/components/ResourceUtilization/ResourceUtilization.tsx
@@ -29,7 +29,7 @@ export interface ResourceUtilizationProps {
   title: string;
   usage: number | string;
   total: number | string;
-  totalFormated: string;
+  totalFormatted: string;
 }
 
 // Visible for testing
@@ -64,7 +64,7 @@ export const ResourceUtilization = ({
   title,
   usage,
   total,
-  totalFormated,
+  totalFormatted,
 }: ResourceUtilizationProps) => {
   const utilization = currentToDeclaredResourceToPerc(usage, total);
   return (
@@ -72,7 +72,7 @@ export const ResourceUtilization = ({
       <Grid item xs={12}>
         <Typography
           variant={compressed ? 'caption' : 'subtitle2'}
-        >{`${title}: ${totalFormated}`}</Typography>
+        >{`${title}: ${totalFormatted}`}</Typography>
       </Grid>
       <Grid item xs={12}>
         <LinearGauge
diff --git a/plugins/kubernetes/src/components/index.ts b/plugins/kubernetes/src/components/index.ts
index e0583a1f9e..18b75247e5 100644
--- a/plugins/kubernetes/src/components/index.ts
+++ b/plugins/kubernetes/src/components/index.ts
@@ -27,3 +27,4 @@ export * from './Pods';
 export * from './ServicesAccordions';
 export * from './KubernetesContent';
 export * from './ResourceUtilization';
+export * from './PodExecTerminal';
diff --git a/plugins/kubernetes/src/error-detection/deployments.ts b/plugins/kubernetes/src/error-detection/deployments.ts
index e8e029c5af..b54e1b3731 100644
--- a/plugins/kubernetes/src/error-detection/deployments.ts
+++ b/plugins/kubernetes/src/error-detection/deployments.ts
@@ -34,7 +34,7 @@ const deploymentErrorMappers: ErrorMapper<Deployment>[] = [
             kind: 'Deployment',
             apiGroup: 'apps/v1',
           },
-          occuranceCount: 1,
+          occurrenceCount: 1,
         }));
     },
   },
diff --git a/plugins/kubernetes/src/error-detection/error-detection.test.ts b/plugins/kubernetes/src/error-detection/error-detection.test.ts
index c3dc060b9b..ae4605c3c5 100644
--- a/plugins/kubernetes/src/error-detection/error-detection.test.ts
+++ b/plugins/kubernetes/src/error-detection/error-detection.test.ts
@@ -164,7 +164,7 @@ describe('detectErrors', () => {
           'The container other-side-car has crashed many times, it will be exponentially restarted until it stops crashing',
         type: 'logs',
       },
-      occuranceCount: 1,
+      occurrenceCount: 1,
       type: 'container-waiting',
     });
 
@@ -186,7 +186,7 @@ describe('detectErrors', () => {
       message:
         'back-off 5m0s restarting failed container=side-car pod=dice-roller-canary-7d64cd756c-55rfq_default(65ad28e3-5d51-4b4b-9bf8-4cb069803034)',
       severity: 4,
-      occuranceCount: 1,
+      occurrenceCount: 1,
       type: 'container-waiting',
     });
 
@@ -199,7 +199,7 @@ describe('detectErrors', () => {
       },
       message: 'container=other-side-car restarted 123 times',
       severity: 4,
-      occuranceCount: 123,
+      occurrenceCount: 123,
       proposedFix: {
         container: 'other-side-car',
         errorType: 'Error',
@@ -228,7 +228,7 @@ describe('detectErrors', () => {
       },
       message: 'container=side-car restarted 38 times',
       severity: 4,
-      occuranceCount: 38,
+      occurrenceCount: 38,
       type: 'containers-restarting',
     });
   });
@@ -246,7 +246,7 @@ describe('detectErrors', () => {
 
     expect(err1).toStrictEqual({
       message: 'configmap "some-cm" not found',
-      occuranceCount: 1,
+      occurrenceCount: 1,
       proposedFix: {
         docsLink:
           'https://kubernetes.io/docs/tasks/configure-pod-container/configure-pod-configmap/',
@@ -300,7 +300,7 @@ describe('detectErrors', () => {
       },
       message: 'Deployment does not have minimum availability.',
       severity: 6,
-      occuranceCount: 1,
+      occurrenceCount: 1,
       type: 'condition-message-present',
     });
   });
@@ -336,7 +336,7 @@ describe('detectErrors', () => {
       message:
         'Current number of replicas (10) is equal to the configured max number of replicas (10)',
       severity: 8,
-      occuranceCount: 1,
+      occurrenceCount: 1,
       type: 'hpa-max-current-replicas',
     });
   });
@@ -469,7 +469,7 @@ describe('detectErrors', () => {
     expect(err1).toStrictEqual({
       message:
         'The container some-container failed to start properly, but is not crashing',
-      occuranceCount: 1,
+      occurrenceCount: 1,
       proposedFix: {
         errorType: 'ReadinessProbeFailed',
         podName: '',
diff --git a/plugins/kubernetes/src/error-detection/hpas.ts b/plugins/kubernetes/src/error-detection/hpas.ts
index 671e379a5a..6f15c119b6 100644
--- a/plugins/kubernetes/src/error-detection/hpas.ts
+++ b/plugins/kubernetes/src/error-detection/hpas.ts
@@ -37,7 +37,7 @@ const hpaErrorMappers: ErrorMapper<HorizontalPodAutoscaler>[] = [
               kind: 'HorizontalPodAutoscaler',
               apiGroup: 'autoscaling/v1',
             },
-            occuranceCount: 1,
+            occurrenceCount: 1,
           },
         ];
       }
diff --git a/plugins/kubernetes/src/error-detection/pods.ts b/plugins/kubernetes/src/error-detection/pods.ts
index 638d1da56c..7c0a85db30 100644
--- a/plugins/kubernetes/src/error-detection/pods.ts
+++ b/plugins/kubernetes/src/error-detection/pods.ts
@@ -209,7 +209,7 @@ const podErrorMappers: ErrorMapper<Pod>[] = [
             kind: 'Pod',
             apiGroup: 'v1',
           },
-          occuranceCount: 1,
+          occurrenceCount: 1,
         }));
     },
   },
@@ -228,7 +228,7 @@ const podErrorMappers: ErrorMapper<Pod>[] = [
             kind: 'Pod',
             apiGroup: 'v1',
           },
-          occuranceCount: 1,
+          occurrenceCount: 1,
         }));
     },
   },
@@ -247,7 +247,7 @@ const podErrorMappers: ErrorMapper<Pod>[] = [
             kind: 'Pod',
             apiGroup: 'v1',
           },
-          occuranceCount: cs.restartCount,
+          occurrenceCount: cs.restartCount,
         }));
     },
   },
diff --git a/plugins/kubernetes/src/error-detection/types.ts b/plugins/kubernetes/src/error-detection/types.ts
index 27dcbdd55b..4148056171 100644
--- a/plugins/kubernetes/src/error-detection/types.ts
+++ b/plugins/kubernetes/src/error-detection/types.ts
@@ -51,7 +51,7 @@ export interface DetectedError {
   message: string;
   proposedFix?: ProposedFix;
   sourceRef: ResourceRef;
-  occuranceCount: number;
+  occurrenceCount: number;
 }
 
 export type ProposedFix = LogSolution | DocsSolution | EventsSolution;
diff --git a/plugins/kubernetes/src/hooks/__mocks__/useIsPodExecTerminalSupported.ts b/plugins/kubernetes/src/hooks/__mocks__/useIsPodExecTerminalSupported.ts
new file mode 100644
index 0000000000..e1dc3b4fc5
--- /dev/null
+++ b/plugins/kubernetes/src/hooks/__mocks__/useIsPodExecTerminalSupported.ts
@@ -0,0 +1,20 @@
+/*
+ * 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 { AsyncState } from 'react-use/lib/useAsync';
+
+export const useIsPodExecTerminalSupported: () => AsyncState<boolean> = jest.fn(
+  () => ({ loading: false, value: false } as AsyncState<boolean>),
+);
diff --git a/plugins/kubernetes/src/hooks/index.ts b/plugins/kubernetes/src/hooks/index.ts
index 12400132aa..141bc3815b 100644
--- a/plugins/kubernetes/src/hooks/index.ts
+++ b/plugins/kubernetes/src/hooks/index.ts
@@ -14,6 +14,7 @@
  * limitations under the License.
  */
 
+export * from './useIsPodExecTerminalSupported';
 export * from './useKubernetesObjects';
 export * from './useCustomResources';
 export * from './PodNamesWithErrors';
diff --git a/plugins/kubernetes/src/hooks/useIsPodExecTerminalSupported.test.ts b/plugins/kubernetes/src/hooks/useIsPodExecTerminalSupported.test.ts
new file mode 100644
index 0000000000..1772e0d4f2
--- /dev/null
+++ b/plugins/kubernetes/src/hooks/useIsPodExecTerminalSupported.test.ts
@@ -0,0 +1,83 @@
+/*
+ * 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 { useApi } from '@backstage/core-plugin-api';
+import { renderHook } from '@testing-library/react-hooks';
+
+import { useIsPodExecTerminalSupported } from './useIsPodExecTerminalSupported';
+
+jest.mock('@backstage/core-plugin-api');
+
+describe('useIsClusterShellEnabled', () => {
+  let clusters: { authProvider: string }[] = [];
+
+  beforeEach(() => {
+    (useApi as any).mockReturnValue({
+      getClusters: () => Promise.resolve(clusters),
+    });
+  });
+
+  afterEach(() => {
+    jest.resetAllMocks();
+  });
+
+  it.each([
+    {
+      condition: 'valid Shell setup',
+      returnValue: true,
+      testClusters: [{ authProvider: 'localKubectlProxy' }],
+    },
+    { condition: 'clusters empty', returnValue: false, testClusters: [] },
+    {
+      condition: 'multi cluster setup',
+      returnValue: false,
+      testClusters: [
+        { authProvider: 'localKubectlProxy' },
+        { authProvider: 'serviceAccount' },
+      ],
+    },
+    {
+      condition: 'AuthProvider is aks',
+      returnValue: false,
+      testClusters: [{ authProvider: 'aks' }],
+    },
+    {
+      condition: 'AuthProvider is google',
+      returnValue: false,
+      testClusters: [{ authProvider: 'google' }],
+    },
+    {
+      condition: 'AuthProvider start with oidc',
+      returnValue: false,
+      testClusters: [{ authProvider: 'oidc.okta' }],
+    },
+  ])(
+    'Should return $returnValue if $condition',
+    async ({ testClusters, returnValue }) => {
+      clusters = testClusters;
+
+      const { result, waitForNextUpdate } = renderHook(() =>
+        useIsPodExecTerminalSupported(),
+      );
+
+      expect(result.current.loading).toEqual(true);
+
+      await waitForNextUpdate();
+
+      expect(result.current.loading).toEqual(false);
+      expect(result.current.value).toBe(returnValue);
+    },
+  );
+});
diff --git a/plugins/kubernetes/src/hooks/useIsPodExecTerminalSupported.ts b/plugins/kubernetes/src/hooks/useIsPodExecTerminalSupported.ts
new file mode 100644
index 0000000000..17f64bf0dd
--- /dev/null
+++ b/plugins/kubernetes/src/hooks/useIsPodExecTerminalSupported.ts
@@ -0,0 +1,43 @@
+/*
+ * 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 { useApi } from '@backstage/core-plugin-api';
+import useAsync, { AsyncState } from 'react-use/lib/useAsync';
+
+import { kubernetesApiRef } from '../api';
+
+/**
+ * Check if conditions for a pod exec call through the proxy endpoint are met
+ *
+ * @internal
+ */
+export const useIsPodExecTerminalSupported = (): AsyncState<boolean> => {
+  const kubernetesApi = useApi(kubernetesApiRef);
+
+  return useAsync(async () => {
+    const clusters = await kubernetesApi.getClusters();
+
+    if (clusters.length !== 1) {
+      return false;
+    }
+
+    const { authProvider } = clusters[0];
+    const isClientAuthProvider = ['aks', 'google', 'oidc'].some(
+      authProviderName => authProvider.includes(authProviderName),
+    );
+
+    return !isClientAuthProvider;
+  });
+};
diff --git a/plugins/kubernetes/src/hooks/useMatchingErrors.test.tsx b/plugins/kubernetes/src/hooks/useMatchingErrors.test.tsx
index b823492fff..4ed4dbd73c 100644
--- a/plugins/kubernetes/src/hooks/useMatchingErrors.test.tsx
+++ b/plugins/kubernetes/src/hooks/useMatchingErrors.test.tsx
@@ -24,7 +24,7 @@ const genericErrorWithRef = (resourceRef: ResourceRef): DetectedError => {
     type: 'some-error',
     severity: 10,
     message: 'some error message',
-    occuranceCount: 1,
+    occurrenceCount: 1,
     sourceRef: resourceRef,
     proposedFix: {
       type: 'logs',
diff --git a/plugins/kubernetes/src/utils/pod.tsx b/plugins/kubernetes/src/utils/pod.tsx
index f0517f4ec0..9c0ce898a3 100644
--- a/plugins/kubernetes/src/utils/pod.tsx
+++ b/plugins/kubernetes/src/utils/pod.tsx
@@ -29,7 +29,7 @@ import {
 } from '@backstage/core-components';
 import { ClientPodStatus } from '@backstage/plugin-kubernetes-common';
 import { Pod } from 'kubernetes-models/v1/Pod';
-import { bytesToMiB, formatMilicores } from './resources';
+import { bytesToMiB, formatMillicores } from './resources';
 
 export const imageChips = (pod: V1Pod): ReactNode => {
   const containerStatuses = pod.status?.containerStatuses ?? [];
@@ -148,11 +148,11 @@ export const podStatusToCpuUtil = (podStatus: ClientPodStatus): ReactNode => {
       value={`requests: ${currentToDeclaredResourceToPerc(
         currentUsage,
         cpuUtil.requestTotal,
-      )} of ${formatMilicores(cpuUtil.requestTotal)}`}
+      )} of ${formatMillicores(cpuUtil.requestTotal)}`}
       subvalue={`limits: ${currentToDeclaredResourceToPerc(
         currentUsage,
         cpuUtil.limitTotal,
-      )} of ${formatMilicores(cpuUtil.limitTotal)}`}
+      )} of ${formatMillicores(cpuUtil.limitTotal)}`}
     />
   );
 };
diff --git a/plugins/kubernetes/src/utils/resources.ts b/plugins/kubernetes/src/utils/resources.ts
index b1d8dfdc2e..916aa3463c 100644
--- a/plugins/kubernetes/src/utils/resources.ts
+++ b/plugins/kubernetes/src/utils/resources.ts
@@ -33,6 +33,6 @@ export const bytesToMiB = (value: string | number): string => {
   return `${(parseFloat(value.toString()) / 1024 / 1024).toFixed(0)}MiB`;
 };
 
-export const formatMilicores = (value: string | number): string => {
+export const formatMillicores = (value: string | number): string => {
   return `${(parseFloat(value.toString()) * 1000).toFixed(0)}m`;
 };
diff --git a/plugins/lighthouse-backend/CHANGELOG.md b/plugins/lighthouse-backend/CHANGELOG.md
index 80c54e4501..b4fd2653ff 100644
--- a/plugins/lighthouse-backend/CHANGELOG.md
+++ b/plugins/lighthouse-backend/CHANGELOG.md
@@ -1,5 +1,76 @@
 # @backstage/plugin-lighthouse-backend
 
+## 0.2.7-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config@1.1.0-next.1
+  - @backstage/backend-tasks@0.5.8-next.2
+  - @backstage/backend-common@0.19.5-next.2
+  - @backstage/plugin-catalog-node@1.4.4-next.2
+  - @backstage/backend-plugin-api@0.6.3-next.2
+  - @backstage/catalog-model@1.4.2-next.1
+  - @backstage/plugin-lighthouse-common@0.1.3-next.1
+  - @backstage/catalog-client@1.4.4-next.1
+  - @backstage/types@1.1.0
+
+## 0.2.7-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config@1.1.0-next.0
+  - @backstage/backend-tasks@0.5.8-next.1
+  - @backstage/backend-common@0.19.5-next.1
+  - @backstage/backend-plugin-api@0.6.3-next.1
+  - @backstage/catalog-model@1.4.2-next.0
+  - @backstage/plugin-lighthouse-common@0.1.3-next.0
+  - @backstage/plugin-catalog-node@1.4.4-next.1
+  - @backstage/catalog-client@1.4.4-next.0
+  - @backstage/types@1.1.0
+
+## 0.2.6-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.19.4-next.0
+  - @backstage/backend-tasks@0.5.7-next.0
+  - @backstage/backend-plugin-api@0.6.2-next.0
+  - @backstage/catalog-client@1.4.3
+  - @backstage/catalog-model@1.4.1
+  - @backstage/config@1.0.8
+  - @backstage/types@1.1.0
+  - @backstage/plugin-catalog-node@1.4.3-next.0
+  - @backstage/plugin-lighthouse-common@0.1.2
+
+## 0.2.4
+
+### Patch Changes
+
+- 629cbd194a87: Use `coreServices.rootConfig` instead of `coreService.config`
+- Updated dependencies
+  - @backstage/backend-common@0.19.2
+  - @backstage/backend-plugin-api@0.6.0
+  - @backstage/plugin-catalog-node@1.4.1
+  - @backstage/backend-tasks@0.5.5
+  - @backstage/catalog-client@1.4.3
+  - @backstage/catalog-model@1.4.1
+  - @backstage/config@1.0.8
+  - @backstage/types@1.1.0
+  - @backstage/plugin-lighthouse-common@0.1.2
+
+## 0.2.4-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@0.6.0-next.2
+  - @backstage/backend-tasks@0.5.5-next.2
+  - @backstage/backend-common@0.19.2-next.2
+  - @backstage/plugin-catalog-node@1.4.1-next.2
+
 ## 0.2.4-next.1
 
 ### Patch Changes
diff --git a/plugins/lighthouse-backend/api-report.md b/plugins/lighthouse-backend/api-report.md
index 5d9d948cf4..d382e40def 100644
--- a/plugins/lighthouse-backend/api-report.md
+++ b/plugins/lighthouse-backend/api-report.md
@@ -30,7 +30,8 @@ export function createScheduler(
 ): Promise<void>;
 
 // @public
-export const lighthousePlugin: () => BackendFeature;
+const lighthousePlugin: () => BackendFeature;
+export default lighthousePlugin;
 
 // (No @packageDocumentation comment for this package)
 ```
diff --git a/plugins/lighthouse-backend/catalog-info.yaml b/plugins/lighthouse-backend/catalog-info.yaml
new file mode 100644
index 0000000000..a44ce9fa44
--- /dev/null
+++ b/plugins/lighthouse-backend/catalog-info.yaml
@@ -0,0 +1,10 @@
+apiVersion: backstage.io/v1alpha1
+kind: Component
+metadata:
+  name: backstage-plugin-lighthouse-backend
+  title: '@backstage/plugin-lighthouse-backend'
+  description: Backend functionalities for lighthouse
+spec:
+  lifecycle: experimental
+  type: backstage-backend-plugin
+  owner: maintainers
diff --git a/plugins/lighthouse-backend/package.json b/plugins/lighthouse-backend/package.json
index c5b9bb49ca..65f2ace22a 100644
--- a/plugins/lighthouse-backend/package.json
+++ b/plugins/lighthouse-backend/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@backstage/plugin-lighthouse-backend",
   "description": "Backend functionalities for lighthouse",
-  "version": "0.2.4-next.1",
+  "version": "0.2.7-next.2",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
diff --git a/plugins/lighthouse-backend/src/index.ts b/plugins/lighthouse-backend/src/index.ts
index 5773beed56..5d2bff7ed6 100644
--- a/plugins/lighthouse-backend/src/index.ts
+++ b/plugins/lighthouse-backend/src/index.ts
@@ -15,4 +15,4 @@
  */
 
 export * from './service/createScheduler';
-export { lighthousePlugin } from './plugin';
+export { lighthousePlugin as default } from './plugin';
diff --git a/plugins/lighthouse-common/CHANGELOG.md b/plugins/lighthouse-common/CHANGELOG.md
index 5d3950af16..ee90593ebc 100644
--- a/plugins/lighthouse-common/CHANGELOG.md
+++ b/plugins/lighthouse-common/CHANGELOG.md
@@ -1,5 +1,19 @@
 # @backstage/plugin-lighthouse-common
 
+## 0.1.3-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config@1.1.0-next.1
+
+## 0.1.3-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config@1.1.0-next.0
+
 ## 0.1.2
 
 ### Patch Changes
diff --git a/plugins/lighthouse-common/catalog-info.yaml b/plugins/lighthouse-common/catalog-info.yaml
new file mode 100644
index 0000000000..f5e8ead471
--- /dev/null
+++ b/plugins/lighthouse-common/catalog-info.yaml
@@ -0,0 +1,12 @@
+apiVersion: backstage.io/v1alpha1
+kind: Component
+metadata:
+  name: backstage-plugin-lighthouse-common
+  title: '@backstage/plugin-lighthouse-common'
+  description: >-
+    Common functionalities for lighthouse, to be shared between lighthouse and
+    lighthouse-backend plugin
+spec:
+  lifecycle: experimental
+  type: backstage-common-library
+  owner: maintainers
diff --git a/plugins/lighthouse-common/package.json b/plugins/lighthouse-common/package.json
index c282fa1148..dbe9614656 100644
--- a/plugins/lighthouse-common/package.json
+++ b/plugins/lighthouse-common/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@backstage/plugin-lighthouse-common",
   "description": "Common functionalities for lighthouse, to be shared between lighthouse and lighthouse-backend plugin",
-  "version": "0.1.2",
+  "version": "0.1.3-next.1",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
@@ -26,6 +26,7 @@
   "files": [
     "dist"
   ],
+  "sideEffects": false,
   "scripts": {
     "build": "backstage-cli package build",
     "lint": "backstage-cli package lint",
diff --git a/plugins/lighthouse/CHANGELOG.md b/plugins/lighthouse/CHANGELOG.md
index e45facf69f..9796bee15d 100644
--- a/plugins/lighthouse/CHANGELOG.md
+++ b/plugins/lighthouse/CHANGELOG.md
@@ -1,5 +1,66 @@
 # @backstage/plugin-lighthouse
 
+## 0.4.9-next.2
+
+### Patch Changes
+
+- 8cec7664e146: Removed `@types/node` dependency
+- Updated dependencies
+  - @backstage/core-components@0.13.5-next.2
+  - @backstage/core-plugin-api@1.6.0-next.2
+  - @backstage/config@1.1.0-next.1
+  - @backstage/plugin-catalog-react@1.8.4-next.2
+  - @backstage/catalog-model@1.4.2-next.1
+  - @backstage/plugin-lighthouse-common@0.1.3-next.1
+  - @backstage/theme@0.4.1
+
+## 0.4.9-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.8.4-next.1
+  - @backstage/core-components@0.13.5-next.1
+  - @backstage/config@1.1.0-next.0
+  - @backstage/catalog-model@1.4.2-next.0
+  - @backstage/core-plugin-api@1.6.0-next.1
+  - @backstage/plugin-lighthouse-common@0.1.3-next.0
+  - @backstage/theme@0.4.1
+
+## 0.4.8-next.0
+
+### Patch Changes
+
+- 482bb5c0bbf8: Moved `@types/react` to be a regular dependency
+- Updated dependencies
+  - @backstage/core-plugin-api@1.6.0-next.0
+  - @backstage/core-components@0.13.5-next.0
+  - @backstage/catalog-model@1.4.1
+  - @backstage/config@1.0.8
+  - @backstage/theme@0.4.1
+  - @backstage/plugin-catalog-react@1.8.3-next.0
+  - @backstage/plugin-lighthouse-common@0.1.2
+
+## 0.4.6
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.13.4
+  - @backstage/plugin-catalog-react@1.8.1
+  - @backstage/core-plugin-api@1.5.3
+  - @backstage/catalog-model@1.4.1
+  - @backstage/config@1.0.8
+  - @backstage/theme@0.4.1
+  - @backstage/plugin-lighthouse-common@0.1.2
+
+## 0.4.6-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.8.1-next.1
+
 ## 0.4.6-next.0
 
 ### Patch Changes
diff --git a/plugins/lighthouse/api-report.md b/plugins/lighthouse/api-report.md
index 4ab851472a..9794fe1728 100644
--- a/plugins/lighthouse/api-report.md
+++ b/plugins/lighthouse/api-report.md
@@ -9,20 +9,22 @@ import { ApiRef } from '@backstage/core-plugin-api';
 import { BackstagePlugin } from '@backstage/core-plugin-api';
 import { Entity } from '@backstage/catalog-model';
 import { InfoCardVariants } from '@backstage/core-components';
+import { JSX as JSX_2 } from 'react';
 import { LighthouseApi } from '@backstage/plugin-lighthouse-common';
+import { default as React_2 } from 'react';
 import { RouteRef } from '@backstage/core-plugin-api';
 
 // @public (undocumented)
-export const EmbeddedRouter: () => JSX.Element;
+export const EmbeddedRouter: () => React_2.JSX.Element;
 
 // @public (undocumented)
 export const EntityLastLighthouseAuditCard: (props: {
   dense?: boolean | undefined;
   variant?: InfoCardVariants | undefined;
-}) => JSX.Element;
+}) => JSX_2.Element;
 
 // @public (undocumented)
-export const EntityLighthouseContent: () => JSX.Element;
+export const EntityLighthouseContent: () => JSX_2.Element;
 
 // @public (undocumented)
 const isLighthouseAvailable: (entity: Entity) => boolean;
@@ -33,13 +35,13 @@ export { isLighthouseAvailable as isPluginApplicableToEntity };
 export const LastLighthouseAuditCard: (props: {
   dense?: boolean;
   variant?: InfoCardVariants;
-}) => JSX.Element;
+}) => React_2.JSX.Element;
 
 // @public (undocumented)
 export const lighthouseApiRef: ApiRef<LighthouseApi>;
 
 // @public (undocumented)
-export const LighthousePage: () => JSX.Element;
+export const LighthousePage: () => JSX_2.Element;
 
 // @public (undocumented)
 const lighthousePlugin: BackstagePlugin<
@@ -54,5 +56,5 @@ export { lighthousePlugin };
 export { lighthousePlugin as plugin };
 
 // @public (undocumented)
-export const Router: () => JSX.Element;
+export const Router: () => React_2.JSX.Element;
 ```
diff --git a/plugins/lighthouse/catalog-info.yaml b/plugins/lighthouse/catalog-info.yaml
new file mode 100644
index 0000000000..2f2f69a98d
--- /dev/null
+++ b/plugins/lighthouse/catalog-info.yaml
@@ -0,0 +1,10 @@
+apiVersion: backstage.io/v1alpha1
+kind: Component
+metadata:
+  name: backstage-plugin-lighthouse
+  title: '@backstage/plugin-lighthouse'
+  description: A Backstage plugin that integrates towards Lighthouse
+spec:
+  lifecycle: experimental
+  type: backstage-frontend-plugin
+  owner: maintainers
diff --git a/plugins/lighthouse/package.json b/plugins/lighthouse/package.json
index 02b2e67c1a..d59f056ed0 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.4.6-next.0",
+  "version": "0.4.9-next.2",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
@@ -23,6 +23,7 @@
     "backstage",
     "lighthouse"
   ],
+  "sideEffects": false,
   "scripts": {
     "build": "backstage-cli package build",
     "lint": "backstage-cli package lint",
@@ -43,6 +44,7 @@
     "@material-ui/core": "^4.12.2",
     "@material-ui/icons": "^4.9.1",
     "@material-ui/lab": "4.0.0-alpha.61",
+    "@types/react": "^16.13.1 || ^17.0.0",
     "react-use": "^17.2.4"
   },
   "peerDependencies": {
@@ -60,8 +62,6 @@
     "@testing-library/react": "^12.1.3",
     "@testing-library/react-hooks": "^8.0.0",
     "@testing-library/user-event": "^14.0.0",
-    "@types/node": "^16.11.26",
-    "@types/react": "^16.13.1 || ^17.0.0",
     "msw": "^1.0.0"
   },
   "files": [
diff --git a/plugins/linguist-backend/CHANGELOG.md b/plugins/linguist-backend/CHANGELOG.md
index 774dc72250..120397a5d9 100644
--- a/plugins/linguist-backend/CHANGELOG.md
+++ b/plugins/linguist-backend/CHANGELOG.md
@@ -1,5 +1,98 @@
 # @backstage/plugin-linguist-backend
 
+## 0.4.3-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config@1.1.0-next.1
+  - @backstage/backend-tasks@0.5.8-next.2
+  - @backstage/backend-common@0.19.5-next.2
+  - @backstage/plugin-auth-node@0.3.0-next.2
+  - @backstage/plugin-catalog-node@1.4.4-next.2
+  - @backstage/backend-plugin-api@0.6.3-next.2
+  - @backstage/catalog-model@1.4.2-next.1
+  - @backstage/catalog-client@1.4.4-next.1
+  - @backstage/errors@1.2.1
+  - @backstage/types@1.1.0
+  - @backstage/plugin-linguist-common@0.1.1
+
+## 0.4.3-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config@1.1.0-next.0
+  - @backstage/backend-tasks@0.5.8-next.1
+  - @backstage/backend-common@0.19.5-next.1
+  - @backstage/backend-plugin-api@0.6.3-next.1
+  - @backstage/catalog-model@1.4.2-next.0
+  - @backstage/plugin-auth-node@0.3.0-next.1
+  - @backstage/plugin-catalog-node@1.4.4-next.1
+  - @backstage/catalog-client@1.4.4-next.0
+  - @backstage/errors@1.2.1
+  - @backstage/types@1.1.0
+  - @backstage/plugin-linguist-common@0.1.1
+
+## 0.4.2-next.0
+
+### Patch Changes
+
+- b2de501bda31: When creating the router using `createRouterFromConfig` or using the plugin for the new backend system the `linguist.useSourceLocation` configuration is now optional.
+- cfc3ca6ce060: Changes needed to support MySQL
+- Updated dependencies
+  - @backstage/plugin-auth-node@0.3.0-next.0
+  - @backstage/backend-common@0.19.4-next.0
+  - @backstage/backend-tasks@0.5.7-next.0
+  - @backstage/backend-plugin-api@0.6.2-next.0
+  - @backstage/catalog-client@1.4.3
+  - @backstage/catalog-model@1.4.1
+  - @backstage/config@1.0.8
+  - @backstage/errors@1.2.1
+  - @backstage/types@1.1.0
+  - @backstage/plugin-catalog-node@1.4.3-next.0
+  - @backstage/plugin-linguist-common@0.1.1
+
+## 0.4.0
+
+### Minor Changes
+
+- d440f1dd0e72: Adds a processor to the linguist backend which can automatically add language tags to entities
+- 0896d85d5ab5: **BREAKING**: Removed the alpha export plugin options from exported `linguistPlugin()` (used by the new backend system) in favour of static config.
+
+### Patch Changes
+
+- 12a8c94eda8d: Add package repository and homepage metadata
+- ca5e591cb86a: Fixed bug in LinguistBackendClient.ts file where if the linguistJsOptions is specified and sent over to the linguist-js package it would get changed (another attribute would be added) causing future entities of the batch to fail with an error
+- Updated dependencies
+  - @backstage/backend-common@0.19.2
+  - @backstage/backend-plugin-api@0.6.0
+  - @backstage/plugin-linguist-common@0.1.1
+  - @backstage/plugin-catalog-node@1.4.1
+  - @backstage/plugin-auth-node@0.2.17
+  - @backstage/backend-tasks@0.5.5
+  - @backstage/catalog-client@1.4.3
+  - @backstage/catalog-model@1.4.1
+  - @backstage/config@1.0.8
+  - @backstage/errors@1.2.1
+  - @backstage/types@1.1.0
+
+## 0.4.0-next.2
+
+### Minor Changes
+
+- d440f1dd0e72: Adds a processor to the linguist backend which can automatically add language tags to entities
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-linguist-common@0.1.1-next.1
+  - @backstage/backend-plugin-api@0.6.0-next.2
+  - @backstage/backend-tasks@0.5.5-next.2
+  - @backstage/backend-common@0.19.2-next.2
+  - @backstage/plugin-catalog-node@1.4.1-next.2
+  - @backstage/plugin-auth-node@0.2.17-next.2
+
 ## 0.3.2-next.1
 
 ### Patch Changes
diff --git a/plugins/linguist-backend/README.md b/plugins/linguist-backend/README.md
index 7bca98191b..d2ed7f5f03 100644
--- a/plugins/linguist-backend/README.md
+++ b/plugins/linguist-backend/README.md
@@ -70,24 +70,32 @@ In your `packages/backend/src/index.ts` make the following changes:
 
   // ... other feature additions
 
-+ const linguistSchedule: TaskScheduleDefinition = {
-+   frequency: { minutes: 2 },
-+   timeout: { minutes: 15 },
-+   initialDelay: { seconds: 15 },
-+ };
-
-+ backend.add(
-+   linguistPlugin({
-+     schedule: linguistSchedule,
-+     age: { days: 30 },
-+     batchSize: 2,
-+     useSourceLocation: false,
-+   }),
-+ );
++ backend.add(linguistPlugin());
 
   backend.start();
 ```
 
+The plugin options can be set through the `app-config.yaml`:
+
+```yaml
+// ...
+
+linguist:
+  schedule:
+    frequency:
+      minutes: 2
+    timeout:
+      minutes: 2
+    initialDelay:
+      seconds: 15
+  age:
+    days: 30
+  batchSize: 2
+  useSourceLocation: false
+
+// ...
+```
+
 ## Plugin Option
 
 The Linguist backend has various plugin options that you can provide to the `createRouter` function in your `packages/backend/src/plugins/linguist.ts` file that will allow you to configure various aspects of how it works. The following sections go into the details of these options
diff --git a/plugins/linguist-backend/api-report.md b/plugins/linguist-backend/api-report.md
index aac978e426..95bdc858ee 100644
--- a/plugins/linguist-backend/api-report.md
+++ b/plugins/linguist-backend/api-report.md
@@ -27,6 +27,11 @@ export function createRouter(
   routerOptions: RouterOptions,
 ): Promise<express.Router>;
 
+// @public (undocumented)
+export function createRouterFromConfig(
+  routerOptions: RouterOptions,
+): Promise<express.Router>;
+
 // @public (undocumented)
 export interface LinguistBackendApi {
   // (undocumented)
@@ -36,23 +41,8 @@ export interface LinguistBackendApi {
 }
 
 // @public
-export const linguistPlugin: (options: LinguistPluginOptions) => BackendFeature;
-
-// @public
-export interface LinguistPluginOptions {
-  // (undocumented)
-  age?: HumanDuration;
-  // (undocumented)
-  batchSize?: number;
-  // (undocumented)
-  kind?: string[];
-  // (undocumented)
-  linguistJsOptions?: Record<string, unknown>;
-  // (undocumented)
-  schedule?: TaskScheduleDefinition;
-  // (undocumented)
-  useSourceLocation?: boolean;
-}
+const linguistPlugin: () => BackendFeature;
+export default linguistPlugin;
 
 // @public
 export class LinguistTagsProcessor implements CatalogProcessor {
@@ -104,6 +94,8 @@ export interface PluginOptions {
 
 // @public (undocumented)
 export interface RouterOptions {
+  // (undocumented)
+  config?: Config;
   // (undocumented)
   database: PluginDatabaseManager;
   // (undocumented)
diff --git a/plugins/linguist-backend/catalog-info.yaml b/plugins/linguist-backend/catalog-info.yaml
new file mode 100644
index 0000000000..de7545d39b
--- /dev/null
+++ b/plugins/linguist-backend/catalog-info.yaml
@@ -0,0 +1,9 @@
+apiVersion: backstage.io/v1alpha1
+kind: Component
+metadata:
+  name: backstage-plugin-linguist-backend
+  title: '@backstage/plugin-linguist-backend'
+spec:
+  lifecycle: experimental
+  type: backstage-backend-plugin
+  owner: awanlin
diff --git a/plugins/linguist-backend/config.d.ts b/plugins/linguist-backend/config.d.ts
index e7ad487d12..758210feb7 100644
--- a/plugins/linguist-backend/config.d.ts
+++ b/plugins/linguist-backend/config.d.ts
@@ -14,11 +14,35 @@
  * limitations under the License.
  */
 
+import { TaskScheduleDefinition } from '@backstage/backend-tasks';
 import { HumanDuration } from '@backstage/types';
+import { Options as LinguistJsOptions } from 'linguist-js/dist/types';
 
 export interface Config {
   /** Configuration options for the linguist plugin */
   linguist?: {
+    schedule?: TaskScheduleDefinition;
+    /**
+     * @default 20
+     */
+    batchSize?: number;
+    /**
+     * @default false
+     */
+    useSourceLocation?: boolean;
+    /**
+     * Refresh generated language breakdown
+     */
+    age?: HumanDuration;
+    /**
+     * @default ['API', 'Component', 'Template']
+     */
+    kind?: string[];
+    /**
+     * [linguist-js](https://www.npmjs.com/package/linguist-js) options
+     */
+    linguistJsOptions?: LinguistJsOptions;
+
     /** Options for the tags processor */
     tagsProcessor?: {
       /**
diff --git a/plugins/linguist-backend/migrations/20221115_init.js b/plugins/linguist-backend/migrations/20221115_init.js
index 3bcf99e08b..359f7c8359 100644
--- a/plugins/linguist-backend/migrations/20221115_init.js
+++ b/plugins/linguist-backend/migrations/20221115_init.js
@@ -32,7 +32,7 @@ exports.up = async function up(knex) {
       .comment('An insert counter to ensure ordering');
     table.uuid('id').notNullable().comment('The ID of the Linguist result');
     table
-      .text('entity_ref')
+      .string('entity_ref')
       .unique()
       .notNullable()
       .comment('The entity ref that this Linguist result applies to');
diff --git a/plugins/linguist-backend/package.json b/plugins/linguist-backend/package.json
index ba71e3c756..0cbbfae851 100644
--- a/plugins/linguist-backend/package.json
+++ b/plugins/linguist-backend/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-linguist-backend",
-  "version": "0.3.2-next.1",
+  "version": "0.4.3-next.2",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
diff --git a/plugins/linguist-backend/src/index.ts b/plugins/linguist-backend/src/index.ts
index 107877551e..df4703bed3 100644
--- a/plugins/linguist-backend/src/index.ts
+++ b/plugins/linguist-backend/src/index.ts
@@ -23,5 +23,4 @@
 export * from './processor';
 export * from './service/router';
 export type { LinguistBackendApi } from './api';
-export { linguistPlugin } from './plugin';
-export type { LinguistPluginOptions } from './plugin';
+export { linguistPlugin as default } from './plugin';
diff --git a/plugins/linguist-backend/src/plugin.ts b/plugins/linguist-backend/src/plugin.ts
index f655d6a1f4..cbf18d9ebe 100644
--- a/plugins/linguist-backend/src/plugin.ts
+++ b/plugins/linguist-backend/src/plugin.ts
@@ -19,69 +19,50 @@ import {
   coreServices,
   createBackendPlugin,
 } from '@backstage/backend-plugin-api';
-import { createRouter } from './service/router';
-import { TaskScheduleDefinition } from '@backstage/backend-tasks';
-import { HumanDuration } from '@backstage/types';
 
-/**
- * Options for Linguist backend plugin
- *
- * @public
- */
-export interface LinguistPluginOptions {
-  schedule?: TaskScheduleDefinition;
-  age?: HumanDuration;
-  batchSize?: number;
-  useSourceLocation?: boolean;
-  linguistJsOptions?: Record<string, unknown>;
-  kind?: string[];
-}
+import { createRouterFromConfig } from './service/router';
 
 /**
  * Linguist backend plugin
  *
  * @public
  */
-export const linguistPlugin = createBackendPlugin(
-  (options: LinguistPluginOptions) => ({
-    pluginId: 'linguist',
-    register(env) {
-      env.registerInit({
-        deps: {
-          logger: coreServices.logger,
-          reader: coreServices.urlReader,
-          database: coreServices.database,
-          discovery: coreServices.discovery,
-          scheduler: coreServices.scheduler,
-          tokenManager: coreServices.tokenManager,
-          httpRouter: coreServices.httpRouter,
-        },
-        async init({
-          logger,
-          reader,
-          database,
-          discovery,
-          scheduler,
-          tokenManager,
-          httpRouter,
-        }) {
-          httpRouter.use(
-            await createRouter(
-              {
-                ...options,
-              },
-              {
-                logger: loggerToWinstonLogger(logger),
-                reader,
-                database,
-                discovery,
-                scheduler,
-                tokenManager,
-              },
-            ),
-          );
-        },
-      });
-    },
-  }),
-);
+export const linguistPlugin = createBackendPlugin({
+  pluginId: 'linguist',
+  register(env) {
+    env.registerInit({
+      deps: {
+        logger: coreServices.logger,
+        config: coreServices.rootConfig,
+        reader: coreServices.urlReader,
+        database: coreServices.database,
+        discovery: coreServices.discovery,
+        scheduler: coreServices.scheduler,
+        tokenManager: coreServices.tokenManager,
+        httpRouter: coreServices.httpRouter,
+      },
+      async init({
+        logger,
+        config,
+        reader,
+        database,
+        discovery,
+        scheduler,
+        tokenManager,
+        httpRouter,
+      }) {
+        httpRouter.use(
+          await createRouterFromConfig({
+            logger: loggerToWinstonLogger(logger),
+            config,
+            reader,
+            database,
+            discovery,
+            scheduler,
+            tokenManager,
+          }),
+        );
+      },
+    });
+  },
+});
diff --git a/plugins/linguist-backend/src/service/router.test.ts b/plugins/linguist-backend/src/service/router.test.ts
index 7ab8f1c238..4048e1213b 100644
--- a/plugins/linguist-backend/src/service/router.test.ts
+++ b/plugins/linguist-backend/src/service/router.test.ts
@@ -25,7 +25,7 @@ import {
 import express from 'express';
 import request from 'supertest';
 import { ConfigReader } from '@backstage/config';
-import { createRouter } from './router';
+import { createRouter, createRouterFromConfig } from './router';
 import { LinguistBackendApi } from '../api';
 import { TaskScheduleDefinition } from '@backstage/backend-tasks';
 
@@ -69,26 +69,57 @@ describe('createRouter', () => {
   let linguistBackendApi: jest.Mocked<LinguistBackendApi>;
   let app: express.Express;
 
-  beforeAll(async () => {
-    const router = await createRouter(
-      { schedule: schedule, age: { days: 30 }, useSourceLocation: false },
-      {
-        linguistBackendApi: linguistBackendApi,
-        discovery: testDiscovery,
-        database: createDatabase(),
-        reader: mockUrlReader,
-        logger: getVoidLogger(),
-        tokenManager: mockedTokenManager,
-      },
-    );
-    app = express().use(router);
-  });
-
   beforeEach(() => {
     jest.resetAllMocks();
   });
 
   describe('GET /health', () => {
+    beforeAll(async () => {
+      const router = await createRouter(
+        { schedule: schedule, age: { days: 30 }, useSourceLocation: false },
+        {
+          linguistBackendApi: linguistBackendApi,
+          discovery: testDiscovery,
+          database: createDatabase(),
+          reader: mockUrlReader,
+          logger: getVoidLogger(),
+          tokenManager: mockedTokenManager,
+        },
+      );
+      app = express().use(router);
+    });
+    it('returns ok', async () => {
+      const response = await request(app).get('/health');
+
+      expect(response.status).toEqual(200);
+      expect(response.body).toEqual({ status: 'ok' });
+    });
+  });
+
+  describe('GET /health from config', () => {
+    beforeAll(async () => {
+      const config = new ConfigReader({
+        linguist: {
+          schedule: {
+            frequency: { minutes: 2 },
+            timeout: { minutes: 15 },
+            initialDelay: { seconds: 15 },
+          },
+          age: { days: 30 },
+          useSourceLocation: false,
+        },
+      });
+      const router = await createRouterFromConfig({
+        linguistBackendApi: linguistBackendApi,
+        discovery: testDiscovery,
+        database: createDatabase(),
+        reader: mockUrlReader,
+        logger: getVoidLogger(),
+        config,
+        tokenManager: mockedTokenManager,
+      });
+      app = express().use(router);
+    });
     it('returns ok', async () => {
       const response = await request(app).get('/health');
 
diff --git a/plugins/linguist-backend/src/service/router.ts b/plugins/linguist-backend/src/service/router.ts
index 9e45438ec8..d29943c38b 100644
--- a/plugins/linguist-backend/src/service/router.ts
+++ b/plugins/linguist-backend/src/service/router.ts
@@ -28,11 +28,13 @@ import { LinguistBackendApi } from '../api';
 import { LinguistBackendDatabase } from '../db';
 import {
   PluginTaskScheduler,
+  readTaskScheduleDefinitionFromConfig,
   TaskScheduleDefinition,
 } from '@backstage/backend-tasks';
 import { HumanDuration } from '@backstage/types';
 import { CatalogClient } from '@backstage/catalog-client';
 import { LinguistBackendClient } from '../api/LinguistBackendClient';
+import { Config } from '@backstage/config';
 
 /** @public */
 export interface PluginOptions {
@@ -53,6 +55,7 @@ export interface RouterOptions {
   database: PluginDatabaseManager;
   discovery: PluginEndpointDiscovery;
   scheduler?: PluginTaskScheduler;
+  config?: Config;
 }
 
 /** @public */
@@ -60,6 +63,9 @@ export async function createRouter(
   pluginOptions: PluginOptions,
   routerOptions: RouterOptions,
 ): Promise<express.Router> {
+  const { logger, reader, database, discovery, scheduler, tokenManager } =
+    routerOptions;
+
   const {
     schedule,
     age,
@@ -69,9 +75,6 @@ export async function createRouter(
     linguistJsOptions,
   } = pluginOptions;
 
-  const { logger, reader, database, discovery, scheduler, tokenManager } =
-    routerOptions;
-
   const linguistBackendStore = await LinguistBackendDatabase.create(
     await database.getClient(),
   );
@@ -135,3 +138,27 @@ export async function createRouter(
   router.use(errorHandler());
   return router;
 }
+
+/** @public */
+export async function createRouterFromConfig(routerOptions: RouterOptions) {
+  const { config } = routerOptions;
+  const pluginOptions: PluginOptions = {};
+  if (config) {
+    if (config.has('linguist.schedule')) {
+      pluginOptions.schedule = readTaskScheduleDefinitionFromConfig(
+        config.getConfig('linguist.schedule'),
+      );
+    }
+    pluginOptions.batchSize = config.getOptionalNumber('linguist.batchSize');
+    pluginOptions.useSourceLocation =
+      config.getOptionalBoolean('linguist.useSourceLocation') ?? false;
+    pluginOptions.age = config.getOptionalConfig('linguist.age') as
+      | HumanDuration
+      | undefined;
+    pluginOptions.kind = config.getOptionalStringArray('linguist.kind');
+    pluginOptions.linguistJsOptions = config.getOptionalConfig(
+      'linguist.linguistJsOptions',
+    );
+  }
+  return createRouter(pluginOptions, routerOptions);
+}
diff --git a/plugins/linguist-common/CHANGELOG.md b/plugins/linguist-common/CHANGELOG.md
index 1bfe9fcc84..a4775c1b98 100644
--- a/plugins/linguist-common/CHANGELOG.md
+++ b/plugins/linguist-common/CHANGELOG.md
@@ -1,5 +1,18 @@
 # @backstage/plugin-linguist-common
 
+## 0.1.1
+
+### Patch Changes
+
+- 12a8c94eda8d: Add package repository and homepage metadata
+- d440f1dd0e72: Exported new LanguageType type alias
+
+## 0.1.1-next.1
+
+### Patch Changes
+
+- d440f1dd0e72: Exported new LanguageType type alias
+
 ## 0.1.1-next.0
 
 ### Patch Changes
diff --git a/plugins/linguist-common/catalog-info.yaml b/plugins/linguist-common/catalog-info.yaml
new file mode 100644
index 0000000000..266daa4a75
--- /dev/null
+++ b/plugins/linguist-common/catalog-info.yaml
@@ -0,0 +1,10 @@
+apiVersion: backstage.io/v1alpha1
+kind: Component
+metadata:
+  name: backstage-plugin-linguist-common
+  title: '@backstage/plugin-linguist-common'
+  description: Common functionalities for the linguist plugin
+spec:
+  lifecycle: experimental
+  type: backstage-common-library
+  owner: awanlin
diff --git a/plugins/linguist-common/package.json b/plugins/linguist-common/package.json
index 4ca2b65283..ef19649670 100644
--- a/plugins/linguist-common/package.json
+++ b/plugins/linguist-common/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@backstage/plugin-linguist-common",
   "description": "Common functionalities for the linguist plugin",
-  "version": "0.1.1-next.0",
+  "version": "0.1.1",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
@@ -20,6 +20,7 @@
     "url": "https://github.com/backstage/backstage",
     "directory": "plugins/linguist-common"
   },
+  "sideEffects": false,
   "scripts": {
     "build": "backstage-cli package build",
     "lint": "backstage-cli package lint",
diff --git a/plugins/linguist/CHANGELOG.md b/plugins/linguist/CHANGELOG.md
index 84af3bdd60..afabc727d2 100644
--- a/plugins/linguist/CHANGELOG.md
+++ b/plugins/linguist/CHANGELOG.md
@@ -1,5 +1,67 @@
 # @backstage/plugin-linguist
 
+## 0.1.9-next.2
+
+### Patch Changes
+
+- 8cec7664e146: Removed `@types/node` dependency
+- Updated dependencies
+  - @backstage/core-components@0.13.5-next.2
+  - @backstage/core-plugin-api@1.6.0-next.2
+  - @backstage/plugin-catalog-react@1.8.4-next.2
+  - @backstage/catalog-model@1.4.2-next.1
+  - @backstage/errors@1.2.1
+  - @backstage/theme@0.4.1
+  - @backstage/plugin-linguist-common@0.1.1
+
+## 0.1.9-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.8.4-next.1
+  - @backstage/core-components@0.13.5-next.1
+  - @backstage/catalog-model@1.4.2-next.0
+  - @backstage/core-plugin-api@1.6.0-next.1
+  - @backstage/errors@1.2.1
+  - @backstage/theme@0.4.1
+  - @backstage/plugin-linguist-common@0.1.1
+
+## 0.1.8-next.0
+
+### Patch Changes
+
+- 482bb5c0bbf8: Moved `@types/react` to be a regular dependency
+- Updated dependencies
+  - @backstage/core-plugin-api@1.6.0-next.0
+  - @backstage/core-components@0.13.5-next.0
+  - @backstage/catalog-model@1.4.1
+  - @backstage/errors@1.2.1
+  - @backstage/theme@0.4.1
+  - @backstage/plugin-catalog-react@1.8.3-next.0
+  - @backstage/plugin-linguist-common@0.1.1
+
+## 0.1.6
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-linguist-common@0.1.1
+  - @backstage/core-components@0.13.4
+  - @backstage/plugin-catalog-react@1.8.1
+  - @backstage/core-plugin-api@1.5.3
+  - @backstage/catalog-model@1.4.1
+  - @backstage/errors@1.2.1
+  - @backstage/theme@0.4.1
+
+## 0.1.6-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-linguist-common@0.1.1-next.1
+  - @backstage/plugin-catalog-react@1.8.1-next.1
+
 ## 0.1.6-next.1
 
 ### Patch Changes
diff --git a/plugins/linguist/api-report.md b/plugins/linguist/api-report.md
index 469b3b93c0..5182ce12f6 100644
--- a/plugins/linguist/api-report.md
+++ b/plugins/linguist/api-report.md
@@ -7,9 +7,10 @@
 
 import { BackstagePlugin } from '@backstage/core-plugin-api';
 import { Entity } from '@backstage/catalog-model';
+import { JSX as JSX_2 } from 'react';
 
 // @public (undocumented)
-export const EntityLinguistCard: () => JSX.Element;
+export const EntityLinguistCard: () => JSX_2.Element;
 
 // @public (undocumented)
 export const isLinguistAvailable: (entity: Entity) => boolean;
diff --git a/plugins/linguist/catalog-info.yaml b/plugins/linguist/catalog-info.yaml
new file mode 100644
index 0000000000..aca70b7570
--- /dev/null
+++ b/plugins/linguist/catalog-info.yaml
@@ -0,0 +1,9 @@
+apiVersion: backstage.io/v1alpha1
+kind: Component
+metadata:
+  name: backstage-plugin-linguist
+  title: '@backstage/plugin-linguist'
+spec:
+  lifecycle: experimental
+  type: backstage-frontend-plugin
+  owner: awanlin
diff --git a/plugins/linguist/package.json b/plugins/linguist/package.json
index 2f5369b404..e9a83ec99c 100644
--- a/plugins/linguist/package.json
+++ b/plugins/linguist/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-linguist",
-  "version": "0.1.6-next.1",
+  "version": "0.1.9-next.2",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
@@ -18,6 +18,7 @@
     "url": "https://github.com/backstage/backstage",
     "directory": "plugins/linguist"
   },
+  "sideEffects": false,
   "scripts": {
     "start": "backstage-cli package start",
     "build": "backstage-cli package build",
@@ -38,6 +39,7 @@
     "@material-ui/core": "^4.9.13",
     "@material-ui/icons": "^4.9.1",
     "@material-ui/lab": "4.0.0-alpha.61",
+    "@types/react": "^16.13.1 || ^17.0.0",
     "luxon": "^2.0.2",
     "react-use": "^17.2.4",
     "slugify": "^1.6.4"
@@ -56,8 +58,6 @@
     "@testing-library/jest-dom": "^5.10.1",
     "@testing-library/react": "^12.1.3",
     "@testing-library/user-event": "^14.0.0",
-    "@types/node": "*",
-    "@types/react": "^16.13.1 || ^17.0.0",
     "msw": "^1.0.0"
   },
   "files": [
diff --git a/plugins/microsoft-calendar/CHANGELOG.md b/plugins/microsoft-calendar/CHANGELOG.md
index 0cb4271d67..cfaef9de7e 100644
--- a/plugins/microsoft-calendar/CHANGELOG.md
+++ b/plugins/microsoft-calendar/CHANGELOG.md
@@ -1,5 +1,50 @@
 # @backstage/plugin-microsoft-calendar
 
+## 0.1.7-next.2
+
+### Patch Changes
+
+- 8cec7664e146: Removed `@types/node` dependency
+- 814feeed7343: Update to handle invalid luxon values
+- Updated dependencies
+  - @backstage/core-components@0.13.5-next.2
+  - @backstage/core-plugin-api@1.6.0-next.2
+  - @backstage/errors@1.2.1
+  - @backstage/theme@0.4.1
+
+## 0.1.7-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.13.5-next.1
+  - @backstage/core-plugin-api@1.6.0-next.1
+  - @backstage/errors@1.2.1
+  - @backstage/theme@0.4.1
+
+## 0.1.7-next.0
+
+### Patch Changes
+
+- 482bb5c0bbf8: Moved `@types/react` to be a regular dependency
+- Updated dependencies
+  - @backstage/core-plugin-api@1.6.0-next.0
+  - @backstage/core-components@0.13.5-next.0
+  - @backstage/errors@1.2.1
+  - @backstage/theme@0.4.1
+
+## 0.1.6
+
+### Patch Changes
+
+- 12a8c94eda8d: Add package repository and homepage metadata
+- eea2922e749a: README update - example of apiRef definition and fixed component name
+- Updated dependencies
+  - @backstage/core-components@0.13.4
+  - @backstage/core-plugin-api@1.5.3
+  - @backstage/errors@1.2.1
+  - @backstage/theme@0.4.1
+
 ## 0.1.6-next.1
 
 ### Patch Changes
diff --git a/plugins/microsoft-calendar/api-report.md b/plugins/microsoft-calendar/api-report.md
index d6839f19ea..fad48e5de0 100644
--- a/plugins/microsoft-calendar/api-report.md
+++ b/plugins/microsoft-calendar/api-report.md
@@ -9,6 +9,7 @@ import { ApiRef } from '@backstage/core-plugin-api';
 import { Calendar } from '@microsoft/microsoft-graph-types';
 import { Event as Event_2 } from '@microsoft/microsoft-graph-types';
 import { FetchApi } from '@backstage/core-plugin-api';
+import { JSX as JSX_2 } from 'react';
 import { OAuthApi } from '@backstage/core-plugin-api';
 
 // @public (undocumented)
@@ -33,7 +34,7 @@ export class MicrosoftCalendarApiClient {
 export const microsoftCalendarApiRef: ApiRef<MicrosoftCalendarApiClient>;
 
 // @public (undocumented)
-export const MicrosoftCalendarCard: () => JSX.Element;
+export const MicrosoftCalendarCard: () => JSX_2.Element;
 
 // (No @packageDocumentation comment for this package)
 ```
diff --git a/plugins/microsoft-calendar/catalog-info.yaml b/plugins/microsoft-calendar/catalog-info.yaml
new file mode 100644
index 0000000000..82c3c82b49
--- /dev/null
+++ b/plugins/microsoft-calendar/catalog-info.yaml
@@ -0,0 +1,9 @@
+apiVersion: backstage.io/v1alpha1
+kind: Component
+metadata:
+  name: backstage-plugin-microsoft-calendar
+  title: '@backstage/plugin-microsoft-calendar'
+spec:
+  lifecycle: experimental
+  type: backstage-frontend-plugin
+  owner: maintainers
diff --git a/plugins/microsoft-calendar/package.json b/plugins/microsoft-calendar/package.json
index 84e307ac2b..960b570b32 100644
--- a/plugins/microsoft-calendar/package.json
+++ b/plugins/microsoft-calendar/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-microsoft-calendar",
-  "version": "0.1.6-next.1",
+  "version": "0.1.7-next.2",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
@@ -37,6 +37,7 @@
       "name": "abhaysoni"
     }
   ],
+  "sideEffects": false,
   "scripts": {
     "start": "backstage-cli package start",
     "build": "backstage-cli package build",
@@ -55,6 +56,7 @@
     "@material-ui/icons": "^4.9.1",
     "@microsoft/microsoft-graph-types": "^2.25.0",
     "@tanstack/react-query": "^4.1.3",
+    "@types/react": "^16.13.1 || ^17.0.0",
     "classnames": "^2.3.1",
     "dompurify": "^2.3.6",
     "lodash": "^4.17.21",
@@ -76,8 +78,6 @@
     "@testing-library/jest-dom": "^5.10.1",
     "@testing-library/react": "^12.1.3",
     "@testing-library/user-event": "^14.0.0",
-    "@types/node": "^16.11.26",
-    "@types/react": "^16.13.1 || ^17.0.0",
     "msw": "^1.0.0"
   },
   "files": [
diff --git a/plugins/microsoft-calendar/src/components/CalendarCard.tsx b/plugins/microsoft-calendar/src/components/CalendarCard.tsx
index dd94bad148..57c520ad0f 100644
--- a/plugins/microsoft-calendar/src/components/CalendarCard.tsx
+++ b/plugins/microsoft-calendar/src/components/CalendarCard.tsx
@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 import { sortBy } from 'lodash';
 import { DateTime } from 'luxon';
 import React, { useState } from 'react';
@@ -56,9 +57,9 @@ export const CalendarCard = () => {
   const { data: events, isLoading: isEventLoading } = useEventsQuery({
     calendarId: selectedCalendarId || defaultCalendarId || '',
     enabled: isSignedIn && calendars.length > 0,
-    timeMin: date.startOf('day').toISO(),
-    timeMax: date.endOf('day').toISO(),
-    timeZone: date.zoneName,
+    timeMin: date.startOf('day').toISO()!,
+    timeMax: date.endOf('day').toISO()!,
+    timeZone: date.zoneName ?? undefined,
   });
 
   const showLoader =
diff --git a/plugins/newrelic-dashboard/CHANGELOG.md b/plugins/newrelic-dashboard/CHANGELOG.md
index de7a9c6b5b..f0a505ec70 100644
--- a/plugins/newrelic-dashboard/CHANGELOG.md
+++ b/plugins/newrelic-dashboard/CHANGELOG.md
@@ -1,5 +1,58 @@
 # @backstage/plugin-newrelic-dashboard
 
+## 0.2.17-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.13.5-next.2
+  - @backstage/core-plugin-api@1.6.0-next.2
+  - @backstage/plugin-catalog-react@1.8.4-next.2
+  - @backstage/catalog-model@1.4.2-next.1
+  - @backstage/errors@1.2.1
+
+## 0.2.17-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.8.4-next.1
+  - @backstage/core-components@0.13.5-next.1
+  - @backstage/catalog-model@1.4.2-next.0
+  - @backstage/core-plugin-api@1.6.0-next.1
+  - @backstage/errors@1.2.1
+
+## 0.2.16-next.0
+
+### Patch Changes
+
+- 482bb5c0bbf8: Moved `@types/react` to be a regular dependency
+- Updated dependencies
+  - @backstage/core-plugin-api@1.6.0-next.0
+  - @backstage/core-components@0.13.5-next.0
+  - @backstage/catalog-model@1.4.1
+  - @backstage/errors@1.2.1
+  - @backstage/plugin-catalog-react@1.8.3-next.0
+
+## 0.2.14
+
+### Patch Changes
+
+- 12a8c94eda8d: Add package repository and homepage metadata
+- Updated dependencies
+  - @backstage/core-components@0.13.4
+  - @backstage/plugin-catalog-react@1.8.1
+  - @backstage/core-plugin-api@1.5.3
+  - @backstage/catalog-model@1.4.1
+  - @backstage/errors@1.2.1
+
+## 0.2.14-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.8.1-next.1
+
 ## 0.2.14-next.1
 
 ### Patch Changes
diff --git a/plugins/newrelic-dashboard/api-report.md b/plugins/newrelic-dashboard/api-report.md
index 740fc46ef7..2e9b11a88e 100644
--- a/plugins/newrelic-dashboard/api-report.md
+++ b/plugins/newrelic-dashboard/api-report.md
@@ -7,6 +7,7 @@
 
 import { BackstagePlugin } from '@backstage/core-plugin-api';
 import { Entity } from '@backstage/catalog-model';
+import { JSX as JSX_2 } from 'react';
 import { RouteRef } from '@backstage/core-plugin-api';
 
 // @public
@@ -14,13 +15,13 @@ export const DashboardSnapshotComponent: (props: {
   guid: string;
   name: string;
   permalink: string;
-}) => JSX.Element;
+}) => JSX_2.Element;
 
 // @public (undocumented)
-export const EntityNewRelicDashboardCard: () => JSX.Element;
+export const EntityNewRelicDashboardCard: () => JSX_2.Element;
 
 // @public (undocumented)
-export const EntityNewRelicDashboardContent: () => JSX.Element;
+export const EntityNewRelicDashboardContent: () => JSX_2.Element;
 
 // @public (undocumented)
 export const isNewRelicDashboardAvailable: (entity: Entity) => boolean;
diff --git a/plugins/newrelic-dashboard/catalog-info.yaml b/plugins/newrelic-dashboard/catalog-info.yaml
new file mode 100644
index 0000000000..d944c9cb6b
--- /dev/null
+++ b/plugins/newrelic-dashboard/catalog-info.yaml
@@ -0,0 +1,9 @@
+apiVersion: backstage.io/v1alpha1
+kind: Component
+metadata:
+  name: backstage-plugin-newrelic-dashboard
+  title: '@backstage/plugin-newrelic-dashboard'
+spec:
+  lifecycle: experimental
+  type: backstage-frontend-plugin
+  owner: maintainers
diff --git a/plugins/newrelic-dashboard/package.json b/plugins/newrelic-dashboard/package.json
index b32fd6c1e2..0b8da830ce 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.14-next.1",
+  "version": "0.2.17-next.2",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
@@ -18,6 +18,7 @@
     "url": "https://github.com/backstage/backstage",
     "directory": "plugins/newrelic-dashboard"
   },
+  "sideEffects": false,
   "scripts": {
     "build": "backstage-cli package build",
     "start": "backstage-cli package start",
@@ -36,6 +37,7 @@
     "@material-ui/core": "^4.12.2",
     "@material-ui/icons": "^4.9.1",
     "@material-ui/lab": "4.0.0-alpha.61",
+    "@types/react": "^16.13.1 || ^17.0.0",
     "react-use": "^17.2.4"
   },
   "peerDependencies": {
@@ -46,8 +48,7 @@
   "devDependencies": {
     "@backstage/cli": "workspace:^",
     "@backstage/dev-utils": "workspace:^",
-    "@testing-library/jest-dom": "^5.10.1",
-    "@types/react": "^16.13.1 || ^17.0.0"
+    "@testing-library/jest-dom": "^5.10.1"
   },
   "files": [
     "dist"
diff --git a/plugins/newrelic/CHANGELOG.md b/plugins/newrelic/CHANGELOG.md
index db1fad33e4..009957e7cc 100644
--- a/plugins/newrelic/CHANGELOG.md
+++ b/plugins/newrelic/CHANGELOG.md
@@ -1,5 +1,44 @@
 # @backstage/plugin-newrelic
 
+## 0.3.40-next.2
+
+### Patch Changes
+
+- 8cec7664e146: Removed `@types/node` dependency
+- Updated dependencies
+  - @backstage/core-components@0.13.5-next.2
+  - @backstage/core-plugin-api@1.6.0-next.2
+  - @backstage/theme@0.4.1
+
+## 0.3.40-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.13.5-next.1
+  - @backstage/core-plugin-api@1.6.0-next.1
+  - @backstage/theme@0.4.1
+
+## 0.3.40-next.0
+
+### Patch Changes
+
+- 482bb5c0bbf8: Moved `@types/react` to be a regular dependency
+- Updated dependencies
+  - @backstage/core-plugin-api@1.6.0-next.0
+  - @backstage/core-components@0.13.5-next.0
+  - @backstage/theme@0.4.1
+
+## 0.3.39
+
+### Patch Changes
+
+- 2167b7eab09b: The newrelic plugin now supports pagination when retrieving results from newrelic. It will no longer truncate results. To see all applications, the link header will need to be allowed through the proxy (see the newrelic plugin readme).
+- Updated dependencies
+  - @backstage/core-components@0.13.4
+  - @backstage/core-plugin-api@1.5.3
+  - @backstage/theme@0.4.1
+
 ## 0.3.39-next.0
 
 ### Patch Changes
diff --git a/plugins/newrelic/README.md b/plugins/newrelic/README.md
index 8ac7ed2c72..14049ba39c 100644
--- a/plugins/newrelic/README.md
+++ b/plugins/newrelic/README.md
@@ -18,6 +18,8 @@ APIs.
         target: https://api.newrelic.com/v2
         headers:
           X-Api-Key: ${NEW_RELIC_REST_API_KEY}
+        allowedHeaders:
+          - link
     ```
 
     There is some types of api key on new relic, to this use must be `User` type of key, In your production deployment of Backstage, you would also need to ensure that
@@ -33,6 +35,8 @@ APIs.
       '/newrelic/apm/api':
         headers:
           X-Api-Key: NRRA-YourActualApiKey
+        allowedHeaders:
+          - link
     ```
 
     Read more about how to find or generate this key in
diff --git a/plugins/newrelic/api-report.md b/plugins/newrelic/api-report.md
index 302b7c918a..04fd229465 100644
--- a/plugins/newrelic/api-report.md
+++ b/plugins/newrelic/api-report.md
@@ -6,10 +6,11 @@
 /// <reference types="react" />
 
 import { BackstagePlugin } from '@backstage/core-plugin-api';
+import { JSX as JSX_2 } from 'react';
 import { RouteRef } from '@backstage/core-plugin-api';
 
 // @public (undocumented)
-export const NewRelicPage: () => JSX.Element;
+export const NewRelicPage: () => JSX_2.Element;
 
 // @public (undocumented)
 const newRelicPlugin: BackstagePlugin<
diff --git a/plugins/newrelic/catalog-info.yaml b/plugins/newrelic/catalog-info.yaml
new file mode 100644
index 0000000000..bdf6aa5757
--- /dev/null
+++ b/plugins/newrelic/catalog-info.yaml
@@ -0,0 +1,10 @@
+apiVersion: backstage.io/v1alpha1
+kind: Component
+metadata:
+  name: backstage-plugin-newrelic
+  title: '@backstage/plugin-newrelic'
+  description: A Backstage plugin that integrates towards New Relic
+spec:
+  lifecycle: experimental
+  type: backstage-frontend-plugin
+  owner: maintainers
diff --git a/plugins/newrelic/package.json b/plugins/newrelic/package.json
index b09050c599..1f4b3a2e7f 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.39-next.0",
+  "version": "0.3.40-next.2",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
@@ -23,6 +23,7 @@
     "backstage",
     "newrelic"
   ],
+  "sideEffects": false,
   "scripts": {
     "build": "backstage-cli package build",
     "start": "backstage-cli package start",
@@ -39,6 +40,8 @@
     "@material-ui/core": "^4.12.2",
     "@material-ui/icons": "^4.9.1",
     "@material-ui/lab": "4.0.0-alpha.61",
+    "@types/react": "^16.13.1 || ^17.0.0",
+    "parse-link-header": "^2.0.0",
     "react-use": "^17.2.4"
   },
   "peerDependencies": {
@@ -47,6 +50,7 @@
     "react-router-dom": "6.0.0-beta.0 || ^6.3.0"
   },
   "devDependencies": {
+    "@backstage/backend-test-utils": "workspace:^",
     "@backstage/cli": "workspace:^",
     "@backstage/core-app-api": "workspace:^",
     "@backstage/dev-utils": "workspace:^",
@@ -55,10 +59,9 @@
     "@testing-library/jest-dom": "^5.10.1",
     "@testing-library/react": "^12.1.3",
     "@testing-library/user-event": "^14.0.0",
-    "@types/node": "^16.11.26",
-    "@types/react": "^16.13.1 || ^17.0.0",
+    "@types/parse-link-header": "^2.0.1",
     "cross-fetch": "^3.1.5",
-    "msw": "^1.0.0"
+    "msw": "^1.2.3"
   },
   "files": [
     "dist"
diff --git a/plugins/newrelic/src/api/index.test.ts b/plugins/newrelic/src/api/index.test.ts
new file mode 100644
index 0000000000..d4ed4a1691
--- /dev/null
+++ b/plugins/newrelic/src/api/index.test.ts
@@ -0,0 +1,384 @@
+/*
+ * 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 { NewRelicApplication, NewRelicClient } from '.';
+import { DiscoveryApi } from '@backstage/core-plugin-api';
+import { rest } from 'msw';
+import { setupServer } from 'msw/node';
+import { MockFetchApi, setupRequestMockHandlers } from '@backstage/test-utils';
+
+const mockedDiscoveryApi: DiscoveryApi = {
+  getBaseUrl: async () => 'https://test.test',
+};
+
+beforeEach(() => {
+  jest.resetAllMocks();
+});
+
+describe('NewRelicClient', () => {
+  const server = setupServer();
+  setupRequestMockHandlers(server);
+
+  beforeEach(() => {
+    server.resetHandlers();
+  });
+
+  test.each([
+    ['https://test.test/BASEPATH/apm/api/applications.json', '/BASEPATH'],
+    ['https://test.test/BASEPATH2/apm/api/applications.json', '/BASEPATH2'],
+    ['https://test.testBASEPATH3/apm/api/applications.json', 'BASEPATH3'],
+    ['https://test.test/newrelic/apm/api/applications.json', undefined],
+  ])(
+    'It correctly forms the request url (%p) when proxyPathBase is %p',
+    async (expectedUrl, basePathOverride) => {
+      server.use(
+        rest.get(expectedUrl, (_, res, ctx) =>
+          res(ctx.status(200), ctx.json({ applications: [] })),
+        ),
+      );
+
+      const mockedFetchApi = new MockFetchApi();
+      const fetchSpy = jest.spyOn(mockedFetchApi, 'fetch');
+
+      const client = new NewRelicClient({
+        discoveryApi: mockedDiscoveryApi,
+        fetchApi: mockedFetchApi,
+        proxyPathBase: basePathOverride,
+      });
+      await client.getApplications();
+
+      expect(fetchSpy).toHaveBeenCalledWith(expectedUrl);
+    },
+  );
+
+  it('Correctly reads all pages of results and returns the expected results', async () => {
+    const mockedApplicationOne: NewRelicApplication = {
+      id: 1,
+      application_summary: {
+        apdex_score: 0,
+        error_rate: 100,
+        host_count: 500,
+        instance_count: 5000,
+        response_time: 20,
+        throughput: 500000,
+      },
+      name: 'Testing Application #1',
+      language: 'en-us',
+      health_status: 'Failing',
+      reporting: true,
+      settings: {
+        app_apdex_threshold: 0,
+        end_user_apdex_threshold: 0,
+        enable_real_user_monitoring: true,
+        use_server_side_config: true,
+      },
+    };
+
+    const mockedApplicationTwo: NewRelicApplication = {
+      id: 2,
+      application_summary: {
+        apdex_score: -900,
+        error_rate: 0,
+        host_count: 0,
+        instance_count: 0,
+        response_time: 0,
+        throughput: 0,
+      },
+      name: 'Testing Application #2',
+      language: 'en-us',
+      health_status: 'Working',
+      reporting: true,
+      settings: {
+        app_apdex_threshold: 0,
+        end_user_apdex_threshold: 0,
+        enable_real_user_monitoring: true,
+        use_server_side_config: true,
+      },
+    };
+
+    const mockedApplicationThree: NewRelicApplication = {
+      id: 3,
+      application_summary: {
+        apdex_score: -900,
+        error_rate: 0,
+        host_count: 0,
+        instance_count: 0,
+        response_time: 0,
+        throughput: 0,
+      },
+      name: 'Testing Application #3',
+      language: 'en-us',
+      health_status: 'Waiting',
+      reporting: false,
+      settings: {
+        app_apdex_threshold: 1000,
+        end_user_apdex_threshold: 500,
+        enable_real_user_monitoring: false,
+        use_server_side_config: false,
+      },
+    };
+
+    const queryToRequestData = new Map<
+      string | null,
+      { link?: string | string[]; apps: NewRelicApplication[] }
+    >([
+      [
+        null,
+        {
+          link: [
+            '<https://next.page/page2?page=2>; rel="next"',
+            '<https://badsite.dontgohere>; rel="bad"',
+          ],
+          apps: [mockedApplicationOne],
+        },
+      ],
+      [
+        '2',
+        {
+          link: '<https://next.page/page3?page=3>; rel="next",',
+          apps: [],
+        },
+      ],
+      [
+        '3',
+        {
+          apps: [mockedApplicationTwo, mockedApplicationThree],
+        },
+      ],
+    ]);
+
+    const mockedFetchApi = new MockFetchApi();
+    const fetchSpy = jest.spyOn(mockedFetchApi, 'fetch');
+
+    server.use(
+      rest.get(
+        'https://test.test/newrelic/apm/api/applications.json',
+        (req, res, ctx) => {
+          const nextPageNumber = req.url.searchParams.get('page');
+          const requestData = queryToRequestData.get(nextPageNumber) ?? {
+            apps: [],
+          };
+
+          const { link, apps: applications } = requestData;
+          const statusTransform = ctx.status(200);
+          const responseBody = ctx.json({ applications });
+
+          if (!!link) {
+            return res(statusTransform, ctx.set({ link }), responseBody);
+          }
+
+          return res(statusTransform, responseBody);
+        },
+      ),
+    );
+
+    const client = new NewRelicClient({
+      discoveryApi: mockedDiscoveryApi,
+      fetchApi: mockedFetchApi,
+    });
+
+    const actual = await client.getApplications();
+    const expected = {
+      applications: [
+        mockedApplicationOne,
+        mockedApplicationTwo,
+        mockedApplicationThree,
+      ],
+    };
+
+    expect(fetchSpy).toHaveBeenCalledTimes(3);
+    expect(fetchSpy).toHaveBeenCalledWith(
+      'https://test.test/newrelic/apm/api/applications.json',
+    );
+    expect(fetchSpy).toHaveBeenCalledWith(
+      'https://test.test/newrelic/apm/api/applications.json?page=2',
+    );
+    expect(fetchSpy).toHaveBeenCalledWith(
+      'https://test.test/newrelic/apm/api/applications.json?page=3',
+    );
+    expect(actual).toStrictEqual(expected);
+  });
+
+  test.each([['Link'], ['LINK'], ['lINK']])(
+    'It does not attempt pagination when the link header name is invalid (%p)',
+    async linkHeaderName => {
+      const mockedFetchApi = new MockFetchApi();
+      const fetchSpy = jest.spyOn(mockedFetchApi, 'fetch');
+
+      server.use(
+        rest.get(
+          'https://test.test/newrelic/apm/api/applications.json',
+          (_, res, ctx) =>
+            res(
+              ctx.status(200),
+              ctx.set(
+                linkHeaderName,
+                '<https://test.test/badroute>; rel="next"',
+              ),
+              ctx.json({ applications: [] }),
+            ),
+        ),
+        rest.get('https://test.test/badroute', () => {
+          throw new Error(
+            'NewRelicClient attempted to paginate when it should not have',
+          );
+        }),
+      );
+
+      const client = new NewRelicClient({
+        discoveryApi: mockedDiscoveryApi,
+        fetchApi: mockedFetchApi,
+      });
+      await client.getApplications();
+
+      expect(fetchSpy).toHaveBeenCalledTimes(1);
+      expect(fetchSpy).toHaveBeenCalledWith(
+        'https://test.test/newrelic/apm/api/applications.json',
+      );
+    },
+  );
+
+  test.each([
+    [''],
+    ['<> rel=""'],
+    ['<>; rel=""'],
+    ['<https://next.page>; rel=""'],
+    ['<>; rel:"value"'],
+    ['<https://next.page>; rel: "next"'],
+    ['ABCDE'],
+    ['<https://next.page/page3?page=>; rel="next",'],
+  ])(
+    'It does not attempt pagination when the link header value is invalid (%p)',
+    async linkHeaderValue => {
+      const mockedFetchApi = new MockFetchApi();
+      const fetchSpy = jest.spyOn(mockedFetchApi, 'fetch');
+
+      server.use(
+        rest.get(
+          'https://test.test/newrelic/apm/api/applications.json',
+          (_, res, ctx) =>
+            res(
+              ctx.status(200),
+              ctx.set('link', linkHeaderValue),
+              ctx.json({ applications: [] }),
+            ),
+        ),
+        rest.get('https://test.test/badroute', () => {
+          throw new Error(
+            'NewRelicClient attempted to paginate when it should not have',
+          );
+        }),
+      );
+
+      const client = new NewRelicClient({
+        discoveryApi: mockedDiscoveryApi,
+        fetchApi: mockedFetchApi,
+      });
+      await client.getApplications();
+
+      expect(fetchSpy).toHaveBeenCalledTimes(1);
+      expect(fetchSpy).toHaveBeenCalledWith(
+        'https://test.test/newrelic/apm/api/applications.json',
+      );
+    },
+  );
+
+  test.each([
+    ['Error communicating with New Relic: Not Found', 404, JSON.stringify({})],
+    [
+      'Error communicating with New Relic: ERROR TITLE',
+      404,
+      JSON.stringify({
+        error: {
+          title: 'ERROR TITLE',
+        },
+      }),
+    ],
+    [
+      'Error communicating with New Relic: Internal Server Error',
+      500,
+      JSON.stringify(undefined),
+    ],
+    [
+      'Error communicating with New Relic: Internal Server Error',
+      500,
+      JSON.stringify(null),
+    ],
+    [
+      'Error communicating with New Relic: Internal Server Error',
+      500,
+      '<invalid></invalid',
+    ],
+  ])(
+    'It throws this error: %p when the status code is %p and the body is %j',
+    async (expectedErrorMessage, statusCode, body) => {
+      server.use(
+        rest.get(
+          'https://test.test/newrelic/apm/api/applications.json',
+          (_, res, ctx) => res(ctx.status(statusCode), ctx.body(body)),
+        ),
+      );
+
+      const client = new NewRelicClient({
+        discoveryApi: mockedDiscoveryApi,
+        fetchApi: new MockFetchApi(),
+      });
+
+      await expect(client.getApplications()).rejects.toThrow(
+        expectedErrorMessage,
+      );
+    },
+  );
+
+  it('Throws an error when the body is invalid json but the status code is 200', async () => {
+    server.use(
+      rest.get(
+        'https://test.test/newrelic/apm/api/applications.json',
+        (_, res, ctx) => res(ctx.status(200), ctx.body('<Invalid></Invalid')),
+      ),
+    );
+
+    const client = new NewRelicClient({
+      discoveryApi: mockedDiscoveryApi,
+      fetchApi: new MockFetchApi(),
+    });
+
+    await expect(client.getApplications()).rejects.toThrow();
+  });
+
+  it('Generates the base url only once', async () => {
+    const getBaseUrlSpy = jest.spyOn(mockedDiscoveryApi, 'getBaseUrl');
+
+    server.use(
+      rest.get(
+        'https://test.test/newrelic/apm/api/applications.json',
+        (_, res, ctx) => res(ctx.status(200), ctx.json({ applications: [] })),
+      ),
+    );
+
+    const client = new NewRelicClient({
+      discoveryApi: mockedDiscoveryApi,
+      fetchApi: new MockFetchApi(),
+    });
+
+    await client.getApplications();
+    await client.getApplications();
+    await client.getApplications();
+    await client.getApplications();
+
+    expect(getBaseUrlSpy).toHaveBeenCalledTimes(1);
+  });
+});
diff --git a/plugins/newrelic/src/api/index.ts b/plugins/newrelic/src/api/index.ts
index 2734dd2b4f..b37575b163 100644
--- a/plugins/newrelic/src/api/index.ts
+++ b/plugins/newrelic/src/api/index.ts
@@ -14,7 +14,13 @@
  * limitations under the License.
  */
 
-import { createApiRef, DiscoveryApi } from '@backstage/core-plugin-api';
+import {
+  createApiRef,
+  DiscoveryApi,
+  FetchApi,
+} from '@backstage/core-plugin-api';
+
+import parseLinkHeader from 'parse-link-header';
 
 export type NewRelicApplication = {
   id: number;
@@ -61,6 +67,7 @@ const DEFAULT_PROXY_PATH_BASE = '/newrelic';
 
 type Options = {
   discoveryApi: DiscoveryApi;
+  fetchApi: FetchApi;
   /**
    * Path to use for requests via the proxy, defaults to /newrelic
    */
@@ -71,39 +78,72 @@ export interface NewRelicApi {
   getApplications(): Promise<NewRelicApplications>;
 }
 
+interface NewRelicPageReadResult {
+  nextPageUrl: string | undefined;
+  applicationsFromReadPage: NewRelicApplication[];
+}
+
 export class NewRelicClient implements NewRelicApi {
   private readonly discoveryApi: DiscoveryApi;
+  private readonly fetchApi: FetchApi;
   private readonly proxyPathBase: string;
+  private baseUrl: string;
 
   constructor(options: Options) {
     this.discoveryApi = options.discoveryApi;
+    this.fetchApi = options.fetchApi;
     this.proxyPathBase = options.proxyPathBase ?? DEFAULT_PROXY_PATH_BASE;
+    this.baseUrl = '';
   }
 
   async getApplications(): Promise<NewRelicApplications> {
-    const url = await this.getApiUrl('apm', 'applications.json');
-    const response = await fetch(url);
-    let responseJson;
-
-    try {
-      responseJson = await response.json();
-    } catch (e) {
-      responseJson = { applications: [] };
+    if (!this.baseUrl) {
+      const proxyUrl = await this.discoveryApi.getBaseUrl('proxy');
+      this.baseUrl = `${proxyUrl}${this.proxyPathBase}/apm/api/applications.json`;
     }
 
-    if (response.status !== 200) {
+    const applications: NewRelicApplication[] = [];
+    let targetUrl = this.baseUrl;
+
+    do {
+      const { nextPageUrl, applicationsFromReadPage } =
+        await this.fetchNewRelic(targetUrl);
+
+      targetUrl = nextPageUrl ?? '';
+      applications.push(...applicationsFromReadPage);
+    } while (!!targetUrl);
+
+    return { applications };
+  }
+
+  private async fetchNewRelic(
+    targetUrl: string,
+  ): Promise<NewRelicPageReadResult> {
+    const response = await this.fetchApi.fetch(targetUrl);
+
+    if (!response.ok) {
+      let specificErrorTitle = undefined;
+      try {
+        specificErrorTitle = (await response.json())?.error?.title;
+      } catch (e) {
+        /* empty */
+      }
+
       throw new Error(
         `Error communicating with New Relic: ${
-          responseJson?.error?.title || response.statusText
+          specificErrorTitle || response.statusText
         }`,
       );
     }
 
-    return responseJson;
-  }
+    const readResponse = (await response.json()) as NewRelicApplications;
+    const linkHeader = response.headers.get('link');
+    const parseResult = parseLinkHeader(linkHeader);
+    const nextPageNumber = parseResult?.next?.page;
 
-  private async getApiUrl(product: string, path: string) {
-    const proxyUrl = await this.discoveryApi.getBaseUrl('proxy');
-    return `${proxyUrl}${this.proxyPathBase}/${product}/api/${path}`;
+    return {
+      nextPageUrl: nextPageNumber && `${this.baseUrl}?page=${nextPageNumber}`,
+      applicationsFromReadPage: readResponse.applications,
+    };
   }
 }
diff --git a/plugins/newrelic/src/plugin.ts b/plugins/newrelic/src/plugin.ts
index 0387c50aa9..da7cae9b93 100644
--- a/plugins/newrelic/src/plugin.ts
+++ b/plugins/newrelic/src/plugin.ts
@@ -20,6 +20,7 @@ import {
   createPlugin,
   createRouteRef,
   discoveryApiRef,
+  fetchApiRef,
   createRoutableExtension,
 } from '@backstage/core-plugin-api';
 
@@ -33,8 +34,12 @@ export const newRelicPlugin = createPlugin({
   apis: [
     createApiFactory({
       api: newRelicApiRef,
-      deps: { discoveryApi: discoveryApiRef },
-      factory: ({ discoveryApi }) => new NewRelicClient({ discoveryApi }),
+      deps: {
+        discoveryApi: discoveryApiRef,
+        fetchApi: fetchApiRef,
+      },
+      factory: ({ discoveryApi, fetchApi }) =>
+        new NewRelicClient({ discoveryApi, fetchApi }),
     }),
   ],
   routes: {
diff --git a/plugins/nomad-backend/CHANGELOG.md b/plugins/nomad-backend/CHANGELOG.md
index 37a5ba36cf..f114e98227 100644
--- a/plugins/nomad-backend/CHANGELOG.md
+++ b/plugins/nomad-backend/CHANGELOG.md
@@ -1,5 +1,49 @@
 # @backstage/plugin-nomad-backend
 
+## 0.1.5-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config@1.1.0-next.1
+  - @backstage/backend-common@0.19.5-next.2
+  - @backstage/errors@1.2.1
+
+## 0.1.5-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config@1.1.0-next.0
+  - @backstage/backend-common@0.19.5-next.1
+  - @backstage/errors@1.2.1
+
+## 0.1.4-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.19.4-next.0
+  - @backstage/config@1.0.8
+  - @backstage/errors@1.2.1
+
+## 0.1.2
+
+### Patch Changes
+
+- 12a8c94eda8d: Add package repository and homepage metadata
+- Updated dependencies
+  - @backstage/backend-common@0.19.2
+  - @backstage/config@1.0.8
+  - @backstage/errors@1.2.1
+
+## 0.1.2-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.19.2-next.2
+
 ## 0.1.2-next.1
 
 ### Patch Changes
diff --git a/plugins/nomad-backend/catalog-info.yaml b/plugins/nomad-backend/catalog-info.yaml
new file mode 100644
index 0000000000..7364d1920e
--- /dev/null
+++ b/plugins/nomad-backend/catalog-info.yaml
@@ -0,0 +1,9 @@
+apiVersion: backstage.io/v1alpha1
+kind: Component
+metadata:
+  name: backstage-plugin-nomad-backend
+  title: '@backstage/plugin-nomad-backend'
+spec:
+  lifecycle: experimental
+  type: backstage-backend-plugin
+  owner: maintainers
diff --git a/plugins/nomad-backend/package.json b/plugins/nomad-backend/package.json
index 78a3e3a386..d55bb9cacf 100644
--- a/plugins/nomad-backend/package.json
+++ b/plugins/nomad-backend/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-nomad-backend",
-  "version": "0.1.2-next.1",
+  "version": "0.1.5-next.2",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
diff --git a/plugins/nomad/CHANGELOG.md b/plugins/nomad/CHANGELOG.md
index 151657c12b..52d0134701 100644
--- a/plugins/nomad/CHANGELOG.md
+++ b/plugins/nomad/CHANGELOG.md
@@ -1,5 +1,63 @@
 # @backstage/plugin-nomad
 
+## 0.1.5-next.2
+
+### Patch Changes
+
+- 8cec7664e146: Removed `@types/node` dependency
+- Updated dependencies
+  - @backstage/core-components@0.13.5-next.2
+  - @backstage/core-plugin-api@1.6.0-next.2
+  - @backstage/config@1.1.0-next.1
+  - @backstage/plugin-catalog-react@1.8.4-next.2
+  - @backstage/catalog-model@1.4.2-next.1
+  - @backstage/theme@0.4.1
+
+## 0.1.5-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.8.4-next.1
+  - @backstage/core-components@0.13.5-next.1
+  - @backstage/config@1.1.0-next.0
+  - @backstage/catalog-model@1.4.2-next.0
+  - @backstage/core-plugin-api@1.6.0-next.1
+  - @backstage/theme@0.4.1
+
+## 0.1.4-next.0
+
+### Patch Changes
+
+- 482bb5c0bbf8: Moved `@types/react` to be a regular dependency
+- Updated dependencies
+  - @backstage/core-plugin-api@1.6.0-next.0
+  - @backstage/core-components@0.13.5-next.0
+  - @backstage/catalog-model@1.4.1
+  - @backstage/config@1.0.8
+  - @backstage/theme@0.4.1
+  - @backstage/plugin-catalog-react@1.8.3-next.0
+
+## 0.1.2
+
+### Patch Changes
+
+- 12a8c94eda8d: Add package repository and homepage metadata
+- Updated dependencies
+  - @backstage/core-components@0.13.4
+  - @backstage/plugin-catalog-react@1.8.1
+  - @backstage/core-plugin-api@1.5.3
+  - @backstage/catalog-model@1.4.1
+  - @backstage/config@1.0.8
+  - @backstage/theme@0.4.1
+
+## 0.1.2-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.8.1-next.1
+
 ## 0.1.2-next.1
 
 ### Patch Changes
diff --git a/plugins/nomad/api-report.md b/plugins/nomad/api-report.md
index f000854374..c2d06b9892 100644
--- a/plugins/nomad/api-report.md
+++ b/plugins/nomad/api-report.md
@@ -7,13 +7,14 @@
 
 import { BackstagePlugin } from '@backstage/core-plugin-api';
 import { Entity } from '@backstage/catalog-model';
+import { JSX as JSX_2 } from 'react';
 import { RouteRef } from '@backstage/core-plugin-api';
 
 // @public
-export const EntityNomadAllocationListTable: () => JSX.Element;
+export const EntityNomadAllocationListTable: () => JSX_2.Element;
 
 // @public
-export const EntityNomadJobVersionListCard: () => JSX.Element | null;
+export const EntityNomadJobVersionListCard: () => JSX_2.Element | null;
 
 // @public (undocumented)
 export const isNomadAllocationsAvailable: (entity: Entity) => boolean;
diff --git a/plugins/nomad/catalog-info.yaml b/plugins/nomad/catalog-info.yaml
new file mode 100644
index 0000000000..d704846059
--- /dev/null
+++ b/plugins/nomad/catalog-info.yaml
@@ -0,0 +1,9 @@
+apiVersion: backstage.io/v1alpha1
+kind: Component
+metadata:
+  name: backstage-plugin-nomad
+  title: '@backstage/plugin-nomad'
+spec:
+  lifecycle: experimental
+  type: backstage-frontend-plugin
+  owner: maintainers
diff --git a/plugins/nomad/package.json b/plugins/nomad/package.json
index 283b6cdb9c..ddfb7d49da 100644
--- a/plugins/nomad/package.json
+++ b/plugins/nomad/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-nomad",
-  "version": "0.1.2-next.1",
+  "version": "0.1.5-next.2",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
@@ -18,6 +18,7 @@
     "url": "https://github.com/backstage/backstage",
     "directory": "plugins/nomad"
   },
+  "sideEffects": false,
   "scripts": {
     "start": "backstage-cli package start",
     "build": "backstage-cli package build",
@@ -37,6 +38,7 @@
     "@material-ui/core": "^4.9.13",
     "@material-ui/icons": "^4.9.1",
     "@material-ui/lab": "^4.0.0-alpha.60",
+    "@types/react": "^16.13.1 || ^17.0.0",
     "luxon": "^3.3.0",
     "react-use": "^17.2.4"
   },
@@ -53,7 +55,6 @@
     "@testing-library/jest-dom": "^5.10.1",
     "@testing-library/react": "^12.1.3",
     "@testing-library/user-event": "^14.0.0",
-    "@types/node": "*",
     "cross-fetch": "^3.1.5",
     "msw": "^1.0.0"
   },
diff --git a/plugins/octopus-deploy/CHANGELOG.md b/plugins/octopus-deploy/CHANGELOG.md
index b6a652e24d..e9b6f1b814 100644
--- a/plugins/octopus-deploy/CHANGELOG.md
+++ b/plugins/octopus-deploy/CHANGELOG.md
@@ -1,5 +1,59 @@
 # @backstage/plugin-octopus-deploy
 
+## 0.2.6-next.2
+
+### Patch Changes
+
+- 8cec7664e146: Removed `@types/node` dependency
+- Updated dependencies
+  - @backstage/core-components@0.13.5-next.2
+  - @backstage/core-plugin-api@1.6.0-next.2
+  - @backstage/plugin-catalog-react@1.8.4-next.2
+  - @backstage/catalog-model@1.4.2-next.1
+  - @backstage/theme@0.4.1
+
+## 0.2.6-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.8.4-next.1
+  - @backstage/core-components@0.13.5-next.1
+  - @backstage/catalog-model@1.4.2-next.0
+  - @backstage/core-plugin-api@1.6.0-next.1
+  - @backstage/theme@0.4.1
+
+## 0.2.5-next.0
+
+### Patch Changes
+
+- 482bb5c0bbf8: Moved `@types/react` to be a regular dependency
+- Updated dependencies
+  - @backstage/core-plugin-api@1.6.0-next.0
+  - @backstage/core-components@0.13.5-next.0
+  - @backstage/catalog-model@1.4.1
+  - @backstage/theme@0.4.1
+  - @backstage/plugin-catalog-react@1.8.3-next.0
+
+## 0.2.3
+
+### Patch Changes
+
+- 12a8c94eda8d: Add package repository and homepage metadata
+- Updated dependencies
+  - @backstage/core-components@0.13.4
+  - @backstage/plugin-catalog-react@1.8.1
+  - @backstage/core-plugin-api@1.5.3
+  - @backstage/catalog-model@1.4.1
+  - @backstage/theme@0.4.1
+
+## 0.2.3-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.8.1-next.1
+
 ## 0.2.3-next.1
 
 ### Patch Changes
diff --git a/plugins/octopus-deploy/api-report.md b/plugins/octopus-deploy/api-report.md
index 53c92403bd..713d99aa8f 100644
--- a/plugins/octopus-deploy/api-report.md
+++ b/plugins/octopus-deploy/api-report.md
@@ -10,11 +10,12 @@ import { BackstagePlugin } from '@backstage/core-plugin-api';
 import { DiscoveryApi } from '@backstage/core-plugin-api';
 import { Entity } from '@backstage/catalog-model';
 import { FetchApi } from '@backstage/core-plugin-api';
+import { JSX as JSX_2 } from 'react';
 
 // @public (undocumented)
 export const EntityOctopusDeployContent: (props: {
   defaultLimit?: number | undefined;
-}) => JSX.Element;
+}) => JSX_2.Element;
 
 // @public (undocumented)
 export const isOctopusDeployAvailable: (entity: Entity) => boolean;
diff --git a/plugins/octopus-deploy/catalog-info.yaml b/plugins/octopus-deploy/catalog-info.yaml
new file mode 100644
index 0000000000..390b91f6e3
--- /dev/null
+++ b/plugins/octopus-deploy/catalog-info.yaml
@@ -0,0 +1,9 @@
+apiVersion: backstage.io/v1alpha1
+kind: Component
+metadata:
+  name: backstage-plugin-octopus-deploy
+  title: '@backstage/plugin-octopus-deploy'
+spec:
+  lifecycle: experimental
+  type: backstage-frontend-plugin
+  owner: maintainers
diff --git a/plugins/octopus-deploy/package.json b/plugins/octopus-deploy/package.json
index 65010ae66f..d6b02b221b 100644
--- a/plugins/octopus-deploy/package.json
+++ b/plugins/octopus-deploy/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-octopus-deploy",
-  "version": "0.2.3-next.1",
+  "version": "0.2.6-next.2",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
@@ -18,6 +18,7 @@
     "url": "https://github.com/backstage/backstage",
     "directory": "plugins/octopus-deploy"
   },
+  "sideEffects": false,
   "scripts": {
     "start": "backstage-cli package start",
     "build": "backstage-cli package build",
@@ -36,6 +37,7 @@
     "@material-ui/core": "^4.9.13",
     "@material-ui/icons": "^4.9.1",
     "@material-ui/lab": "4.0.0-alpha.61",
+    "@types/react": "^16.13.1 || ^17.0.0",
     "react-use": "^17.2.4"
   },
   "peerDependencies": {
@@ -52,8 +54,6 @@
     "@testing-library/jest-dom": "^5.10.1",
     "@testing-library/react": "^12.1.3",
     "@testing-library/user-event": "^14.0.0",
-    "@types/node": "*",
-    "@types/react": "^16.13.1 || ^17.0.0",
     "msw": "^1.0.0"
   },
   "files": [
diff --git a/plugins/opencost/.eslintrc.js b/plugins/opencost/.eslintrc.js
new file mode 100644
index 0000000000..e2a53a6ad2
--- /dev/null
+++ b/plugins/opencost/.eslintrc.js
@@ -0,0 +1 @@
+module.exports = require('@backstage/cli/config/eslint-factory')(__dirname);
diff --git a/plugins/opencost/CHANGELOG.md b/plugins/opencost/CHANGELOG.md
new file mode 100644
index 0000000000..48cfe54ddc
--- /dev/null
+++ b/plugins/opencost/CHANGELOG.md
@@ -0,0 +1,33 @@
+# @backstage/plugin-opencost
+
+## 0.2.0-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.13.5-next.2
+  - @backstage/core-plugin-api@1.6.0-next.2
+  - @backstage/theme@0.4.1
+
+## 0.2.0-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.13.5-next.1
+  - @backstage/core-plugin-api@1.6.0-next.1
+  - @backstage/theme@0.4.1
+
+## 0.2.0-next.0
+
+### Minor Changes
+
+- 1380a689ab56: New OpenCost plugin provides an port of the latest OpenCost UI to Backstage with updated dependencies. The plugin's README covers installation and configuration
+
+### Patch Changes
+
+- 482bb5c0bbf8: Moved `@types/react` to be a regular dependency
+- Updated dependencies
+  - @backstage/core-plugin-api@1.6.0-next.0
+  - @backstage/core-components@0.13.5-next.0
+  - @backstage/theme@0.4.1
diff --git a/plugins/opencost/README.md b/plugins/opencost/README.md
new file mode 100644
index 0000000000..39c5e7ee2e
--- /dev/null
+++ b/plugins/opencost/README.md
@@ -0,0 +1,79 @@
+# OpenCost
+
+Welcome to the [OpenCost](https://opencost.io) plugin!
+
+Currently this is a port of the [OpenCost UI](https://github.com/opencost/opencost/tree/develop/ui), but we will continue to expand it to expose any relevant data or pre-configured views that may be preferred.
+
+All of the code was originally ported from https://github.com/opencost/opencost/blob/develop/ui/ which is under by the Apache v2 License and also managed by the CNCF.
+
+## Installation
+
+1.  Add the OpenCost dependency to the `packages/app/package.json`:
+    ```sh
+    # From your Backstage root directory
+    yarn add --cwd packages/app @backstage/plugin-opencost
+    ```
+2.  Add the `OpenCostPage` to your `packages/app/src/App.tsx`:
+
+    ```tsx
+    import { OpenCostPage } from '@backstage/plugin-opencost';
+    ```
+
+and
+
+    ```tsx
+    <FlatRoutes>
+      …
+      <Route path="/opencost" element={<OpenCostPage />} />
+    </FlatRoutes>
+    ```
+
+3.  Add link to OpenCost to your sidebar
+
+    ```typescript
+    // packages/app/src/components/Root/Root.tsx
+     import MoneyIcon from '@material-ui/icons/MonetizationOn';
+
+     ...
+
+     export const Root = ({ children }: PropsWithChildren<{}>) => (
+       <SidebarPage>
+         <Sidebar>
+           ...
+          <SidebarItem icon={MoneyIcon} to="opencost" text="OpenCost" />
+           ...
+         </Sidebar>
+       </SidebarPage>
+     );
+
+    ```
+
+## Plugin Configuration
+
+Since OpenCost doesn't have any authentication at this point, you just need to give API access to the plugin to access your data.
+
+If you haven't set up an ingress rule, you can port-forward the API with
+
+```
+kubectl -n opencost port-forward deployment/opencost 9003
+```
+
+Add the following to your `app-config.yaml`:
+
+```yaml
+opencost:
+  baseUrl: http://localhost:9003
+```
+
+## Ideas/Next Steps
+
+- More testing
+- Use the OpenCost mascot for the sidebar logo
+- Use the Backstage proxy to communicate with the OpenCost API if necessary for authentication
+- Convert AllocationReport.js to use the [Backstage Table](https://backstage.io/storybook/?path=/story/data-display-table--default-table)
+- Allow for user-provided default reports and/or disabling controls
+- Support multiple hard-coded reports
+- clean up deprecation warnings and upgrade to all the latest React components
+- Fork(?) to support `Kubecost`, which could provide Alerts and Recommendations, similar to the Cost Explorer plugin
+
+![Screenshot](screenshot.png)
diff --git a/plugins/opencost/api-report.md b/plugins/opencost/api-report.md
new file mode 100644
index 0000000000..079f394618
--- /dev/null
+++ b/plugins/opencost/api-report.md
@@ -0,0 +1,23 @@
+## API Report File for "@backstage/plugin-opencost"
+
+> Do not edit this file. It is a report generated by [API Extractor](https://api-extractor.com/).
+
+```ts
+/// <reference types="react" />
+
+import { BackstagePlugin } from '@backstage/core-plugin-api';
+import { JSX as JSX_2 } from 'react';
+import { RouteRef } from '@backstage/core-plugin-api';
+
+// @public (undocumented)
+export const OpenCostPage: () => JSX_2.Element;
+
+// @public (undocumented)
+export const openCostPlugin: BackstagePlugin<
+  {
+    root: RouteRef<undefined>;
+  },
+  {},
+  {}
+>;
+```
diff --git a/plugins/opencost/catalog-info.yaml b/plugins/opencost/catalog-info.yaml
new file mode 100644
index 0000000000..277562bb32
--- /dev/null
+++ b/plugins/opencost/catalog-info.yaml
@@ -0,0 +1,9 @@
+apiVersion: backstage.io/v1alpha1
+kind: Component
+metadata:
+  name: backstage-plugin-opencost
+  title: '@backstage/plugin-opencost'
+spec:
+  lifecycle: experimental
+  type: backstage-frontend-plugin
+  owner: maintainers
diff --git a/plugins/opencost/config.d.ts b/plugins/opencost/config.d.ts
new file mode 100644
index 0000000000..0070bec7b7
--- /dev/null
+++ b/plugins/opencost/config.d.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 interface Config {
+  /**
+   * Configurations for the OpenCost plugin
+   *
+   * @visibility frontend
+   */
+  opencost?: {
+    /**
+     * The base URL for the OpenCost API
+     * @visibility frontend
+     */
+    baseUrl: string;
+  };
+}
diff --git a/plugins/opencost/dev/index.tsx b/plugins/opencost/dev/index.tsx
new file mode 100644
index 0000000000..41b2bd5346
--- /dev/null
+++ b/plugins/opencost/dev/index.tsx
@@ -0,0 +1,27 @@
+/*
+ * 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 { createDevApp } from '@backstage/dev-utils';
+import { openCostPlugin, OpenCostPage } from '../src/plugin';
+
+createDevApp()
+  .registerPlugin(openCostPlugin)
+  .addPage({
+    element: <OpenCostPage />,
+    title: 'Root Page',
+    path: '/opencost',
+  })
+  .render();
diff --git a/plugins/opencost/package.json b/plugins/opencost/package.json
new file mode 100644
index 0000000000..6a6db959dc
--- /dev/null
+++ b/plugins/opencost/package.json
@@ -0,0 +1,62 @@
+{
+  "name": "@backstage/plugin-opencost",
+  "version": "0.2.0-next.2",
+  "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"
+  },
+  "backstage": {
+    "role": "frontend-plugin"
+  },
+  "sideEffects": false,
+  "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/core-components": "workspace:^",
+    "@backstage/core-plugin-api": "workspace:^",
+    "@backstage/theme": "workspace:^",
+    "@date-io/luxon": "1.x",
+    "@material-ui/core": "^4.9.13",
+    "@material-ui/icons": "^4.9.1",
+    "@material-ui/lab": "^4.0.0-alpha.60",
+    "@material-ui/pickers": "^3.3.10",
+    "@material-ui/styles": "^4.11.5",
+    "@types/react": "^16.13.1 || ^17.0.0",
+    "axios": "^1.4.0",
+    "date-fns": "^2.30.0",
+    "lodash": "^4.17.21",
+    "react-use": "^17.2.4",
+    "recharts": "^2.5.0"
+  },
+  "peerDependencies": {
+    "react": "^16.13.1 || ^17.0.0",
+    "react-router-dom": "*"
+  },
+  "devDependencies": {
+    "@backstage/cli": "workspace:^",
+    "@backstage/core-app-api": "workspace:^",
+    "@backstage/dev-utils": "workspace:^",
+    "@backstage/test-utils": "workspace:^",
+    "@testing-library/jest-dom": "^5.10.1",
+    "@testing-library/react": "^12.1.3",
+    "@testing-library/user-event": "^14.0.0",
+    "cross-fetch": "^3.1.5",
+    "msw": "^1.0.0"
+  },
+  "files": [
+    "dist",
+    "config.d.ts"
+  ],
+  "configSchema": "config.d.ts"
+}
diff --git a/plugins/opencost/screenshot.png b/plugins/opencost/screenshot.png
new file mode 100644
index 0000000000..432b525cb1
Binary files /dev/null and b/plugins/opencost/screenshot.png differ
diff --git a/plugins/opencost/src/components/AllocationChart/RangeChart.jsx b/plugins/opencost/src/components/AllocationChart/RangeChart.jsx
new file mode 100644
index 0000000000..b1ce5a34ee
--- /dev/null
+++ b/plugins/opencost/src/components/AllocationChart/RangeChart.jsx
@@ -0,0 +1,201 @@
+/*
+ * 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 {
+  BarChart,
+  Bar,
+  XAxis,
+  YAxis,
+  CartesianGrid,
+  Tooltip,
+  ResponsiveContainer,
+} from 'recharts';
+import { makeStyles } from '@material-ui/styles';
+import { reverse } from 'lodash';
+import { primary, greyscale, browns } from '../../constants/colors';
+import { toCurrency } from '../../util';
+
+const useStyles = makeStyles({
+  tooltip: {
+    borderRadius: 2,
+    background: 'rgba(255, 255, 255, 0.95)',
+    padding: 12,
+  },
+  tooltipLineItem: {
+    fontSize: '1rem',
+    margin: 0,
+    marginBottom: 4,
+    padding: 0,
+  },
+});
+
+function toBarLabels(allocationRange) {
+  const keyToFill = {};
+  let p = 0;
+  let g = 0;
+  let b = 0;
+
+  for (const { idle } of allocationRange) {
+    for (const allocation of idle) {
+      const key = allocation.name;
+      if (keyToFill[key] === undefined) {
+        // idle allocations are assigned grey
+        keyToFill[key] = greyscale[g];
+        g = (g + 1) % greyscale.length;
+      }
+    }
+  }
+
+  for (const { top } of allocationRange) {
+    for (const allocation of top) {
+      const key = allocation.name;
+      if (keyToFill[key] === undefined) {
+        if (key === '__unallocated__') {
+          // unallocated gets black (clean up)
+          keyToFill[key] = '#212121';
+        } else {
+          // non-idle allocations get the next available color
+          keyToFill[key] = primary[p];
+          p = (p + 1) % primary.length;
+        }
+      }
+    }
+  }
+
+  for (const { other } of allocationRange) {
+    for (const allocation of other) {
+      const key = allocation.name;
+      if (keyToFill[key] === undefined) {
+        // idle allocations are assigned grey
+        keyToFill[key] = browns[b];
+        b = (b + 1) % browns.length;
+      }
+    }
+  }
+
+  const labels = [];
+  for (const key in keyToFill) {
+    if (Object.hasOwn(keyToFill, key)) {
+      labels.push({
+        dataKey: key,
+        fill: keyToFill[key],
+      });
+    }
+  }
+
+  return reverse(labels);
+}
+
+function toBar(datum) {
+  const { top, other, idle } = datum;
+  const bar = {};
+
+  for (const key in top) {
+    if (Object.hasOwn(top, key)) {
+      const allocation = top[key];
+      const start = new Date(allocation.start);
+      bar.start = `${start.getUTCFullYear()}-${
+        start.getUTCMonth() + 1
+      }-${start.getUTCDate()}`;
+      bar[allocation.name] = allocation.totalCost;
+    }
+  }
+
+  for (const key in other) {
+    if (Object.hasOwn(other, key)) {
+      const allocation = other[key];
+      const start = new Date(allocation.start);
+      bar.start = `${start.getUTCFullYear()}-${
+        start.getUTCMonth() + 1
+      }-${start.getUTCDate()}`;
+      bar[allocation.name] = allocation.totalCost;
+    }
+  }
+
+  for (const key in idle) {
+    if (Object.hasOwn(idle, key)) {
+      const allocation = idle[key];
+      const start = new Date(allocation.start);
+      bar.start = `${start.getUTCFullYear()}-${
+        start.getUTCMonth() + 1
+      }-${start.getUTCDate()}`;
+      bar[allocation.name] = allocation.totalCost;
+    }
+  }
+
+  return bar;
+}
+
+const RangeChart = ({ data, currency, height }) => {
+  const classes = useStyles();
+
+  const barData = data.map(toBar);
+  const barLabels = toBarLabels(data);
+
+  const CustomTooltip = params => {
+    const { active, payload } = params;
+
+    if (!payload || payload.length === 0) {
+      return null;
+    }
+
+    const total = payload.reduce((sum, item) => sum + item.value, 0.0);
+    if (active) {
+      /* eslint react/forbid-elements: [0, { allow: ["warning"] }] */
+      return (
+        <div className={classes.tooltip}>
+          <p
+            className={classes.tooltipLineItem}
+            style={{ color: '#000000' }}
+          >{`Total: ${toCurrency(total, currency)}`}</p>
+          {reverse(payload).map((item, i) => (
+            <p
+              key={i}
+              className={classes.tooltipLineItem}
+              style={{ color: item.fill }}
+            >{`${item.name}: ${toCurrency(item.value, currency)}`}</p>
+          ))}
+        </div>
+      );
+    }
+
+    return null;
+  };
+
+  return (
+    <ResponsiveContainer width="100%" height={height}>
+      <BarChart
+        data={barData}
+        margin={{ top: 30, right: 30, left: 30, bottom: 12 }}
+      >
+        <CartesianGrid strokeDasharray="3 3" />
+        <XAxis dataKey="start" />
+        <YAxis />
+        <Tooltip content={<CustomTooltip />} />
+        {barLabels.map((barLabel, i) => (
+          <Bar
+            key={i}
+            dataKey={barLabel.dataKey}
+            stackId="a"
+            fill={barLabel.fill}
+          />
+        ))}
+      </BarChart>
+    </ResponsiveContainer>
+  );
+};
+
+export default RangeChart;
diff --git a/plugins/opencost/src/components/AllocationChart/SummaryChart.jsx b/plugins/opencost/src/components/AllocationChart/SummaryChart.jsx
new file mode 100644
index 0000000000..53c0842845
--- /dev/null
+++ b/plugins/opencost/src/components/AllocationChart/SummaryChart.jsx
@@ -0,0 +1,127 @@
+/*
+ * 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 { ResponsiveContainer, PieChart, Pie, Cell } from 'recharts';
+import { primary, greyscale, browns } from '../../constants/colors';
+import { toCurrency } from '../../util';
+
+function toPieData(top, other, idle) {
+  const slices = [];
+
+  for (const i in top) {
+    if (Object.hasOwn(top, i)) {
+      const allocation = top[i];
+      const fill =
+        allocation.name === '__unallocated__'
+          ? '#212121'
+          : primary[i % primary.length];
+
+      slices.push({
+        name: allocation.name,
+        value: allocation.totalCost,
+        fill: fill,
+      });
+    }
+  }
+
+  for (const i in other) {
+    if (Object.hasOwn(other, i)) {
+      const allocation = other[i];
+      const fill = browns[i % browns.length];
+      slices.push({
+        name: allocation.name,
+        value: allocation.totalCost,
+        fill: fill,
+      });
+    }
+  }
+
+  for (const i in idle) {
+    if (Object.hasOwn(idle, i)) {
+      const allocation = idle[i];
+      const fill = greyscale[i % greyscale.length];
+      slices.push({
+        name: allocation.name,
+        value: allocation.totalCost,
+        fill: fill,
+      });
+    }
+  }
+
+  return slices;
+}
+
+const SummaryChart = ({ top, other, idle, currency, height }) => {
+  const pieData = toPieData(top, other, idle);
+
+  const renderLabel = params => {
+    const { cx, cy, midAngle, outerRadius, percent, name, fill, value } =
+      params;
+
+    const RADIAN = Math.PI / 180;
+    const radius = outerRadius * 1.1;
+    let x = cx + radius * Math.cos(-midAngle * RADIAN);
+    x += x > cx ? 2 : -2;
+    const y = cy + radius * Math.sin(-midAngle * RADIAN);
+    // y -= Math.min(Math.abs(2 / Math.cos(-midAngle * RADIAN)), 8)
+
+    if (percent < 0.02) {
+      return undefined;
+    }
+
+    return (
+      <text
+        x={x}
+        y={y}
+        fill={fill}
+        textAnchor={x > cx ? 'start' : 'end'}
+        dominantBaseline="central"
+      >
+        {`${name}: ${toCurrency(value, currency)} (${(percent * 100).toFixed(
+          1,
+        )}%)`}
+      </text>
+    );
+  };
+
+  return (
+    <ResponsiveContainer width="100%" height={height}>
+      <PieChart>
+        <Pie
+          data={pieData}
+          dataKey="value"
+          nameKey="name"
+          label={renderLabel}
+          labelLine
+          // niko: if tooltips error, try disabling animation
+          // isAnimationActive={false}
+          animationDuration={400}
+          cy="90%"
+          outerRadius="140%"
+          innerRadius="60%"
+          startAngle={180}
+          endAngle={0}
+        >
+          {pieData.map((datum, i) => (
+            <Cell key={i} fill={datum.fill} />
+          ))}
+        </Pie>
+      </PieChart>
+    </ResponsiveContainer>
+  );
+};
+
+export default SummaryChart;
diff --git a/plugins/opencost/src/components/AllocationChart/index.jsx b/plugins/opencost/src/components/AllocationChart/index.jsx
new file mode 100644
index 0000000000..9fec3e296f
--- /dev/null
+++ b/plugins/opencost/src/components/AllocationChart/index.jsx
@@ -0,0 +1,108 @@
+/*
+ * 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 { isArray, filter, map, reduce, reverse, sortBy } from 'lodash';
+
+import Typography from '@material-ui/core/Typography';
+
+import RangeChart from './RangeChart';
+import SummaryChart from './SummaryChart';
+
+// TODO niko/etl
+/* eslint @typescript-eslint/no-shadow: ["error", { "allow": ["agg"] }]*/
+function agg(allocationSet, name) {
+  if (allocationSet.length === 0) {
+    return null;
+  }
+
+  return reduce(
+    allocationSet,
+    (agg, cur) => ({
+      name: agg.name,
+      aggregatedBy: cur.aggregatedBy,
+      properties: agg.properties,
+      start: cur.start,
+      end: cur.end,
+      cpuCost: agg.cpuCost + cur.cpuCost,
+      gpuCost: agg.gpuCost + cur.gpuCost,
+      ramCost: agg.ramCost + cur.ramCost,
+      pvCost: agg.pvCost + cur.pvCost,
+      totalCost: agg.totalCost + cur.totalCost,
+      count: agg.count + 1,
+    }),
+    {
+      name: name,
+      properties: null,
+      cpuCost: 0.0,
+      gpuCost: 0.0,
+      ramCost: 0.0,
+      pvCost: 0.0,
+      totalCost: 0.0,
+      count: 0,
+    },
+  );
+}
+
+function isIdle(allocation) {
+  return allocation.name.indexOf('__idle__') >= 0;
+}
+
+function top(n, by) {
+  return allocations => {
+    if (isArray(allocations[0])) {
+      return map(allocations, top(n, by));
+    }
+
+    const sorted = reverse(sortBy(allocations, by));
+    const active = filter(sorted, a => !isIdle(a));
+    const idle = filter(sorted, a => isIdle(a));
+    const topn = active.slice(0, n);
+    const other = [];
+    if (active.length > n) {
+      other.push(agg(active.slice(n), 'other'));
+    }
+
+    return {
+      top: topn,
+      other: other,
+      idle: idle,
+    };
+  };
+}
+
+const AllocationChart = ({ allocationRange, currency, n, height }) => {
+  if (allocationRange.length === 0) {
+    return <Typography variant="body2">No data</Typography>;
+  }
+
+  if (allocationRange.length === 1) {
+    const datum = top(n, alloc => alloc.totalCost)(allocationRange[0]);
+    return (
+      <SummaryChart
+        top={datum.top}
+        other={datum.other}
+        idle={datum.idle}
+        currency={currency}
+        height={height}
+      />
+    );
+  }
+
+  const data = top(n, alloc => alloc.totalCost)(allocationRange);
+  return <RangeChart data={data} currency={currency} height={height} />;
+};
+
+export default React.memo(AllocationChart);
diff --git a/plugins/opencost/src/components/AllocationReport.jsx b/plugins/opencost/src/components/AllocationReport.jsx
new file mode 100644
index 0000000000..52686a741c
--- /dev/null
+++ b/plugins/opencost/src/components/AllocationReport.jsx
@@ -0,0 +1,261 @@
+/* not changing the working code at this point */
+/* eslint no-nested-ternary: 0 */
+/* eslint react-hooks/rules-of-hooks: 0 */
+
+/*
+ * Copyright 2023 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import React, { useEffect, useState } from 'react';
+import { get, round } from 'lodash';
+import { makeStyles } from '@material-ui/styles';
+import Table from '@material-ui/core/Table';
+import TableBody from '@material-ui/core/TableBody';
+import TableCell from '@material-ui/core/TableCell';
+import TableContainer from '@material-ui/core/TableContainer';
+import TableHead from '@material-ui/core/TableHead';
+import TablePagination from '@material-ui/core/TablePagination';
+import TableRow from '@material-ui/core/TableRow';
+import TableSortLabel from '@material-ui/core/TableSortLabel';
+import Typography from '@material-ui/core/Typography';
+import AllocationChart from './AllocationChart';
+import { toCurrency } from '../util';
+
+const useStyles = makeStyles({
+  noResults: {
+    padding: 24,
+  },
+});
+
+function descendingComparator(a, b, orderBy) {
+  if (get(b, orderBy) < get(a, orderBy)) {
+    return -1;
+  }
+  if (get(b, orderBy) > get(a, orderBy)) {
+    return 1;
+  }
+  return 0;
+}
+
+function getComparator(order, orderBy) {
+  return order === 'desc'
+    ? (a, b) => descendingComparator(a, b, orderBy)
+    : (a, b) => -descendingComparator(a, b, orderBy);
+}
+
+function stableSort(array, comparator) {
+  const stabilizedThis = array.map((el, index) => [el, index]);
+  stabilizedThis.sort((a, b) => {
+    const order = comparator(a[0], b[0]);
+    if (order !== 0) return order;
+    return a[1] - b[1];
+  });
+  return stabilizedThis.map(el => el[0]);
+}
+
+const headCells = [
+  { id: 'name', numeric: false, label: 'Name', width: 'auto' },
+  { id: 'cpuCost', numeric: true, label: 'CPU', width: 100 },
+  { id: 'ramCost', numeric: true, label: 'RAM', width: 100 },
+  { id: 'pvCost', numeric: true, label: 'PV', width: 100 },
+  { id: 'totalEfficiency', numeric: true, label: 'Efficiency', width: 130 },
+  { id: 'totalCost', numeric: true, label: 'Total cost', width: 130 },
+];
+
+const AllocationReport = ({
+  allocationData,
+  cumulativeData,
+  totalData,
+  currency,
+}) => {
+  const classes = useStyles();
+
+  if (allocationData.length === 0) {
+    return (
+      <Typography variant="body2" className={classes.noResults}>
+        No results
+      </Typography>
+    );
+  }
+
+  const [order, setOrder] = React.useState('desc');
+  const [orderBy, setOrderBy] = React.useState('totalCost');
+  const [page, setPage] = useState(0);
+  const [rowsPerPage, setRowsPerPage] = useState(25);
+  const numData = cumulativeData.length;
+
+  useEffect(() => {
+    setPage(0);
+  }, [numData]);
+
+  const lastPage = Math.floor(numData / rowsPerPage);
+
+  const handleChangePage = (event, newPage) => setPage(newPage);
+
+  const handleChangeRowsPerPage = event => {
+    setRowsPerPage(parseInt(event.target.value, 10));
+    setPage(0);
+  };
+
+  const handleRequestSort = (event, property) => {
+    const isDesc = orderBy === property && order === 'desc';
+    setOrder(isDesc ? 'asc' : 'desc');
+    setOrderBy(property);
+  };
+
+  const createSortHandler = property => event =>
+    handleRequestSort(event, property);
+
+  const orderedRows = stableSort(cumulativeData, getComparator(order, orderBy));
+  const pageRows = orderedRows.slice(
+    page * rowsPerPage,
+    page * rowsPerPage + rowsPerPage,
+  );
+
+  return (
+    <div id="report">
+      <AllocationChart
+        allocationRange={allocationData}
+        currency={currency}
+        n={10}
+        height={300}
+      />
+      <TableContainer>
+        <Table>
+          <TableHead>
+            <TableRow>
+              {headCells.map(cell => (
+                <TableCell
+                  key={cell.id}
+                  colSpan={cell.colspan}
+                  align={cell.numeric ? 'right' : 'left'}
+                  sortDirection={orderBy === cell.id ? order : false}
+                  style={{ width: cell.width }}
+                >
+                  <TableSortLabel
+                    active={orderBy === cell.id}
+                    direction={orderBy === cell.id ? order : 'asc'}
+                    onClick={createSortHandler(cell.id)}
+                  >
+                    {cell.label}
+                  </TableSortLabel>
+                </TableCell>
+              ))}
+            </TableRow>
+          </TableHead>
+          <TableBody>
+            <TableRow>
+              {headCells.map(cell => {
+                return (
+                  <TableCell
+                    key={cell.id}
+                    colSpan={cell.colspan}
+                    align={cell.numeric ? 'right' : 'left'}
+                    style={{ fontWeight: 500 }}
+                  >
+                    {cell.numeric
+                      ? cell.label === 'Efficiency'
+                        ? totalData.totalEfficiency === 1.0 &&
+                          totalData.cpuReqCoreHrs === 0 &&
+                          totalData.ramReqByteHrs === 0
+                          ? 'Inf%'
+                          : `${round(totalData.totalEfficiency * 100, 1)}%`
+                        : toCurrency(totalData[cell.id], currency)
+                      : totalData[cell.id]}
+                  </TableCell>
+                );
+              })}
+            </TableRow>
+            {pageRows.map((row, key) => {
+              if (row.name === '__unmounted__') {
+                row.name = 'Unmounted PVs';
+              }
+
+              const isIdle = row.name.indexOf('__idle__') >= 0;
+              const isUnallocated = row.name.indexOf('__unallocated__') >= 0;
+              const isUnmounted = row.name.indexOf('Unmounted PVs') >= 0;
+
+              // Replace "efficiency" with Inf if there is usage w/o request
+              let efficiency = round(row.totalEfficiency * 100, 1);
+              if (
+                row.totalEfficiency === 1.0 &&
+                row.cpuReqCoreHrs === 0 &&
+                row.ramReqByteHrs === 0
+              ) {
+                efficiency = 'Inf';
+              }
+
+              // Do not allow drill-down for idle and unallocated rows
+              if (isIdle || isUnallocated || isUnmounted) {
+                return (
+                  <TableRow key={key}>
+                    <TableCell align="left">{row.name}</TableCell>
+                    <TableCell align="right">
+                      {toCurrency(row.cpuCost, currency)}
+                    </TableCell>
+                    <TableCell align="right">
+                      {toCurrency(row.ramCost, currency)}
+                    </TableCell>
+                    <TableCell align="right">
+                      {toCurrency(row.pvCost, currency)}
+                    </TableCell>
+                    {isIdle ? (
+                      <TableCell align="right">&mdash;</TableCell>
+                    ) : (
+                      <TableCell align="right">{efficiency}%</TableCell>
+                    )}
+                    <TableCell align="right">
+                      {toCurrency(row.totalCost, currency)}
+                    </TableCell>
+                  </TableRow>
+                );
+              }
+
+              return (
+                <TableRow key={key}>
+                  <TableCell align="left">{row.name}</TableCell>
+                  <TableCell align="right">
+                    {toCurrency(row.cpuCost, currency)}
+                  </TableCell>
+                  <TableCell align="right">
+                    {toCurrency(row.ramCost, currency)}
+                  </TableCell>
+                  <TableCell align="right">
+                    {toCurrency(row.pvCost, currency)}
+                  </TableCell>
+                  <TableCell align="right">{efficiency}%</TableCell>
+                  <TableCell align="right">
+                    {toCurrency(row.totalCost, currency)}
+                  </TableCell>
+                </TableRow>
+              );
+            })}
+          </TableBody>
+        </Table>
+      </TableContainer>
+      <TablePagination
+        component="div"
+        count={numData}
+        rowsPerPage={rowsPerPage}
+        rowsPerPageOptions={[10, 25, 50]}
+        page={Math.min(page, lastPage)}
+        onChangePage={handleChangePage}
+        onChangeRowsPerPage={handleChangeRowsPerPage}
+      />
+    </div>
+  );
+};
+
+export default React.memo(AllocationReport);
diff --git a/plugins/opencost/src/components/Controls/Download.jsx b/plugins/opencost/src/components/Controls/Download.jsx
new file mode 100644
index 0000000000..727188e5c1
--- /dev/null
+++ b/plugins/opencost/src/components/Controls/Download.jsx
@@ -0,0 +1,110 @@
+/*
+ * 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 { get, forEach, reverse, round, sortBy } from 'lodash';
+import ExportIcon from '@material-ui/icons/GetApp';
+import IconButton from '@material-ui/core/IconButton';
+import Tooltip from '@material-ui/core/Tooltip';
+
+const columns = [
+  {
+    head: 'Name',
+    prop: 'name',
+    currency: false,
+  },
+  {
+    head: 'CPU',
+    prop: 'cpuCost',
+    currency: true,
+  },
+  {
+    head: 'GPU',
+    prop: 'gpuCost',
+    currency: true,
+  },
+  {
+    head: 'RAM',
+    prop: 'ramCost',
+    currency: true,
+  },
+  {
+    head: 'PV',
+    prop: 'pvCost',
+    currency: true,
+  },
+  {
+    head: 'Network',
+    prop: 'networkCost',
+    currency: true,
+  },
+  {
+    head: 'Shared',
+    prop: 'sharedCost',
+    currency: true,
+  },
+  {
+    head: 'Total',
+    prop: 'totalCost',
+    currency: true,
+  },
+];
+
+const toCSVLine = datum => {
+  const cols = [];
+
+  forEach(columns, c => {
+    if (c.currency) {
+      cols.push(round(get(datum, c.prop, 0.0), 2));
+    } else {
+      cols.push(`"${get(datum, c.prop, '')}"`);
+    }
+  });
+
+  return cols.join(',');
+};
+
+const DownloadControl = ({ cumulativeData, title }) => {
+  // downloadReport downloads a CSV of the cumulative allocation data
+  function downloadReport() {
+    // Build CSV
+    const head = columns.map(c => c.head).join(',');
+    const body = reverse(sortBy(cumulativeData, 'totalCost'))
+      .map(toCSVLine)
+      .join('\r\n');
+    const csv = `${head}\r\n${body}`;
+
+    // Create download link
+    const a = document.createElement('a');
+    a.href = URL.createObjectURL(new Blob([csv], { type: 'text/csv' }));
+    const filename = title.toLocaleLowerCase('en-US').replace(/\s/gi, '-');
+    a.setAttribute('download', `${filename}-${Date.now()}.csv`);
+
+    // Click the link
+    document.body.appendChild(a);
+    a.click();
+    document.body.removeChild(a);
+  }
+
+  return (
+    <Tooltip title="Download CSV">
+      <IconButton onClick={downloadReport}>
+        <ExportIcon />
+      </IconButton>
+    </Tooltip>
+  );
+};
+
+export default React.memo(DownloadControl);
diff --git a/plugins/opencost/src/components/Controls/Edit.jsx b/plugins/opencost/src/components/Controls/Edit.jsx
new file mode 100644
index 0000000000..f02f8cc111
--- /dev/null
+++ b/plugins/opencost/src/components/Controls/Edit.jsx
@@ -0,0 +1,106 @@
+/*
+ * 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 { makeStyles } from '@material-ui/styles';
+import FormControl from '@material-ui/core/FormControl';
+import InputLabel from '@material-ui/core/InputLabel';
+import MenuItem from '@material-ui/core/MenuItem';
+import Select from '@material-ui/core/Select';
+
+import React from 'react';
+
+import SelectWindow from '../SelectWindow';
+
+const useStyles = makeStyles({
+  wrapper: {
+    display: 'inline-flex',
+  },
+  formControl: {
+    margin: 8,
+    minWidth: 120,
+  },
+});
+
+function EditControl({
+  windowOptions,
+  window,
+  setWindow,
+  aggregationOptions,
+  aggregateBy,
+  setAggregateBy,
+  accumulateOptions,
+  accumulate,
+  setAccumulate,
+  currencyOptions,
+  currency,
+  setCurrency,
+}) {
+  const classes = useStyles();
+  return (
+    <div className={classes.wrapper}>
+      <SelectWindow
+        windowOptions={windowOptions}
+        window={window}
+        setWindow={setWindow}
+      />
+      <FormControl className={classes.formControl}>
+        <InputLabel id="aggregation-select-label">Breakdown</InputLabel>
+        <Select
+          id="aggregation-select"
+          value={aggregateBy}
+          onChange={e => {
+            setAggregateBy(e.target.value);
+          }}
+        >
+          {aggregationOptions.map(opt => (
+            <MenuItem key={opt.value} value={opt.value}>
+              {opt.name}
+            </MenuItem>
+          ))}
+        </Select>
+      </FormControl>
+      <FormControl className={classes.formControl}>
+        <InputLabel id="accumulate-label">Resolution</InputLabel>
+        <Select
+          id="accumulate"
+          value={accumulate}
+          onChange={e => setAccumulate(e.target.value)}
+        >
+          {accumulateOptions.map(opt => (
+            <MenuItem key={opt.value} value={opt.value}>
+              {opt.name}
+            </MenuItem>
+          ))}
+        </Select>
+      </FormControl>
+      <FormControl className={classes.formControl}>
+        <InputLabel id="currency-label">Currency</InputLabel>
+        <Select
+          id="currency"
+          value={currency}
+          onChange={e => setCurrency(e.target.value)}
+        >
+          {currencyOptions?.map(currencyVal => (
+            <MenuItem key={currencyVal} value={currencyVal}>
+              {currencyVal}
+            </MenuItem>
+          ))}
+        </Select>
+      </FormControl>
+    </div>
+  );
+}
+
+export default React.memo(EditControl);
diff --git a/plugins/opencost/src/components/Controls/index.jsx b/plugins/opencost/src/components/Controls/index.jsx
new file mode 100644
index 0000000000..c63833a6ab
--- /dev/null
+++ b/plugins/opencost/src/components/Controls/index.jsx
@@ -0,0 +1,57 @@
+/*
+ * 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 DownloadControl from './Download';
+import EditControl from './Edit';
+
+const Controls = ({
+  windowOptions,
+  window,
+  setWindow,
+  aggregationOptions,
+  aggregateBy,
+  setAggregateBy,
+  accumulateOptions,
+  accumulate,
+  setAccumulate,
+  title,
+  cumulativeData,
+  currency,
+  currencyOptions,
+  setCurrency,
+}) => {
+  return (
+    <div>
+      <EditControl
+        windowOptions={windowOptions}
+        window={window}
+        setWindow={setWindow}
+        aggregationOptions={aggregationOptions}
+        aggregateBy={aggregateBy}
+        setAggregateBy={setAggregateBy}
+        accumulateOptions={accumulateOptions}
+        accumulate={accumulate}
+        setAccumulate={setAccumulate}
+        currency={currency}
+        currencyOptions={currencyOptions}
+        setCurrency={setCurrency}
+      />
+      <DownloadControl cumulativeData={cumulativeData} title={title} />
+    </div>
+  );
+};
+
+export default React.memo(Controls);
diff --git a/plugins/opencost/src/components/Details.js b/plugins/opencost/src/components/Details.js
new file mode 100644
index 0000000000..5245c9e9fa
--- /dev/null
+++ b/plugins/opencost/src/components/Details.js
@@ -0,0 +1,287 @@
+/*
+ * 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, { memo, useEffect, useState } from 'react';
+import { forEach, get, reverse, round, sortBy } from 'lodash';
+import CircularProgress from '@material-ui/core/CircularProgress';
+import ClusterIcon from '@material-ui/icons/GroupWork';
+import NodeIcon from '@material-ui/icons/Memory';
+import List from '@material-ui/core/List';
+import ListItem from '@material-ui/core/ListItem';
+import ListItemIcon from '@material-ui/core/ListItemIcon';
+import ListItemText from '@material-ui/core/ListItemText';
+import Table from '@material-ui/core/Table';
+import TableBody from '@material-ui/core/TableBody';
+import TableCell from '@material-ui/core/TableCell';
+import TableContainer from '@material-ui/core/TableContainer';
+import TableHead from '@material-ui/core/TableHead';
+import TableRow from '@material-ui/core/TableRow';
+import Warnings from './Warnings';
+import AllocationService from '../services/allocation';
+import { bytesToString, toCurrency } from '../util';
+
+const Details = ({
+  window,
+  namespace,
+  controllerKind,
+  controller,
+  pod,
+  currency,
+}) => {
+  const [cluster, setCluster] = useState('');
+  const [node, setNode] = useState('');
+
+  const [fetch, setFetch] = useState(true);
+  const [loading, setLoading] = useState(false);
+  const [errors, setErrors] = useState([]);
+  const [rows, setRows] = useState([]);
+
+  useEffect(() => {
+    if (fetch) {
+      setCluster('');
+      setNode('');
+      fetchData();
+    }
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [fetch]);
+
+  async function fetchData() {
+    setLoading(true);
+    setErrors([]);
+
+    try {
+      const filters = [];
+
+      if (cluster) {
+        filters.push({
+          property: 'cluster',
+          value: cluster,
+        });
+      }
+
+      if (node) {
+        filters.push({
+          property: 'node',
+          value: node,
+        });
+      }
+
+      if (namespace) {
+        filters.push({
+          property: 'namespace',
+          value: namespace,
+        });
+      }
+
+      if (controllerKind) {
+        filters.push({
+          property: 'controllerKind',
+          value: controllerKind,
+        });
+      }
+
+      if (controller) {
+        filters.push({
+          property: 'controller',
+          value: controller,
+        });
+      }
+
+      if (pod) {
+        filters.push({
+          property: 'pod',
+          value: pod,
+        });
+      }
+
+      const resp = await AllocationService.fetchAllocation(window, '', {
+        accumulate: true,
+      });
+
+      let data = [];
+      forEach(resp.data[0], datum => {
+        if (datum.name === '__idle__') {
+          return;
+        }
+
+        if (!cluster) {
+          setCluster(get(datum, 'properties.cluster', ''));
+        }
+
+        if (!node) {
+          setNode(get(datum, 'properties.node', ''));
+        }
+
+        // TODO can we get pod, container back in properties?
+        const names = datum.name.split('/');
+        datum.pod = names[names.length - 2];
+        datum.container = names[names.length - 1];
+
+        datum.hours = round(get(datum, 'minutes', 0.0) / 60.0, 2);
+
+        if (datum.hours > 0) {
+          datum.cpu = round(get(datum, 'cpuCoreHours', 0.0) / datum.hours, 2);
+          datum.cpuCostPerCoreHr = datum.cpuCost / (datum.cpu * datum.hours);
+          if (datum.cpu === 0) {
+            datum.cpuCostPerCoreHr = 0.0;
+          }
+
+          datum.ram = round(get(datum, 'ramByteHours', 0.0) / datum.hours, 2);
+          const ramGiB = datum.ram / 1024 / 1024 / 1024;
+          datum.ramCostPerGiBHr = datum.ramCost / (ramGiB * datum.hours);
+          if (ramGiB === 0) {
+            datum.ramCostPerGiBHr = 0.0;
+          }
+        } else {
+          datum.cpu = 0.0;
+          datum.cpuCostPerCoreHr = 0.0;
+          datum.ram = 0.0;
+          datum.ramCostPerGiBHr = 0.0;
+        }
+
+        data.push(datum);
+      });
+
+      data = reverse(sortBy(data, 'totalCost'));
+
+      setRows(data);
+    } catch (e) {
+      /* eslint no-console: ["error", { allow: ["warn"] }] */
+      console.warn(
+        `Error fetching details for (${controllerKind}, ${controller}):`,
+        e,
+      );
+      setErrors([
+        {
+          primary: 'Error fetching details',
+          secondary: `Tried fetching details for: ${namespace}, ${controllerKind}, ${controller}, ${pod}`,
+        },
+      ]);
+    }
+
+    setLoading(false);
+    setFetch(false);
+  }
+
+  if (loading) {
+    return (
+      <div style={{ display: 'flex', justifyContent: 'center' }}>
+        <div style={{ paddingTop: 100, paddingBottom: 100 }}>
+          <CircularProgress />
+        </div>
+      </div>
+    );
+  }
+
+  return (
+    <div>
+      {!loading && errors.length > 0 && (
+        <div style={{ marginBottom: 20 }}>
+          <Warnings warnings={errors} />
+        </div>
+      )}
+
+      <List>
+        {cluster && (
+          <ListItem>
+            <ListItemIcon>
+              <ClusterIcon />
+            </ListItemIcon>
+            <ListItemText primary={cluster} />
+          </ListItem>
+        )}
+        {node && (
+          <ListItem>
+            <ListItemIcon>
+              <NodeIcon />
+            </ListItemIcon>
+            <ListItemText primary={node} />
+          </ListItem>
+        )}
+      </List>
+      <TableContainer>
+        <Table>
+          <TableHead>
+            <TableRow>
+              <TableCell align="left" component="th" scope="row" width={200}>
+                Container
+              </TableCell>
+              <TableCell align="right" component="th" scope="row">
+                Hours
+              </TableCell>
+              <TableCell align="right" component="th" scope="row">
+                CPU
+              </TableCell>
+              <TableCell align="right" component="th" scope="row">
+                $/(CPU*Hr)
+              </TableCell>
+              <TableCell align="right" component="th" scope="row">
+                CPU cost
+              </TableCell>
+              <TableCell align="right" component="th" scope="row">
+                RAM
+              </TableCell>
+              <TableCell align="right" component="th" scope="row">
+                $/(GiB*Hr)
+              </TableCell>
+              <TableCell align="right" component="th" scope="row">
+                RAM cost
+              </TableCell>
+              <TableCell align="right" component="th" scope="row">
+                Total cost
+              </TableCell>
+            </TableRow>
+          </TableHead>
+          <TableBody>
+            {rows.map((row, i) => (
+              <TableRow key={i} hover>
+                <TableCell align="left" component="th" scope="row" width={200}>
+                  {row.container}
+                </TableCell>
+                <TableCell align="right" component="th" scope="row">
+                  {row.hours}
+                </TableCell>
+                <TableCell align="right" component="th" scope="row">
+                  {row.cpu}
+                </TableCell>
+                <TableCell align="right" component="th" scope="row">
+                  {toCurrency(row.cpuCostPerCoreHr, currency, 5)}
+                </TableCell>
+                <TableCell align="right" component="th" scope="row">
+                  {toCurrency(row.cpuCost, currency, 3)}
+                </TableCell>
+                <TableCell align="right" component="th" scope="row">
+                  {bytesToString(row.ram)}
+                </TableCell>
+                <TableCell align="right" component="th" scope="row">
+                  {toCurrency(row.ramCostPerGiBHr, currency, 5)}
+                </TableCell>
+                <TableCell align="right" component="th" scope="row">
+                  {toCurrency(row.ramCost, currency, 3)}
+                </TableCell>
+                <TableCell align="right" component="th" scope="row">
+                  {toCurrency(row.totalCost, currency, 3)}
+                </TableCell>
+              </TableRow>
+            ))}
+          </TableBody>
+        </Table>
+      </TableContainer>
+    </div>
+  );
+};
+
+export default memo(Details);
diff --git a/plugins/opencost/src/components/OpenCostPage/OpenCostPage.tsx b/plugins/opencost/src/components/OpenCostPage/OpenCostPage.tsx
new file mode 100644
index 0000000000..bd60fa0c35
--- /dev/null
+++ b/plugins/opencost/src/components/OpenCostPage/OpenCostPage.tsx
@@ -0,0 +1,44 @@
+/*
+ * 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 { Grid } from '@material-ui/core';
+import { Header, Page, Content } from '@backstage/core-components';
+import { OpenCostReport } from '../OpenCostReport';
+
+export const OpenCostPage = () => (
+  <Page themeId="tool">
+    <Header
+      title="OpenCost"
+      subtitle="Open source Kubernetes cloud cost monitoring"
+    >
+      <a href="https://opencost.io">
+        <img
+          width={68}
+          height={64}
+          src={require('../../images/pig.png')}
+          alt="OpenCost"
+        />
+      </a>
+    </Header>
+    <Content>
+      <Grid container spacing={3} direction="column">
+        <Grid item>
+          <OpenCostReport />
+        </Grid>
+      </Grid>
+    </Content>
+  </Page>
+);
diff --git a/plugins/opencost/src/components/OpenCostPage/index.ts b/plugins/opencost/src/components/OpenCostPage/index.ts
new file mode 100644
index 0000000000..f966c83a30
--- /dev/null
+++ b/plugins/opencost/src/components/OpenCostPage/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 { OpenCostPage } from './OpenCostPage';
diff --git a/plugins/opencost/src/components/OpenCostReport/OpenCostReport.tsx b/plugins/opencost/src/components/OpenCostReport/OpenCostReport.tsx
new file mode 100644
index 0000000000..12f64f3606
--- /dev/null
+++ b/plugins/opencost/src/components/OpenCostReport/OpenCostReport.tsx
@@ -0,0 +1,319 @@
+/*
+ * 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.
+ */
+// code ported from https://github.com/opencost/opencost/blob/develop/ui/src/Reports.js
+
+import React, { useEffect, useState } from 'react';
+import CircularProgress from '@material-ui/core/CircularProgress';
+import IconButton from '@material-ui/core/IconButton';
+import Paper from '@material-ui/core/Paper';
+import RefreshIcon from '@material-ui/icons/Refresh';
+import Typography from '@material-ui/core/Typography';
+import { useLocation, useNavigate } from 'react-router-dom';
+import { find, get, sortBy, toArray } from 'lodash';
+import { makeStyles } from '@material-ui/styles';
+import AllocationReport from '../AllocationReport';
+import AllocationService from '../../services/allocation';
+import Controls from '../Controls';
+import Page from '../Page';
+import Subtitle from '../Subtitle';
+import Warnings from '../Warnings';
+import {
+  checkCustomWindow,
+  cumulativeToTotals,
+  rangeToCumulative,
+  toVerboseTimeRange,
+} from '../../util';
+import { currencyCodes } from '../../constants/currencyCodes';
+import { useApi, configApiRef } from '@backstage/core-plugin-api';
+
+const windowOptions = [
+  { name: 'Today', value: 'today' },
+  { name: 'Yesterday', value: 'yesterday' },
+  { name: 'Week-to-date', value: 'week' },
+  { name: 'Month-to-date', value: 'month' },
+  { name: 'Last week', value: 'lastweek' },
+  { name: 'Last month', value: 'lastmonth' },
+  { name: 'Last 7 days', value: '6d' },
+  { name: 'Last 30 days', value: '29d' },
+  { name: 'Last 60 days', value: '59d' },
+  { name: 'Last 90 days', value: '89d' },
+];
+
+const aggregationOptions = [
+  { name: 'Cluster', value: 'cluster' },
+  { name: 'Node', value: 'node' },
+  { name: 'Namespace', value: 'namespace' },
+  { name: 'Controller kind', value: 'controllerKind' },
+  { name: 'Controller', value: 'controller' },
+  { name: 'Service', value: 'service' },
+  { name: 'Pod', value: 'pod' },
+  { name: 'Container', value: 'container' },
+];
+
+const accumulateOptions = [
+  { name: 'Entire window', value: true },
+  { name: 'Daily', value: false },
+];
+
+const useStyles = makeStyles({
+  reportHeader: {
+    display: 'flex',
+    flexFlow: 'row',
+    padding: 24,
+  },
+  titles: {
+    flexGrow: 1,
+  },
+});
+
+// generateTitle generates a string title from a report object
+// @ts-ignore: implicitly has an 'any' type
+function generateTitle({ window, aggregateBy, accumulate }) {
+  let windowName = get(find(windowOptions, { value: window }), 'name', '');
+  if (windowName === '') {
+    if (checkCustomWindow(window)) {
+      windowName = toVerboseTimeRange(window);
+    } else {
+      /* eslint no-console: ["error", { allow: ["warn"] }] */
+      console.warn(`unknown window: ${window}`);
+    }
+  }
+
+  const aggregationName = get(
+    find(aggregationOptions, { value: aggregateBy }),
+    'name',
+    '',
+  ).toLocaleLowerCase('en-US');
+  if (aggregationName === '') {
+    /* eslint no-console: ["error", { allow: ["warn"] }] */
+    console.warn(`unknown aggregation: ${aggregateBy}`);
+  }
+
+  let str = `${windowName} by ${aggregationName}`;
+
+  if (!accumulate) {
+    str = `${str} daily`;
+  }
+
+  return str;
+}
+
+export const OpenCostReport = () => {
+  const classes = useStyles();
+  // Allocation data state
+  const [allocationData, setAllocationData] = useState([]);
+  const [cumulativeData, setCumulativeData] = useState({});
+  const [totalData, setTotalData] = useState({});
+
+  // When allocation data changes, create a cumulative version of it
+  useEffect(() => {
+    // eslint-disable-next-line @typescript-eslint/no-use-before-define
+    const cumulative = rangeToCumulative(allocationData, aggregateBy);
+    setCumulativeData(toArray(cumulative));
+    setTotalData(cumulativeToTotals(cumulative));
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [allocationData]);
+
+  // Form state, which controls form elements, but not the report itself. On
+  // certain actions, the form state may flow into the report state.
+  const [window, setWindow] = useState(windowOptions[0].value);
+  const [aggregateBy, setAggregateBy] = useState(aggregationOptions[0].value);
+  const [accumulate, setAccumulate] = useState(accumulateOptions[0].value);
+  const [currency, setCurrency] = useState('USD');
+
+  // Report state, including current report and saved options
+  const [title, setTitle] = useState('Last 7 days by namespace daily');
+
+  // When parameters changes, fetch data. This should be the
+  // only mechanism used to fetch data. Also generate a sensible title from the paramters.
+  useEffect(() => {
+    // eslint-disable-next-line @typescript-eslint/no-use-before-define
+    setFetch(true);
+    setTitle(generateTitle({ window, aggregateBy, accumulate }));
+  }, [window, aggregateBy, accumulate]);
+
+  // page and settings state
+  const [init, setInit] = useState(false);
+  const [fetch, setFetch] = useState(false);
+  const [loading, setLoading] = useState(true);
+  const [errors, setErrors] = useState([]);
+
+  // Initialize once, then fetch report each time setFetch(true) is called
+  useEffect(() => {
+    if (!init) {
+      initialize();
+    }
+    if (init && fetch) {
+      fetchData();
+    }
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [init, fetch]);
+
+  // parse any context information from the URL
+  const routerLocation = useLocation();
+  const searchParams = new URLSearchParams(routerLocation.search);
+  const routerNavigate = useNavigate();
+  useEffect(() => {
+    setWindow(searchParams.get('window') || '6d');
+    setAggregateBy(searchParams.get('agg') || 'namespace');
+    setAccumulate(searchParams.get('acc') === 'true' || false);
+    setCurrency(searchParams.get('currency') || 'USD');
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [routerLocation]);
+
+  async function initialize() {
+    setInit(true);
+  }
+
+  const configApi = useApi(configApiRef);
+  const baseUrl = configApi.getConfig('opencost').getString('baseUrl');
+  /* eslint no-console: 0 */
+  console.log(`baseUrl:${baseUrl}`);
+
+  async function fetchData() {
+    setLoading(true);
+    setErrors([]);
+
+    try {
+      const resp = await AllocationService.fetchAllocation(
+        baseUrl,
+        window,
+        aggregateBy,
+        { accumulate },
+      );
+      if (resp.data && resp.data.length > 0) {
+        const allocationRange = resp.data;
+        for (const i in allocationRange) {
+          if (Object.hasOwn(allocationRange, i)) {
+            // update cluster aggregations to use clusterName/clusterId names
+            allocationRange[i] = sortBy(allocationRange[i], a => a.totalCost);
+          }
+        }
+        setAllocationData(allocationRange);
+      } else {
+        setAllocationData([]);
+      }
+    } catch (err) {
+      if (err.message.indexOf('404') === 0) {
+        setErrors([
+          // @ts-ignore: not assignable to type 'never'
+          {
+            primary: 'Failed to load report data',
+            secondary:
+              'Please update OpenCost to the latest version, then open an Issue on GitHub if problems persist.',
+          },
+        ]);
+      } else {
+        let secondary =
+          'Please open an OpenCost issue with a bug report if problems persist.';
+        if (err.message.length > 0) {
+          secondary = err.message;
+        }
+        setErrors([
+          // @ts-ignore: not assignable to type 'never'
+          {
+            primary: 'Failed to load report data',
+            secondary: secondary,
+          },
+        ]);
+      }
+      setAllocationData([]);
+    }
+
+    setLoading(false);
+    setFetch(false);
+  }
+  return (
+    <Page active="reports.html">
+      {!loading && errors.length > 0 && (
+        <div style={{ marginBottom: 20 }}>
+          <Warnings warnings={errors} />
+        </div>
+      )}
+      {init && (
+        <Paper id="report">
+          <div className={classes.reportHeader}>
+            <div className={classes.titles}>
+              <Typography variant="h5">{title}</Typography>
+              <Subtitle report={{ window, aggregateBy, accumulate }} />
+            </div>
+
+            <IconButton aria-label="refresh" onClick={() => setFetch(true)}>
+              <RefreshIcon />
+            </IconButton>
+
+            <Controls
+              windowOptions={windowOptions}
+              window={window}
+              // @ts-ignore: implicitly has an 'any' type
+              setWindow={win => {
+                searchParams.set('window', win);
+                routerNavigate({
+                  search: `?${searchParams.toString()}`,
+                });
+              }}
+              aggregationOptions={aggregationOptions}
+              aggregateBy={aggregateBy}
+              // @ts-ignore: implicitly has an 'any' type
+              setAggregateBy={agg => {
+                searchParams.set('agg', agg);
+                routerNavigate({
+                  search: `?${searchParams.toString()}`,
+                });
+              }}
+              accumulateOptions={accumulateOptions}
+              accumulate={accumulate}
+              // @ts-ignore: implicitly has an 'any' type
+              setAccumulate={acc => {
+                searchParams.set('acc', acc);
+                routerNavigate({
+                  search: `?${searchParams.toString()}`,
+                });
+              }}
+              title={title}
+              cumulativeData={cumulativeData}
+              currency={currency}
+              currencyOptions={currencyCodes}
+              // @ts-ignore: implicitly has an 'any' type
+              setCurrency={curr => {
+                searchParams.set('currency', curr);
+                routerNavigate({
+                  search: `?${searchParams.toString()}`,
+                });
+              }}
+            />
+          </div>
+
+          {loading && (
+            <div style={{ display: 'flex', justifyContent: 'center' }}>
+              <div style={{ paddingTop: 100, paddingBottom: 100 }}>
+                <CircularProgress />
+              </div>
+            </div>
+          )}
+          {!loading && (
+            <AllocationReport
+              allocationData={allocationData}
+              cumulativeData={cumulativeData}
+              totalData={totalData}
+              currency={currency}
+            />
+          )}
+        </Paper>
+      )}
+    </Page>
+  );
+};
diff --git a/plugins/opencost/src/components/OpenCostReport/index.ts b/plugins/opencost/src/components/OpenCostReport/index.ts
new file mode 100644
index 0000000000..aee85ea8db
--- /dev/null
+++ b/plugins/opencost/src/components/OpenCostReport/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 { OpenCostReport } from './OpenCostReport';
diff --git a/plugins/opencost/src/components/Page.jsx b/plugins/opencost/src/components/Page.jsx
new file mode 100644
index 0000000000..6346b6287b
--- /dev/null
+++ b/plugins/opencost/src/components/Page.jsx
@@ -0,0 +1,47 @@
+/*
+ * 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 { makeStyles } from '@material-ui/styles';
+import React from 'react';
+
+const useStyles = makeStyles({
+  wrapper: {
+    display: 'flex',
+    flexFlow: 'column',
+    flexGrow: 1,
+    margin: '20px 30px 0 30px',
+    minWidth: 800,
+  },
+  flexGrow: {
+    display: 'flex',
+    flexFlow: 'column',
+    flexGrow: 1,
+  },
+});
+
+const Page = props => {
+  const classes = useStyles();
+
+  return (
+    <div className={classes.flexGrow}>
+      <div className={classes.wrapper}>
+        <div className={classes.flexGrow}>{props.children}</div>
+      </div>
+    </div>
+  );
+};
+
+export default Page;
diff --git a/plugins/opencost/src/components/SelectWindow.jsx b/plugins/opencost/src/components/SelectWindow.jsx
new file mode 100644
index 0000000000..470770f35c
--- /dev/null
+++ b/plugins/opencost/src/components/SelectWindow.jsx
@@ -0,0 +1,213 @@
+/*
+ * 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, { useEffect, useState } from 'react';
+import { makeStyles } from '@material-ui/styles';
+import {
+  MuiPickersUtilsProvider,
+  KeyboardDatePicker,
+} from '@material-ui/pickers';
+import Button from '@material-ui/core/Button';
+import LuxonUtils from '@date-io/luxon';
+import FormControl from '@material-ui/core/FormControl';
+import Link from '@material-ui/core/Link';
+import Popover from '@material-ui/core/Popover';
+import TextField from '@material-ui/core/TextField';
+import Typography from '@material-ui/core/Typography';
+import { isValid } from 'date-fns';
+import { find, get } from 'lodash';
+
+const useStyles = makeStyles({
+  dateContainer: {
+    paddingLeft: 18,
+    paddingRight: 18,
+    paddingTop: 6,
+    paddingBottom: 18,
+    display: 'flex',
+    flexFlow: 'row',
+  },
+  dateContainerColumn: {
+    display: 'flex',
+    flexFlow: 'column',
+  },
+  formControl: {
+    margin: 8,
+    width: 120,
+  },
+});
+
+const SelectWindow = ({ windowOptions, window, setWindow }) => {
+  const classes = useStyles();
+  const [anchorEl, setAnchorEl] = useState(null);
+
+  const [startDate, setStartDate] = useState(null);
+  const [endDate, setEndDate] = useState(null);
+  const [intervalString, setIntervalString] = useState(null);
+
+  const handleClick = event => {
+    setAnchorEl(event.currentTarget);
+  };
+
+  const handleClose = () => {
+    setAnchorEl(null);
+  };
+
+  const handleStartDateChange = date => {
+    if (isValid(date.toJSDate())) {
+      setStartDate(date.startOf('day').toJSDate());
+    }
+  };
+
+  const handleEndDateChange = date => {
+    if (isValid(date.toJSDate())) {
+      setEndDate(date.endOf('day').toJSDate());
+    }
+  };
+
+  const handleSubmitPresetDates = dateString => {
+    setWindow(dateString);
+    setStartDate(null);
+    setEndDate(null);
+    handleClose();
+  };
+
+  const handleSubmitCustomDates = () => {
+    if (intervalString !== null) {
+      setWindow(intervalString);
+      handleClose();
+    }
+  };
+
+  useEffect(() => {
+    if (startDate !== null && endDate !== null) {
+      // Note: getTimezoneOffset() is calculated based on current system locale, NOT date object
+      const adjustedStartDate = new Date(
+        startDate - startDate.getTimezoneOffset() * 60000,
+      );
+      const adjustedEndDate = new Date(
+        endDate - endDate.getTimezoneOffset() * 60000,
+      );
+      setIntervalString(
+        `${adjustedStartDate.toISOString().split('.')[0]}Z` +
+          `,${adjustedEndDate.toISOString().split('.')[0]}Z`,
+      );
+    }
+  }, [startDate, endDate]);
+
+  const open = Boolean(anchorEl);
+  const id = open ? 'date-range-popover' : undefined;
+
+  return (
+    <>
+      <FormControl className={classes.formControl}>
+        <TextField
+          id="filled-read-only-input"
+          label="Date Range"
+          value={get(find(windowOptions, { value: window }), 'name', 'Custom')}
+          onClick={e => handleClick(e)}
+          inputProps={{
+            readOnly: true,
+            style: { cursor: 'pointer' },
+          }}
+        />
+      </FormControl>
+      <Popover
+        id={id}
+        open={open}
+        anchorEl={anchorEl}
+        onClose={handleClose}
+        anchorOrigin={{
+          vertical: 'bottom',
+          horizontal: 'left',
+        }}
+        transformOrigin={{
+          vertical: 'top',
+          horizontal: 'center',
+        }}
+      >
+        <div className={classes.dateContainer}>
+          <div className={classes.dateContainerColumn}>
+            <MuiPickersUtilsProvider utils={LuxonUtils}>
+              <KeyboardDatePicker
+                style={{ width: '144px' }}
+                autoOk
+                disableToolbar
+                variant="inline"
+                format="MM/dd/yyyy"
+                margin="normal"
+                id="date-picker-start"
+                label="Start Date"
+                value={startDate}
+                maxDate={new Date()}
+                maxDateMessage="Date should not be after today."
+                onChange={handleStartDateChange}
+                KeyboardButtonProps={{
+                  'aria-label': 'change date',
+                }}
+              />
+              <KeyboardDatePicker
+                style={{ width: '144px' }}
+                autoOk
+                disableToolbar
+                variant="inline"
+                format="MM/dd/yyyy"
+                margin="normal"
+                id="date-picker-end"
+                label="End Date"
+                value={endDate}
+                maxDate={new Date()}
+                maxDateMessage="Date should not be after today."
+                onChange={handleEndDateChange}
+                KeyboardButtonProps={{
+                  'aria-label': 'change date',
+                }}
+              />
+            </MuiPickersUtilsProvider>
+            <div>
+              <Button
+                style={{ marginTop: 16 }}
+                variant="contained"
+                color="default"
+                onClick={handleSubmitCustomDates}
+              >
+                Apply
+              </Button>
+            </div>
+          </div>
+          <div
+            className={classes.dateContainerColumn}
+            style={{ paddingTop: 12, marginLeft: 18 }}
+          >
+            {windowOptions.map(opt => (
+              <Typography key={opt.value}>
+                <Link
+                  style={{ cursor: 'pointer' }}
+                  key={opt.value}
+                  value={opt.value}
+                  onClick={() => handleSubmitPresetDates(opt.value)}
+                >
+                  {opt.name}
+                </Link>
+              </Typography>
+            ))}
+          </div>
+        </div>
+      </Popover>
+    </>
+  );
+};
+
+export default React.memo(SelectWindow);
diff --git a/plugins/opencost/src/components/Subtitle.jsx b/plugins/opencost/src/components/Subtitle.jsx
new file mode 100644
index 0000000000..63b3df61ff
--- /dev/null
+++ b/plugins/opencost/src/components/Subtitle.jsx
@@ -0,0 +1,59 @@
+/*
+ * 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 { makeStyles } from '@material-ui/styles';
+import { upperFirst } from 'lodash';
+import Breadcrumbs from '@material-ui/core/Breadcrumbs';
+import NavigateNextIcon from '@material-ui/icons/NavigateNext';
+import Typography from '@material-ui/core/Typography';
+import { toVerboseTimeRange } from '../util';
+
+const useStyles = makeStyles({
+  root: {
+    '& > * + *': {
+      marginTop: 2,
+    },
+  },
+  link: {
+    cursor: 'pointer',
+  },
+});
+
+const Subtitle = ({ report }) => {
+  const classes = useStyles();
+
+  const { aggregateBy, window } = report;
+
+  return (
+    <div className={classes.root}>
+      <Breadcrumbs
+        separator={<NavigateNextIcon fontSize="small" />}
+        aria-label="breadcrumb"
+      >
+        {aggregateBy && aggregateBy.length > 0 ? (
+          <Typography>
+            {toVerboseTimeRange(window)} by {upperFirst(aggregateBy)}
+          </Typography>
+        ) : (
+          <Typography>{toVerboseTimeRange(window)}</Typography>
+        )}
+      </Breadcrumbs>
+    </div>
+  );
+};
+
+export default React.memo(Subtitle);
diff --git a/plugins/opencost/src/components/Warnings.jsx b/plugins/opencost/src/components/Warnings.jsx
new file mode 100644
index 0000000000..ae1047ebc2
--- /dev/null
+++ b/plugins/opencost/src/components/Warnings.jsx
@@ -0,0 +1,53 @@
+/*
+ * 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 { makeStyles } from '@material-ui/styles';
+import List from '@material-ui/core/List';
+import ListItem from '@material-ui/core/ListItem';
+import ListItemIcon from '@material-ui/core/ListItemIcon';
+import ListItemText from '@material-ui/core/ListItemText';
+import Paper from '@material-ui/core/Paper';
+import WarningIcon from '@material-ui/icons/Warning';
+
+const useStyles = makeStyles({
+  root: {},
+});
+
+const Warnings = ({ warnings }) => {
+  const classes = useStyles();
+
+  if (!warnings || warnings.length === 0) {
+    return null;
+  }
+
+  return (
+    <Paper className={classes.root}>
+      <List>
+        {warnings.map((warn, i) => (
+          <ListItem key={i}>
+            <ListItemIcon>
+              <WarningIcon />
+            </ListItemIcon>
+            <ListItemText primary={warn.primary} secondary={warn.secondary} />
+          </ListItem>
+        ))}
+      </List>
+    </Paper>
+  );
+};
+
+export default Warnings;
diff --git a/plugins/opencost/src/constants/colors.js b/plugins/opencost/src/constants/colors.js
new file mode 100644
index 0000000000..8e0289541b
--- /dev/null
+++ b/plugins/opencost/src/constants/colors.js
@@ -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 blue from '@material-ui/core/colors/blue';
+import brown from '@material-ui/core/colors/brown';
+import cyan from '@material-ui/core/colors/cyan';
+import deepOrange from '@material-ui/core/colors/deepOrange';
+import deepPurple from '@material-ui/core/colors/deepPurple';
+import green from '@material-ui/core/colors/green';
+import grey from '@material-ui/core/colors/grey';
+import indigo from '@material-ui/core/colors/indigo';
+import orange from '@material-ui/core/colors/orange';
+import red from '@material-ui/core/colors/red';
+import teal from '@material-ui/core/colors/teal';
+import yellow from '@material-ui/core/colors/yellow';
+
+export const primary = [
+  blue[500],
+  red[500],
+  green[500],
+  yellow[500],
+  cyan[500],
+  orange[500],
+  teal[500],
+  indigo[500],
+  deepOrange[500],
+  deepPurple[500],
+];
+
+export const greyscale = [
+  grey[300],
+  grey[400],
+  grey[200],
+  grey[500],
+  grey[100],
+  grey[600],
+];
+
+export const browns = [brown[500]];
diff --git a/plugins/opencost/src/constants/currencyCodes.js b/plugins/opencost/src/constants/currencyCodes.js
new file mode 100644
index 0000000000..a325df54d0
--- /dev/null
+++ b/plugins/opencost/src/constants/currencyCodes.js
@@ -0,0 +1,196 @@
+/*
+ * 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 currencyCodes = [
+  'AED',
+  'AFN',
+  'ALL',
+  'AMD',
+  'ANG',
+  'AOA',
+  'ARS',
+  'AUD',
+  'AWG',
+  'AZN',
+  'BAM',
+  'BBD',
+  'BDT',
+  'BGN',
+  'BHD',
+  'BIF',
+  'BMD',
+  'BND',
+  'BOB',
+  'BOV',
+  'BRL',
+  'BSD',
+  'BTN',
+  'BWP',
+  'BYR',
+  'BZD',
+  'CAD',
+  'CDF',
+  'CHE',
+  'CHF',
+  'CHW',
+  'CLF',
+  'CLP',
+  'CNY',
+  'COP',
+  'COU',
+  'CRC',
+  'CUC',
+  'CUP',
+  'CVE',
+  'CZK',
+  'DJF',
+  'DKK',
+  'DOP',
+  'DZD',
+  'EGP',
+  'ERN',
+  'ETB',
+  'EUR',
+  'FJD',
+  'FKP',
+  'GBP',
+  'GEL',
+  'GHS',
+  'GIP',
+  'GMD',
+  'GNF',
+  'GTQ',
+  'GYD',
+  'HKD',
+  'HNL',
+  'HRK',
+  'HTG',
+  'HUF',
+  'IDR',
+  'ILS',
+  'INR',
+  'IQD',
+  'IRR',
+  'ISK',
+  'JMD',
+  'JOD',
+  'JPY',
+  'KES',
+  'KGS',
+  'KHR',
+  'KMF',
+  'KPW',
+  'KRW',
+  'KWD',
+  'KYD',
+  'KZT',
+  'LAK',
+  'LBP',
+  'LKR',
+  'LRD',
+  'LSL',
+  'LTL',
+  'LVL',
+  'LYD',
+  'MAD',
+  'MDL',
+  'MGA',
+  'MKD',
+  'MMK',
+  'MNT',
+  'MOP',
+  'MRO',
+  'MUR',
+  'MVR',
+  'MWK',
+  'MXN',
+  'MXV',
+  'MYR',
+  'MZN',
+  'NAD',
+  'NGN',
+  'NIO',
+  'NOK',
+  'NPR',
+  'NZD',
+  'OMR',
+  'PAB',
+  'PEN',
+  'PGK',
+  'PHP',
+  'PKR',
+  'PLN',
+  'PYG',
+  'QAR',
+  'RON',
+  'RSD',
+  'RUB',
+  'RWF',
+  'SAR',
+  'SBD',
+  'SCR',
+  'SDG',
+  'SEK',
+  'SGD',
+  'SHP',
+  'SLL',
+  'SOS',
+  'SRD',
+  'SSP',
+  'STD',
+  'SYP',
+  'SZL',
+  'THB',
+  'TJS',
+  'TMT',
+  'TND',
+  'TOP',
+  'TRY',
+  'TTD',
+  'TWD',
+  'TZS',
+  'UAH',
+  'UGX',
+  'USD',
+  'USN',
+  'USS',
+  'UYI',
+  'UYU',
+  'UZS',
+  'VEF',
+  'VND',
+  'VUV',
+  'WST',
+  'XAF',
+  'XAG',
+  'XAU',
+  'XBA',
+  'XBB',
+  'XBC',
+  'XBD',
+  'XCD',
+  'XDR',
+  'XFU',
+  'XOF',
+  'XPD',
+  'XPF',
+  'XPT',
+  'XTS',
+  'XXX',
+  'YER',
+  'ZAR',
+  'ZMW',
+];
diff --git a/plugins/opencost/src/images/pig.png b/plugins/opencost/src/images/pig.png
new file mode 100644
index 0000000000..5de5409e87
Binary files /dev/null and b/plugins/opencost/src/images/pig.png differ
diff --git a/plugins/opencost/src/index.ts b/plugins/opencost/src/index.ts
new file mode 100644
index 0000000000..30153e0c32
--- /dev/null
+++ b/plugins/opencost/src/index.ts
@@ -0,0 +1,23 @@
+/*
+ * 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.
+ */
+
+/**
+ * A Backstage plugin that integrates with OpenCost
+ *
+ * @packageDocumentation
+ */
+
+export { openCostPlugin, OpenCostPage } from './plugin';
diff --git a/plugins/opencost/src/plugin.test.ts b/plugins/opencost/src/plugin.test.ts
new file mode 100644
index 0000000000..6d6d20c603
--- /dev/null
+++ b/plugins/opencost/src/plugin.test.ts
@@ -0,0 +1,23 @@
+/*
+ * 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 { openCostPlugin } from './plugin';
+
+describe('opencost', () => {
+  it('should export plugin', () => {
+    expect(openCostPlugin).toBeDefined();
+  });
+});
diff --git a/plugins/opencost/src/plugin.ts b/plugins/opencost/src/plugin.ts
new file mode 100644
index 0000000000..2725cf3dde
--- /dev/null
+++ b/plugins/opencost/src/plugin.ts
@@ -0,0 +1,40 @@
+/*
+ * 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 {
+  createPlugin,
+  createRoutableExtension,
+} from '@backstage/core-plugin-api';
+
+import { rootRouteRef } from './routes';
+
+/** @public */
+export const openCostPlugin = createPlugin({
+  id: 'opencost',
+  routes: {
+    root: rootRouteRef,
+  },
+});
+
+/** @public */
+export const OpenCostPage = openCostPlugin.provide(
+  createRoutableExtension({
+    name: 'OpenCostPage',
+    component: () =>
+      import('./components/OpenCostPage').then(m => m.OpenCostPage),
+    mountPoint: rootRouteRef,
+  }),
+);
diff --git a/plugins/opencost/src/routes.ts b/plugins/opencost/src/routes.ts
new file mode 100644
index 0000000000..5f1f9e4527
--- /dev/null
+++ b/plugins/opencost/src/routes.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.
+ */
+
+import { createRouteRef } from '@backstage/core-plugin-api';
+
+export const rootRouteRef = createRouteRef({
+  id: 'opencost',
+});
diff --git a/plugins/opencost/src/services/allocation.js b/plugins/opencost/src/services/allocation.js
new file mode 100644
index 0000000000..e7fba8feae
--- /dev/null
+++ b/plugins/opencost/src/services/allocation.js
@@ -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 axios from 'axios';
+
+class AllocationService {
+  async fetchAllocation(baseUrl, win, aggregate, options) {
+    const { accumulate } = options;
+    const params = {
+      window: win,
+      aggregate: aggregate,
+      step: '1d',
+    };
+    if (typeof accumulate === 'boolean') {
+      params.accumulate = accumulate;
+    }
+
+    const result = await axios.get(`${baseUrl}/allocation/compute`, { params });
+
+    return result.data;
+  }
+}
+
+export default new AllocationService();
diff --git a/plugins/opencost/src/util.js b/plugins/opencost/src/util.js
new file mode 100644
index 0000000000..5854718a55
--- /dev/null
+++ b/plugins/opencost/src/util.js
@@ -0,0 +1,371 @@
+/*
+ * 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 { forEach, get, round } from 'lodash';
+
+// rangeToCumulative takes an AllocationSetRange (type: array[AllocationSet])
+// and accumulates the values into a single AllocationSet (type: object)
+export function rangeToCumulative(allocationSetRange, aggregateBy) {
+  if (allocationSetRange.length === 0) {
+    return null;
+  }
+
+  const result = {};
+
+  forEach(allocationSetRange, allocSet => {
+    forEach(allocSet, alloc => {
+      if (result[alloc.name] === undefined) {
+        const hrs = get(alloc, 'minutes', 0) / 60.0;
+
+        result[alloc.name] = {
+          name: alloc.name,
+          [aggregateBy]: alloc.name,
+          cpuCost: get(alloc, 'cpuCost', 0),
+          gpuCost: get(alloc, 'gpuCost', 0),
+          ramCost: get(alloc, 'ramCost', 0),
+          pvCost: get(alloc, 'pvCost', 0),
+          networkCost: get(alloc, 'networkCost', 0),
+          sharedCost: get(alloc, 'sharedCost', 0),
+          externalCost: get(alloc, 'externalCost', 0),
+          totalCost: get(alloc, 'totalCost', 0),
+          cpuUseCoreHrs: get(alloc, 'cpuCoreUsageAverage', 0) * hrs,
+          cpuReqCoreHrs: get(alloc, 'cpuCoreRequestAverage', 0) * hrs,
+          ramUseByteHrs: get(alloc, 'ramByteUsageAverage', 0) * hrs,
+          ramReqByteHrs: get(alloc, 'ramByteRequestAverage', 0) * hrs,
+          cpuEfficiency: get(alloc, 'cpuEfficiency', 0),
+          ramEfficiency: get(alloc, 'ramEfficiency', 0),
+          totalEfficiency: get(alloc, 'totalEfficiency', 0),
+        };
+      } else {
+        const hrs = get(alloc, 'minutes', 0) / 60.0;
+
+        result[alloc.name].cpuCost += get(alloc, 'cpuCost', 0);
+        result[alloc.name].gpuCost += get(alloc, 'gpuCost', 0);
+        result[alloc.name].ramCost += get(alloc, 'ramCost', 0);
+        result[alloc.name].pvCost += get(alloc, 'pvCost', 0);
+        result[alloc.name].networkCost += get(alloc, 'networkCost', 0);
+        result[alloc.name].sharedCost += get(alloc, 'sharedCost', 0);
+        result[alloc.name].externalCost += get(alloc, 'externalCost', 0);
+        result[alloc.name].totalCost += get(alloc, 'totalCost', 0);
+        result[alloc.name].cpuUseCoreHrs +=
+          get(alloc, 'cpuCoreUsageAverage', 0) * hrs;
+        result[alloc.name].cpuReqCoreHrs +=
+          get(alloc, 'cpuCoreRequestAverage', 0) * hrs;
+        result[alloc.name].ramUseByteHrs +=
+          get(alloc, 'ramByteUsageAverage', 0) * hrs;
+        result[alloc.name].ramReqByteHrs +=
+          get(alloc, 'ramByteRequestAverage', 0) * hrs;
+      }
+    });
+  });
+
+  // If the range is of length > 1 (i.e. it is not just a single set) then
+  // compute efficiency for each result after accumulating.
+  if (allocationSetRange.length > 1) {
+    forEach(result, (alloc, name) => {
+      // If we can't compute total efficiency, it defaults to 0.0
+      let totalEfficiency = 0.0;
+
+      // CPU efficiency is defined as (usage/request). If request == 0.0 but
+      // usage > 0, then efficiency gets set to 1.0.
+      let cpuEfficiency = 0.0;
+      if (alloc.cpuReqCoreHrs > 0) {
+        cpuEfficiency = alloc.cpuUseCoreHrs / alloc.cpuReqCoreHrs;
+      } else if (alloc.cpuUseCoreHrs > 0) {
+        cpuEfficiency = 1.0;
+      }
+
+      // RAM efficiency is defined as (usage/request). If request == 0.0 but
+      // usage > 0, then efficiency gets set to 1.0.
+      let ramEfficiency = 0.0;
+      if (alloc.ramReqByteHrs > 0) {
+        ramEfficiency = alloc.ramUseByteHrs / alloc.ramReqByteHrs;
+      } else if (alloc.ramUseByteHrs > 0) {
+        ramEfficiency = 1.0;
+      }
+
+      // Compute efficiency as the cost-weighted average of CPU and RAM
+      // efficiency
+      if (alloc.cpuCost + alloc.ramCost > 0.0) {
+        totalEfficiency =
+          (alloc.cpuCost * cpuEfficiency + alloc.ramCost * ramEfficiency) /
+          (alloc.cpuCost + alloc.ramCost);
+      }
+
+      result[name].cpuEfficiency = cpuEfficiency;
+      result[name].ramEfficiency = ramEfficiency;
+      result[name].totalEfficiency = totalEfficiency;
+    });
+  }
+
+  return result;
+}
+
+// cumulativeToTotals adds each entry in the given AllocationSet (type: object)
+// and returns a single Allocation (type: object) representing the totals
+export function cumulativeToTotals(allocationSet) {
+  const totals = {
+    name: 'Totals',
+    cpuCost: 0,
+    gpuCost: 0,
+    ramCost: 0,
+    pvCost: 0,
+    networkCost: 0,
+    sharedCost: 0,
+    externalCost: 0,
+    totalCost: 0,
+    cpuEfficiency: 0,
+    ramEfficiency: 0,
+    totalEfficiency: 0,
+  };
+
+  // Use these for computing efficiency. As such, idle will not factor into
+  // these numbers, including CPU and RAM cost.
+  let cpuReqCoreHrs = 0;
+  let cpuUseCoreHrs = 0;
+  let ramReqByteHrs = 0;
+  let ramUseByteHrs = 0;
+  let cpuCost = 0;
+  let ramCost = 0;
+
+  forEach(allocationSet, (alloc, name) => {
+    // Accumulate efficiency-related fields
+    if (name !== '__idle__') {
+      cpuReqCoreHrs += get(alloc, 'cpuReqCoreHrs', 0.0);
+      cpuUseCoreHrs += get(alloc, 'cpuUseCoreHrs', 0.0);
+      ramReqByteHrs += get(alloc, 'ramReqByteHrs', 0.0);
+      ramUseByteHrs += get(alloc, 'ramUseByteHrs', 0.0);
+      cpuCost += get(alloc, 'cpuCost', 0.0);
+      ramCost += get(alloc, 'ramCost', 0.0);
+    }
+
+    // Sum cumulative fields
+    totals.cpuCost += get(alloc, 'cpuCost', 0);
+    totals.gpuCost += get(alloc, 'gpuCost', 0);
+    totals.ramCost += get(alloc, 'ramCost', 0);
+    totals.pvCost += get(alloc, 'pvCost', 0);
+    totals.networkCost += get(alloc, 'networkCost', 0);
+    totals.sharedCost += get(alloc, 'sharedCost', 0);
+    totals.externalCost += get(alloc, 'externalCost', 0);
+    totals.totalCost += get(alloc, 'totalCost', 0);
+  });
+
+  // Compute efficiency
+  if (cpuReqCoreHrs > 0) {
+    totals.cpuEfficiency = cpuUseCoreHrs / cpuReqCoreHrs;
+  } else if (cpuUseCoreHrs > 0) {
+    totals.cpuEfficiency = 1.0;
+  }
+
+  if (ramReqByteHrs > 0) {
+    totals.ramEfficiency = ramUseByteHrs / ramReqByteHrs;
+  } else if (ramUseByteHrs > 0) {
+    totals.ramEfficiency = 1.0;
+  }
+
+  if (cpuCost + ramCost > 0) {
+    totals.totalEfficiency =
+      (cpuCost * totals.cpuEfficiency + ramCost * totals.ramEfficiency) /
+      (cpuCost + ramCost);
+  }
+
+  totals.cpuReqCoreHrs = cpuReqCoreHrs;
+  totals.cpuUseCoreHrs = cpuUseCoreHrs;
+  totals.ramReqByteHrs = ramReqByteHrs;
+  totals.ramUseByteHrs = ramUseByteHrs;
+
+  return totals;
+}
+
+export function toVerboseTimeRange(window) {
+  const months = [
+    'January',
+    'February',
+    'March',
+    'April',
+    'May',
+    'June',
+    'July',
+    'August',
+    'September',
+    'October',
+    'November',
+    'December',
+  ];
+
+  const start = new Date();
+  start.setUTCHours(0, 0, 0, 0);
+
+  const end = new Date();
+  end.setUTCHours(0, 0, 0, 0);
+
+  switch (window) {
+    case 'today':
+      return `${start.getUTCDate()} ${
+        months[start.getUTCMonth()]
+      } ${start.getUTCFullYear()}`;
+    case 'yesterday':
+      start.setUTCDate(start.getUTCDate() - 1);
+      return `${start.getUTCDate()} ${
+        months[start.getUTCMonth()]
+      } ${start.getUTCFullYear()}`;
+    case 'week':
+      start.setUTCDate(start.getUTCDate() - start.getUTCDay());
+      return `${start.getUTCDate()} ${
+        months[start.getUTCMonth()]
+      } ${start.getUTCFullYear()} until now`;
+    case 'month':
+      start.setUTCDate(1);
+      return `${start.getUTCDate()} ${
+        months[start.getUTCMonth()]
+      } ${start.getUTCFullYear()} until now`;
+    case 'lastweek':
+      start.setUTCDate(start.getUTCDate() - (start.getUTCDay() + 7));
+      end.setUTCDate(end.getUTCDate() - (end.getUTCDay() + 1));
+      return `${start.getUTCDate()} ${
+        months[start.getUTCMonth()]
+      } ${start.getUTCFullYear()} through ${end.getUTCDate()} ${
+        months[end.getUTCMonth()]
+      } ${end.getUTCFullYear()}`;
+    case 'lastmonth':
+      end.setUTCDate(1);
+      end.setUTCDate(end.getUTCDate() - 1);
+      start.setUTCDate(1);
+      start.setUTCDate(start.getUTCDate() - 1);
+      start.setUTCDate(1);
+      return `${start.getUTCDate()} ${
+        months[start.getUTCMonth()]
+      } ${start.getUTCFullYear()} through ${end.getUTCDate()} ${
+        months[end.getUTCMonth()]
+      } ${end.getUTCFullYear()}`;
+    case '6d':
+      start.setUTCDate(start.getUTCDate() - 6);
+      return `${start.getUTCDate()} ${
+        months[start.getUTCMonth()]
+      } ${start.getUTCFullYear()} through now`;
+    case '29d':
+      start.setUTCDate(start.getUTCDate() - 29);
+      return `${start.getUTCDate()} ${
+        months[start.getUTCMonth()]
+      } ${start.getUTCFullYear()} through now`;
+    case '59d':
+      start.setUTCDate(start.getUTCDate() - 59);
+      return `${start.getUTCDate()} ${
+        months[start.getUTCMonth()]
+      } ${start.getUTCFullYear()} through now`;
+    case '89d':
+      start.setUTCDate(start.getUTCDate() - 89);
+      return `${start.getUTCDate()} ${
+        months[start.getUTCMonth()]
+      } ${start.getUTCFullYear()} through now`;
+    // no default
+  }
+
+  const splitDates = window.split(',');
+  if (checkCustomWindow(window) && splitDates.length > 1) {
+    const s = splitDates[0].split(/\D+/).slice(0, 3);
+    const e = splitDates[1].split(/\D+/).slice(0, 3);
+    if (s.length === 3 && e.length === 3) {
+      start.setUTCFullYear(s[0], s[1] - 1, s[2]);
+      end.setUTCFullYear(e[0], e[1] - 1, e[2]);
+      if (start === end) {
+        return `${start.getUTCDate()} ${
+          months[start.getUTCMonth()]
+        } ${start.getUTCFullYear()}`;
+      }
+      return `${start.getUTCDate()} ${
+        months[start.getUTCMonth()]
+      } ${start.getUTCFullYear()} through ${end.getUTCDate()} ${
+        months[end.getUTCMonth()]
+      } ${end.getUTCFullYear()}`;
+    }
+  }
+  return '';
+}
+
+export function bytesToString(bytes) {
+  const ei = Math.pow(1024, 6);
+  if (bytes >= ei) {
+    return `${round(bytes / ei, 1)} EiB`;
+  }
+  const pi = Math.pow(1024, 5);
+  if (bytes >= pi) {
+    return `${round(bytes / pi, 1)} PiB`;
+  }
+  const ti = Math.pow(1024, 4);
+  if (bytes >= ti) {
+    return `${round(bytes / ti, 1)} TiB`;
+  }
+  const gi = Math.pow(1024, 3);
+  if (bytes >= gi) {
+    return `${round(bytes / gi, 1)} GiB`;
+  }
+  const mi = Math.pow(1024, 2);
+  if (bytes >= mi) {
+    return `${round(bytes / mi, 1)} MiB`;
+  }
+  const ki = Math.pow(1024, 1);
+  if (bytes >= ki) {
+    return `${round(bytes / ki, 1)} KiB`;
+  }
+
+  return `${round(bytes, 1)} B`;
+}
+
+const currencyLocale = 'en-US';
+
+export function toCurrency(amount, currency, precision) {
+  if (typeof amount !== 'number') {
+    Console.warn(
+      `Tried to convert "${amount}" to currency, but it is not a number`,
+    );
+    return '';
+  }
+
+  let ctype = currency;
+
+  if (currency === undefined || currency === '') {
+    ctype = 'USD';
+  }
+
+  const opts = {
+    style: 'currency',
+    currency: ctype,
+  };
+
+  if (typeof precision === 'number') {
+    opts.minimumFractionDigits = precision;
+    opts.maximumFractionDigits = precision;
+  }
+
+  return amount.toLocaleString(currencyLocale, opts);
+}
+
+export function checkCustomWindow(window) {
+  // Example ISO interval string: 2020-12-02T00:00:00Z,2020-12-03T23:59:59Z
+  const customDateRegex =
+    /\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}Z,\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}Z/;
+  return customDateRegex.test(window);
+}
+
+export default {
+  rangeToCumulative,
+  cumulativeToTotals,
+  toVerboseTimeRange,
+  bytesToString,
+  toCurrency,
+  checkCustomWindow,
+};
diff --git a/plugins/org-react/CHANGELOG.md b/plugins/org-react/CHANGELOG.md
index eeac469210..578601033d 100644
--- a/plugins/org-react/CHANGELOG.md
+++ b/plugins/org-react/CHANGELOG.md
@@ -1,5 +1,63 @@
 # @backstage/plugin-org-react
 
+## 0.1.13-next.2
+
+### Patch Changes
+
+- 8cec7664e146: Removed `@types/node` dependency
+- Updated dependencies
+  - @backstage/core-components@0.13.5-next.2
+  - @backstage/core-plugin-api@1.6.0-next.2
+  - @backstage/plugin-catalog-react@1.8.4-next.2
+  - @backstage/catalog-model@1.4.2-next.1
+  - @backstage/catalog-client@1.4.4-next.1
+  - @backstage/theme@0.4.1
+
+## 0.1.13-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.8.4-next.1
+  - @backstage/core-components@0.13.5-next.1
+  - @backstage/catalog-model@1.4.2-next.0
+  - @backstage/core-plugin-api@1.6.0-next.1
+  - @backstage/catalog-client@1.4.4-next.0
+  - @backstage/theme@0.4.1
+
+## 0.1.12-next.0
+
+### Patch Changes
+
+- 482bb5c0bbf8: Moved `@types/react` to be a regular dependency
+- Updated dependencies
+  - @backstage/core-plugin-api@1.6.0-next.0
+  - @backstage/core-components@0.13.5-next.0
+  - @backstage/catalog-client@1.4.3
+  - @backstage/catalog-model@1.4.1
+  - @backstage/theme@0.4.1
+  - @backstage/plugin-catalog-react@1.8.3-next.0
+
+## 0.1.10
+
+### Patch Changes
+
+- 12a8c94eda8d: Add package repository and homepage metadata
+- Updated dependencies
+  - @backstage/core-components@0.13.4
+  - @backstage/plugin-catalog-react@1.8.1
+  - @backstage/core-plugin-api@1.5.3
+  - @backstage/catalog-client@1.4.3
+  - @backstage/catalog-model@1.4.1
+  - @backstage/theme@0.4.1
+
+## 0.1.10-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.8.1-next.1
+
 ## 0.1.10-next.1
 
 ### Patch Changes
diff --git a/plugins/org-react/api-report.md b/plugins/org-react/api-report.md
index 48bd090f64..5cfe5ca90a 100644
--- a/plugins/org-react/api-report.md
+++ b/plugins/org-react/api-report.md
@@ -3,12 +3,13 @@
 > Do not edit this file. It is a report generated by [API Extractor](https://api-extractor.com/).
 
 ```ts
-/// <reference types="react" />
-
 import { GroupEntity } from '@backstage/catalog-model';
+import { default as React_2 } from 'react';
 
 // @public (undocumented)
-export const GroupListPicker: (props: GroupListPickerProps) => JSX.Element;
+export const GroupListPicker: (
+  props: GroupListPickerProps,
+) => React_2.JSX.Element;
 
 // @public
 export type GroupListPickerProps = {
diff --git a/plugins/org-react/catalog-info.yaml b/plugins/org-react/catalog-info.yaml
new file mode 100644
index 0000000000..e020b5103e
--- /dev/null
+++ b/plugins/org-react/catalog-info.yaml
@@ -0,0 +1,9 @@
+apiVersion: backstage.io/v1alpha1
+kind: Component
+metadata:
+  name: backstage-plugin-org-react
+  title: '@backstage/plugin-org-react'
+spec:
+  lifecycle: experimental
+  type: backstage-web-library
+  owner: maintainers
diff --git a/plugins/org-react/package.json b/plugins/org-react/package.json
index 176722ad03..d1644698ce 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.10-next.1",
+  "version": "0.1.13-next.2",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
@@ -21,6 +21,7 @@
   "keywords": [
     "backstage"
   ],
+  "sideEffects": false,
   "scripts": {
     "start": "backstage-cli package start",
     "build": "backstage-cli package build",
@@ -40,6 +41,7 @@
     "@material-ui/core": "^4.12.2",
     "@material-ui/icons": "^4.9.1",
     "@material-ui/lab": "4.0.0-alpha.61",
+    "@types/react": "^16.13.1 || ^17.0.0",
     "react-use": "^17.2.4"
   },
   "peerDependencies": {
@@ -56,8 +58,6 @@
     "@testing-library/jest-dom": "^5.10.1",
     "@testing-library/react": "^12.1.3",
     "@testing-library/user-event": "^14.0.0",
-    "@types/node": "*",
-    "@types/react": "^16.13.1 || ^17.0.0",
     "msw": "^1.0.0"
   },
   "files": [
diff --git a/plugins/org/CHANGELOG.md b/plugins/org/CHANGELOG.md
index 4e98307d04..4f9654b88c 100644
--- a/plugins/org/CHANGELOG.md
+++ b/plugins/org/CHANGELOG.md
@@ -1,5 +1,62 @@
 # @backstage/plugin-org
 
+## 0.6.14-next.2
+
+### Patch Changes
+
+- dd9329caea1c: Entity relations toggle should by default be aggregated for User entities
+- 8cec7664e146: Removed `@types/node` dependency
+- Updated dependencies
+  - @backstage/core-components@0.13.5-next.2
+  - @backstage/core-plugin-api@1.6.0-next.2
+  - @backstage/plugin-catalog-react@1.8.4-next.2
+  - @backstage/catalog-model@1.4.2-next.1
+  - @backstage/theme@0.4.1
+
+## 0.6.14-next.1
+
+### Patch Changes
+
+- 43a2137bb829: Ensure direct relations are shown for User entities while keeping support for aggregating closest parent group ownership
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.8.4-next.1
+  - @backstage/core-components@0.13.5-next.1
+  - @backstage/catalog-model@1.4.2-next.0
+  - @backstage/core-plugin-api@1.6.0-next.1
+  - @backstage/theme@0.4.1
+
+## 0.6.13-next.0
+
+### Patch Changes
+
+- 482bb5c0bbf8: Moved `@types/react` to be a regular dependency
+- Updated dependencies
+  - @backstage/core-plugin-api@1.6.0-next.0
+  - @backstage/core-components@0.13.5-next.0
+  - @backstage/catalog-model@1.4.1
+  - @backstage/theme@0.4.1
+  - @backstage/plugin-catalog-react@1.8.3-next.0
+
+## 0.6.11
+
+### Patch Changes
+
+- 50331203e2a2: Fixed bug in MembersListCard component where the url for the members was static which was breaking the component when catalog route was changed
+- 12a8c94eda8d: Add package repository and homepage metadata
+- Updated dependencies
+  - @backstage/core-components@0.13.4
+  - @backstage/plugin-catalog-react@1.8.1
+  - @backstage/core-plugin-api@1.5.3
+  - @backstage/catalog-model@1.4.1
+  - @backstage/theme@0.4.1
+
+## 0.6.11-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.8.1-next.1
+
 ## 0.6.11-next.1
 
 ### Patch Changes
diff --git a/plugins/org/api-report.md b/plugins/org/api-report.md
index 7f21bfbb6b..d85df7125c 100644
--- a/plugins/org/api-report.md
+++ b/plugins/org/api-report.md
@@ -9,47 +9,52 @@ import { BackstagePlugin } from '@backstage/core-plugin-api';
 import { ExternalRouteRef } from '@backstage/core-plugin-api';
 import { IconComponent } from '@backstage/core-plugin-api';
 import { InfoCardVariants } from '@backstage/core-components';
+import { JSX as JSX_2 } from 'react';
+import { default as React_2 } from 'react';
 
 // @public (undocumented)
 export const EntityGroupProfileCard: (props: {
   variant?: InfoCardVariants | undefined;
   showLinks?: boolean | undefined;
-}) => JSX.Element;
+}) => JSX_2.Element;
 
 // @public (undocumented)
 export const EntityMembersListCard: (props: {
   memberDisplayTitle?: string | undefined;
   pageSize?: number | undefined;
   showAggregateMembersToggle?: boolean | undefined;
-}) => JSX.Element;
+}) => JSX_2.Element;
 
 // @public (undocumented)
 export const EntityOwnershipCard: (props: {
   variant?: InfoCardVariants | undefined;
   entityFilterKind?: string[] | undefined;
   hideRelationsToggle?: boolean | undefined;
-  relationsType?: string | undefined;
+  relationsType?: EntityRelationAggregation | undefined;
   entityLimit?: number | undefined;
-}) => JSX.Element;
+}) => JSX_2.Element;
+
+// @public (undocumented)
+export type EntityRelationAggregation = 'direct' | 'aggregated';
 
 // @public (undocumented)
 export const EntityUserProfileCard: (props: {
   variant?: InfoCardVariants | undefined;
   showLinks?: boolean | undefined;
-}) => JSX.Element;
+}) => JSX_2.Element;
 
 // @public (undocumented)
 export const GroupProfileCard: (props: {
   variant?: InfoCardVariants;
   showLinks?: boolean;
-}) => JSX.Element;
+}) => React_2.JSX.Element;
 
 // @public (undocumented)
 export const MembersListCard: (props: {
   memberDisplayTitle?: string;
   pageSize?: number;
   showAggregateMembersToggle?: boolean;
-}) => JSX.Element;
+}) => React_2.JSX.Element;
 
 // @public
 export const MyGroupsSidebarItem: (props: {
@@ -57,7 +62,7 @@ export const MyGroupsSidebarItem: (props: {
   pluralTitle: string;
   icon: IconComponent;
   filter?: Record<string, string | symbol | (string | symbol)[]>;
-}) => JSX.Element | null;
+}) => React_2.JSX.Element | null;
 
 // @public (undocumented)
 const orgPlugin: BackstagePlugin<
@@ -75,13 +80,13 @@ export const OwnershipCard: (props: {
   variant?: InfoCardVariants;
   entityFilterKind?: string[];
   hideRelationsToggle?: boolean;
-  relationsType?: string;
+  relationsType?: EntityRelationAggregation;
   entityLimit?: number;
-}) => JSX.Element;
+}) => React_2.JSX.Element;
 
 // @public (undocumented)
 export const UserProfileCard: (props: {
   variant?: InfoCardVariants;
   showLinks?: boolean;
-}) => JSX.Element;
+}) => React_2.JSX.Element;
 ```
diff --git a/plugins/org/catalog-info.yaml b/plugins/org/catalog-info.yaml
new file mode 100644
index 0000000000..defa276143
--- /dev/null
+++ b/plugins/org/catalog-info.yaml
@@ -0,0 +1,10 @@
+apiVersion: backstage.io/v1alpha1
+kind: Component
+metadata:
+  name: backstage-plugin-org
+  title: '@backstage/plugin-org'
+  description: A Backstage plugin that helps you create entity pages for your organization
+spec:
+  lifecycle: experimental
+  type: backstage-frontend-plugin
+  owner: maintainers
diff --git a/plugins/org/package.json b/plugins/org/package.json
index 81d6495d08..6d340c9147 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.11-next.1",
+  "version": "0.6.14-next.2",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
@@ -19,6 +19,7 @@
     "url": "https://github.com/backstage/backstage",
     "directory": "plugins/org"
   },
+  "sideEffects": false,
   "scripts": {
     "build": "backstage-cli package build",
     "start": "backstage-cli package start",
@@ -37,6 +38,7 @@
     "@material-ui/core": "^4.12.2",
     "@material-ui/icons": "^4.9.1",
     "@material-ui/lab": "4.0.0-alpha.61",
+    "@types/react": "^16.13.1 || ^17.0.0",
     "p-limit": "^3.1.0",
     "pluralize": "^8.0.0",
     "qs": "^6.10.1",
@@ -59,9 +61,8 @@
     "@testing-library/dom": "^8.0.0",
     "@testing-library/jest-dom": "^5.10.1",
     "@testing-library/react": "^12.1.3",
+    "@testing-library/react-hooks": "^8.0.1",
     "@testing-library/user-event": "^14.0.0",
-    "@types/node": "^16.11.26",
-    "@types/react": "^16.13.1 || ^17.0.0",
     "msw": "^1.0.0"
   },
   "files": [
diff --git a/plugins/org/src/components/Cards/Group/MembersList/MembersListCard.test.tsx b/plugins/org/src/components/Cards/Group/MembersList/MembersListCard.test.tsx
index 47e954eb17..f5a2d50cb5 100644
--- a/plugins/org/src/components/Cards/Group/MembersList/MembersListCard.test.tsx
+++ b/plugins/org/src/components/Cards/Group/MembersList/MembersListCard.test.tsx
@@ -19,6 +19,7 @@ import {
   CatalogApi,
   catalogApiRef,
   EntityProvider,
+  entityRouteRef,
   StarredEntitiesApi,
   starredEntitiesApiRef,
 } from '@backstage/plugin-catalog-react';
@@ -124,6 +125,11 @@ describe('MemberTab Test', () => {
           </EntityProvider>
           ,
         </TestApiProvider>,
+        {
+          mountedRoutes: {
+            '/catalog/:namespace/:kind/:name': entityRouteRef,
+          },
+        },
       ),
     );
 
@@ -152,6 +158,11 @@ describe('MemberTab Test', () => {
             <MembersListCard memberDisplayTitle="Testers" />
           </EntityProvider>
         </TestApiProvider>,
+        {
+          mountedRoutes: {
+            '/catalog/:namespace/:kind/:name': entityRouteRef,
+          },
+        },
       ),
     );
 
@@ -176,12 +187,15 @@ describe('MemberTab Test', () => {
             </EntityLayout>
           </EntityProvider>
         </TestApiProvider>,
+        {
+          mountedRoutes: {
+            '/catalog/:namespace/:kind/:name': entityRouteRef,
+          },
+        },
       );
-
       const toggleSwitch = screen.queryByRole('checkbox');
       expect(toggleSwitch).toBeNull();
     });
-
     it('Shows the aggregate members toggle if the showAggregateMembersToggle prop is true', async () => {
       await renderInTestApp(
         <TestApiProvider
@@ -199,11 +213,14 @@ describe('MemberTab Test', () => {
             </EntityLayout>
           </EntityProvider>
         </TestApiProvider>,
+        {
+          mountedRoutes: {
+            '/catalog/:namespace/:kind/:name': entityRouteRef,
+          },
+        },
       );
-
       expect(screen.queryByRole('checkbox')).toBeInTheDocument();
     });
-
     it('Shows only direct members if the showAggregateMembersToggle prop is undefined', async () => {
       await renderInTestApp(
         <TestApiProvider
@@ -221,12 +238,15 @@ describe('MemberTab Test', () => {
             </EntityLayout>
           </EntityProvider>
         </TestApiProvider>,
+        {
+          mountedRoutes: {
+            '/catalog/:namespace/:kind/:name': entityRouteRef,
+          },
+        },
       );
-
       const displayedMemberNames = screen.queryAllByTestId('user-link');
       const duplicatedUserText = screen.getByText('Duplicated User');
       const groupAUserOneText = screen.getByText('Group A User One');
-
       expect(displayedMemberNames).toHaveLength(2);
       expect(duplicatedUserText).toBeInTheDocument();
       expect(groupAUserOneText).toBeInTheDocument();
@@ -234,7 +254,6 @@ describe('MemberTab Test', () => {
         duplicatedUserText.compareDocumentPosition(groupAUserOneText),
       ).toBe(Node.DOCUMENT_POSITION_FOLLOWING);
     });
-
     it('Shows only direct members if the aggregate members switch is turned off', async () => {
       await renderInTestApp(
         <TestApiProvider
@@ -252,12 +271,15 @@ describe('MemberTab Test', () => {
             </EntityLayout>
           </EntityProvider>
         </TestApiProvider>,
+        {
+          mountedRoutes: {
+            '/catalog/:namespace/:kind/:name': entityRouteRef,
+          },
+        },
       );
-
       const displayedMemberNames = screen.queryAllByTestId('user-link');
       const duplicatedUserText = screen.getByText('Duplicated User');
       const groupAUserOneText = screen.getByText('Group A User One');
-
       expect(displayedMemberNames).toHaveLength(2);
       expect(duplicatedUserText).toBeInTheDocument();
       expect(groupAUserOneText).toBeInTheDocument();
@@ -265,7 +287,6 @@ describe('MemberTab Test', () => {
         duplicatedUserText.compareDocumentPosition(groupAUserOneText),
       ).toBe(Node.DOCUMENT_POSITION_FOLLOWING);
     });
-
     it('Shows all descendant members of the group when the aggregate users switch is turned on, showing duplicated members only once', async () => {
       await renderInTestApp(
         <TestApiProvider
@@ -283,26 +304,26 @@ describe('MemberTab Test', () => {
             </EntityLayout>
           </EntityProvider>
         </TestApiProvider>,
+        {
+          mountedRoutes: {
+            '/catalog/:namespace/:kind/:name': entityRouteRef,
+          },
+        },
       );
-
       // Click the toggle switch
       await userEvent.click(screen.getByRole('checkbox'));
-
       const displayedMemberNames = screen.queryAllByTestId('user-link');
       const duplicatedUserText = screen.getByText('Duplicated User');
       const groupAUserOneText = screen.getByText('Group A User One');
       const groupBUserOneText = screen.getByText('Group B User One');
       const groupDUserOneText = screen.getByText('Group D User One');
       const groupEUserOneText = screen.getByText('Group E User One');
-
       expect(displayedMemberNames).toHaveLength(5);
-
       expect(duplicatedUserText).toBeInTheDocument();
       expect(groupAUserOneText).toBeInTheDocument();
       expect(groupBUserOneText).toBeInTheDocument();
       expect(groupDUserOneText).toBeInTheDocument();
       expect(groupEUserOneText).toBeInTheDocument();
-
       expect(
         duplicatedUserText.compareDocumentPosition(groupAUserOneText),
       ).toBe(Node.DOCUMENT_POSITION_FOLLOWING);
diff --git a/plugins/org/src/components/Cards/Group/MembersList/MembersListCard.tsx b/plugins/org/src/components/Cards/Group/MembersList/MembersListCard.tsx
index 0a5386ea20..3716af5522 100644
--- a/plugins/org/src/components/Cards/Group/MembersList/MembersListCard.tsx
+++ b/plugins/org/src/components/Cards/Group/MembersList/MembersListCard.tsx
@@ -20,11 +20,7 @@ import {
   UserEntity,
   stringifyEntityRef,
 } from '@backstage/catalog-model';
-import {
-  catalogApiRef,
-  entityRouteParams,
-  useEntity,
-} from '@backstage/plugin-catalog-react';
+import { catalogApiRef, useEntity } from '@backstage/plugin-catalog-react';
 import {
   Box,
   createStyles,
@@ -36,7 +32,6 @@ import {
 } from '@material-ui/core';
 import Pagination from '@material-ui/lab/Pagination';
 import React, { useState } from 'react';
-import { generatePath } from 'react-router-dom';
 import useAsync from 'react-use/lib/useAsync';
 
 import {
@@ -52,6 +47,7 @@ import {
   getAllDesendantMembersForGroupEntity,
   removeDuplicateEntitiesFrom,
 } from '../../../../helpers/helpers';
+import { EntityRefLink } from '@backstage/plugin-catalog-react';
 
 const useStyles = makeStyles((theme: Theme) =>
   createStyles({
@@ -102,15 +98,11 @@ const MemberComponent = (props: { member: UserEntity }) => {
             textAlign="center"
           >
             <Typography variant="h6">
-              <Link
+              <EntityRefLink
                 data-testid="user-link"
-                to={generatePath(
-                  `/catalog/:namespace/user/${metaName}`,
-                  entityRouteParams(props.member),
-                )}
-              >
-                <OverflowTooltip text={displayName} />
-              </Link>
+                entityRef={props.member}
+                title={displayName}
+              />
             </Typography>
             {profile?.email && (
               <Link to={`mailto:${profile.email}`}>
diff --git a/plugins/org/src/components/Cards/OwnershipCard/ComponentsGrid.tsx b/plugins/org/src/components/Cards/OwnershipCard/ComponentsGrid.tsx
index 8dab5c4290..2725991d0d 100644
--- a/plugins/org/src/components/Cards/OwnershipCard/ComponentsGrid.tsx
+++ b/plugins/org/src/components/Cards/OwnershipCard/ComponentsGrid.tsx
@@ -34,6 +34,7 @@ import React from 'react';
 import pluralize from 'pluralize';
 import { catalogIndexRouteRef } from '../../../routes';
 import { useGetEntities } from './useGetEntities';
+import { EntityRelationAggregation } from './types';
 
 const useStyles = makeStyles((theme: BackstageTheme) =>
   createStyles({
@@ -109,13 +110,11 @@ const EntityCountTile = ({
 export const ComponentsGrid = ({
   entity,
   relationsType,
-  isGroup,
   entityFilterKind,
   entityLimit = 6,
 }: {
   entity: Entity;
-  relationsType: string;
-  isGroup: boolean;
+  relationsType: EntityRelationAggregation;
   entityFilterKind?: string[];
   entityLimit?: number;
 }) => {
@@ -123,7 +122,6 @@ export const ComponentsGrid = ({
   const { componentsWithCounters, loading, error } = useGetEntities(
     entity,
     relationsType,
-    isGroup,
     entityFilterKind,
     entityLimit,
   );
diff --git a/plugins/org/src/components/Cards/OwnershipCard/OwnershipCard.test.tsx b/plugins/org/src/components/Cards/OwnershipCard/OwnershipCard.test.tsx
index 30b7dee2de..72a912e16e 100644
--- a/plugins/org/src/components/Cards/OwnershipCard/OwnershipCard.test.tsx
+++ b/plugins/org/src/components/Cards/OwnershipCard/OwnershipCard.test.tsx
@@ -152,6 +152,27 @@ describe('OwnershipCard', () => {
     ],
   };
 
+  const userEntity: UserEntity = {
+    apiVersion: 'backstage.io/v1alpha1',
+    kind: 'User',
+    metadata: {
+      name: 'the-user',
+    },
+    spec: {
+      memberOf: ['my-team'],
+    },
+    relations: [
+      {
+        type: 'memberOf',
+        targetRef: 'group:default/my-team',
+      },
+      {
+        type: 'memberOf',
+        targetRef: 'group:custom/some-team',
+      },
+    ],
+  };
+
   it('displays entity counts', async () => {
     const catalogApi: jest.Mocked<CatalogApi> = {
       getEntities: jest.fn(),
@@ -263,33 +284,14 @@ describe('OwnershipCard', () => {
       },
     );
 
-    expect(getByText('OPENAPI').closest('a')).toHaveAttribute(
-      'href',
-      '/create/?filters%5Bkind%5D=api&filters%5Btype%5D=openapi&filters%5Bowners%5D=my-team&filters%5Buser%5D=all',
-    );
+    const href = getByText('OPENAPI').closest('a')?.href ?? '';
+    // This env does not support URLSearchParams
+    const queryParams = decodeURIComponent(href);
+
+    expect(queryParams).toContain('filters[owners]=my-team');
   });
 
   it('links to the catalog with the user and groups filters from an user profile', async () => {
-    const userEntity: UserEntity = {
-      apiVersion: 'backstage.io/v1alpha1',
-      kind: 'User',
-      metadata: {
-        name: 'the-user',
-      },
-      spec: {
-        memberOf: ['my-team'],
-      },
-      relations: [
-        {
-          type: 'memberOf',
-          targetRef: 'group:default/my-team',
-        },
-        {
-          type: 'memberOf',
-          targetRef: 'group:custom/some-team',
-        },
-      ],
-    };
     const catalogApi: jest.Mocked<CatalogApi> = {
       getEntities: jest.fn(),
     } as any;
@@ -299,7 +301,7 @@ describe('OwnershipCard', () => {
     const { getByText } = await renderInTestApp(
       <TestApiProvider apis={[[catalogApiRef, catalogApi]]}>
         <EntityProvider entity={userEntity}>
-          <OwnershipCard />
+          <OwnershipCard relationsType="aggregated" />
         </EntityProvider>
       </TestApiProvider>,
       {
@@ -309,9 +311,11 @@ describe('OwnershipCard', () => {
       },
     );
 
-    expect(getByText('OPENAPI').closest('a')).toHaveAttribute(
-      'href',
-      '/create/?filters%5Bkind%5D=api&filters%5Btype%5D=openapi&filters%5Bowners%5D=user%3Athe-user&filters%5Bowners%5D=my-team&filters%5Bowners%5D=custom%2Fsome-team&filters%5Buser%5D=all',
+    const href = getByText('OPENAPI').closest('a')?.href ?? '';
+    // This env does not support URLSearchParams
+    const queryParams = decodeURIComponent(href);
+    expect(queryParams).toMatch(
+      /filters\[owners\]=custom\/some\-team.*filters\[owners\]=user:the-user/,
     );
   });
 
@@ -383,5 +387,74 @@ describe('OwnershipCard', () => {
 
       expect(getByTitle('Aggregated Relations')).toBeInTheDocument();
     });
+
+    it('defaults to aggregated for User entity kind', async () => {
+      const catalogApi: jest.Mocked<CatalogApi> = {
+        getEntities: jest.fn(),
+      } as any;
+
+      catalogApi.getEntities.mockImplementation(getEntitiesMock);
+
+      const { getByLabelText } = await renderInTestApp(
+        <TestApiProvider apis={[[catalogApiRef, catalogApi]]}>
+          <EntityProvider entity={userEntity}>
+            <OwnershipCard />
+          </EntityProvider>
+        </TestApiProvider>,
+        {
+          mountedRoutes: {
+            '/create': catalogIndexRouteRef,
+          },
+        },
+      );
+
+      expect(getByLabelText('Ownership Type Switch')).toBeChecked();
+    });
+
+    it('defaults to direct for all entity kinds except User', async () => {
+      const catalogApi: jest.Mocked<CatalogApi> = {
+        getEntities: jest.fn(),
+      } as any;
+
+      catalogApi.getEntities.mockImplementation(getEntitiesMock);
+
+      const { getByLabelText } = await renderInTestApp(
+        <TestApiProvider apis={[[catalogApiRef, catalogApi]]}>
+          <EntityProvider entity={groupEntity}>
+            <OwnershipCard />
+          </EntityProvider>
+        </TestApiProvider>,
+        {
+          mountedRoutes: {
+            '/create': catalogIndexRouteRef,
+          },
+        },
+      );
+
+      expect(getByLabelText('Ownership Type Switch')).not.toBeChecked();
+    });
+
+    it('defaults to provided relationsType', async () => {
+      const catalogApi: jest.Mocked<CatalogApi> = {
+        getEntities: jest.fn(),
+      } as any;
+
+      catalogApi.getEntities.mockImplementation(getEntitiesMock);
+
+      const { getByLabelText } = await renderInTestApp(
+        <TestApiProvider apis={[[catalogApiRef, catalogApi]]}>
+          <EntityProvider entity={userEntity}>
+            <OwnershipCard relationsType="direct" />
+          </EntityProvider>
+        </TestApiProvider>,
+        {
+          mountedRoutes: {
+            '/create': catalogIndexRouteRef,
+          },
+        },
+      );
+
+      expect(getByLabelText('Ownership Type Switch')).not.toBeChecked();
+    });
   });
 });
diff --git a/plugins/org/src/components/Cards/OwnershipCard/OwnershipCard.tsx b/plugins/org/src/components/Cards/OwnershipCard/OwnershipCard.tsx
index d104eb032d..791ce5ca64 100644
--- a/plugins/org/src/components/Cards/OwnershipCard/OwnershipCard.tsx
+++ b/plugins/org/src/components/Cards/OwnershipCard/OwnershipCard.tsx
@@ -25,8 +25,9 @@ import {
   Switch,
   Tooltip,
 } from '@material-ui/core';
-import React, { useState } from 'react';
+import React, { useEffect, useState } from 'react';
 import { ComponentsGrid } from './ComponentsGrid';
+import { EntityRelationAggregation } from './types';
 
 const useStyles = makeStyles(theme => ({
   list: {
@@ -56,7 +57,7 @@ export const OwnershipCard = (props: {
   variant?: InfoCardVariants;
   entityFilterKind?: string[];
   hideRelationsToggle?: boolean;
-  relationsType?: string;
+  relationsType?: EntityRelationAggregation;
   entityLimit?: number;
 }) => {
   const {
@@ -70,11 +71,18 @@ export const OwnershipCard = (props: {
     hideRelationsToggle === undefined ? false : hideRelationsToggle;
   const classes = useStyles();
   const { entity } = useEntity();
-  const isGroup = entity.kind === 'Group';
+
+  const defaultRelationsType = entity.kind === 'User' ? 'aggregated' : 'direct';
   const [getRelationsType, setRelationsType] = useState(
-    relationsType || 'direct',
+    relationsType ?? defaultRelationsType,
   );
 
+  useEffect(() => {
+    if (!relationsType) {
+      setRelationsType(defaultRelationsType);
+    }
+  }, [setRelationsType, defaultRelationsType, relationsType]);
+
   return (
     <InfoCard title="Ownership" variant={variant}>
       {!relationsToggle && (
@@ -95,14 +103,13 @@ export const OwnershipCard = (props: {
                 <Switch
                   color="primary"
                   checked={getRelationsType !== 'direct'}
-                  onChange={() =>
-                    getRelationsType === 'direct'
-                      ? setRelationsType('aggregated')
-                      : setRelationsType('direct')
-                  }
+                  onChange={() => {
+                    const updatedRelationsType =
+                      getRelationsType === 'direct' ? 'aggregated' : 'direct';
+                    setRelationsType(updatedRelationsType);
+                  }}
                   name="pin"
                   inputProps={{ 'aria-label': 'Ownership Type Switch' }}
-                  disabled={!isGroup}
                 />
               </Tooltip>
               Aggregated Relations
@@ -114,7 +121,6 @@ export const OwnershipCard = (props: {
         entity={entity}
         entityLimit={entityLimit}
         relationsType={getRelationsType}
-        isGroup={isGroup}
         entityFilterKind={entityFilterKind}
       />
     </InfoCard>
diff --git a/plugins/org/src/components/Cards/OwnershipCard/index.ts b/plugins/org/src/components/Cards/OwnershipCard/index.ts
index dc0cef0226..a4798cc4bf 100644
--- a/plugins/org/src/components/Cards/OwnershipCard/index.ts
+++ b/plugins/org/src/components/Cards/OwnershipCard/index.ts
@@ -14,3 +14,4 @@
  * limitations under the License.
  */
 export * from './OwnershipCard';
+export * from './types';
diff --git a/plugins/org/src/components/Cards/OwnershipCard/types.ts b/plugins/org/src/components/Cards/OwnershipCard/types.ts
new file mode 100644
index 0000000000..c1e95ee94e
--- /dev/null
+++ b/plugins/org/src/components/Cards/OwnershipCard/types.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.
+ */
+
+/** @public */
+export type EntityRelationAggregation = 'direct' | 'aggregated';
diff --git a/plugins/org/src/components/Cards/OwnershipCard/useGetEntities.test.ts b/plugins/org/src/components/Cards/OwnershipCard/useGetEntities.test.ts
new file mode 100644
index 0000000000..191bd10284
--- /dev/null
+++ b/plugins/org/src/components/Cards/OwnershipCard/useGetEntities.test.ts
@@ -0,0 +1,150 @@
+/*
+ * 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 { CompoundEntityRef, Entity } from '@backstage/catalog-model';
+import { useGetEntities } from './useGetEntities';
+import { CatalogApi } from '@backstage/catalog-client';
+import { renderHook } from '@testing-library/react-hooks';
+import { getEntityRelations } from '@backstage/plugin-catalog-react';
+
+const givenParentGroup = 'team.squad1';
+const givenLeafGroup = 'team.squad2';
+const givenUser = 'user.john';
+const givenParentGroupEntity = {
+  kind: 'Group',
+  metadata: {
+    name: givenParentGroup,
+  },
+} as Partial<Entity> as Entity;
+const givenLeafGroupEntity = {
+  kind: 'Group',
+  metadata: {
+    name: givenLeafGroup,
+  },
+} as Partial<Entity> as Entity;
+const givenUserEntity = {
+  kind: 'User',
+  metadata: {
+    name: givenUser,
+  },
+} as Partial<Entity> as Entity;
+
+const catalogApiMock: Pick<CatalogApi, 'getEntities' | 'getEntitiesByRefs'> = {
+  getEntities: jest.fn(async () => Promise.resolve({ items: [] })),
+  getEntitiesByRefs: jest.fn(async ({ entityRefs: [ref] }) =>
+    ref.includes(givenParentGroup)
+      ? { items: [givenParentGroupEntity] }
+      : { items: [givenLeafGroupEntity] },
+  ),
+};
+
+jest.mock('@backstage/core-plugin-api', () => ({
+  useApi: jest.fn(() => catalogApiMock),
+}));
+jest.mock('@backstage/plugin-catalog-react', () => ({
+  catalogApiRef: {},
+  getEntityRelations: jest.fn(entity => {
+    if (entity?.metadata.name === givenParentGroup) {
+      return [
+        {
+          kind: 'Group',
+          namespace: 'default',
+          name: givenLeafGroup,
+        } as CompoundEntityRef,
+      ];
+    } else if (entity?.kind === 'User') {
+      return [
+        {
+          kind: 'Group',
+          namespace: 'default',
+          name: givenLeafGroup,
+        } as CompoundEntityRef,
+      ];
+    }
+
+    return [];
+  }) as typeof getEntityRelations,
+}));
+
+describe('useGetEntities', () => {
+  const ownersFilter = (...owners: string[]) =>
+    expect.objectContaining({
+      filter: expect.arrayContaining([
+        expect.objectContaining({
+          'relations.ownedBy': owners,
+        }),
+      ]),
+    });
+
+  describe('given aggregated relationsType', () => {
+    const whenHookIsCalledWith = async (_entity: Entity) => {
+      const hook = renderHook(
+        ({ entity }) => useGetEntities(entity, 'aggregated'),
+        {
+          initialProps: { entity: _entity },
+        },
+      );
+
+      await hook.waitForNextUpdate();
+    };
+
+    it('given group entity should aggregate child ownership', async () => {
+      await whenHookIsCalledWith(givenParentGroupEntity);
+      expect(catalogApiMock.getEntities).toHaveBeenCalledWith(
+        ownersFilter(
+          `group:default/${givenParentGroup}`,
+          `group:default/${givenLeafGroup}`,
+        ),
+      );
+    });
+
+    it('given user entity should aggregate parent ownership and direct', async () => {
+      await whenHookIsCalledWith(givenUserEntity);
+      expect(catalogApiMock.getEntities).toHaveBeenCalledWith(
+        ownersFilter(
+          `group:default/${givenLeafGroup}`,
+          `user:default/${givenUser}`,
+        ),
+      );
+    });
+  });
+
+  describe('given direct relationsType', () => {
+    const whenHookIsCalledWith = async (_entity: Entity) => {
+      const hook = renderHook(
+        ({ entity }) => useGetEntities(entity, 'direct'),
+        {
+          initialProps: { entity: _entity },
+        },
+      );
+
+      await hook.waitForNextUpdate();
+    };
+
+    it('given group entity should return directly owned entities', async () => {
+      await whenHookIsCalledWith(givenLeafGroupEntity);
+      expect(catalogApiMock.getEntities).toHaveBeenCalledWith(
+        ownersFilter(`group:default/${givenLeafGroup}`),
+      );
+    });
+
+    it('given user entity should return directly owned entities', async () => {
+      await whenHookIsCalledWith(givenUserEntity);
+      expect(catalogApiMock.getEntities).toHaveBeenCalledWith(
+        ownersFilter(`user:default/${givenUser}`),
+      );
+    });
+  });
+});
diff --git a/plugins/org/src/components/Cards/OwnershipCard/useGetEntities.ts b/plugins/org/src/components/Cards/OwnershipCard/useGetEntities.ts
index a59f534300..1ff01cd8e1 100644
--- a/plugins/org/src/components/Cards/OwnershipCard/useGetEntities.ts
+++ b/plugins/org/src/components/Cards/OwnershipCard/useGetEntities.ts
@@ -31,6 +31,7 @@ import limiterFactory from 'p-limit';
 import { useApi } from '@backstage/core-plugin-api';
 import useAsync from 'react-use/lib/useAsync';
 import qs from 'qs';
+import { EntityRelationAggregation as EntityRelationsAggregation } from './types';
 
 const limiter = limiterFactory(10);
 
@@ -57,78 +58,109 @@ const getQueryParams = (
   return qs.stringify({ filters }, { arrayFormat: 'repeat' });
 };
 
-const getOwnersEntityRef = (owner: Entity): string[] => {
-  let owners = [stringifyEntityRef(owner)];
-  if (owner.kind === 'User') {
-    const ownerGroups = getEntityRelations(owner, RELATION_MEMBER_OF, {
-      kind: 'Group',
+const getMemberOfEntityRefs = (owner: Entity): string[] => {
+  const parentGroups = getEntityRelations(owner, RELATION_MEMBER_OF, {
+    kind: 'Group',
+  });
+
+  const ownerGroupsNames = parentGroups.map(({ kind, namespace, name }) =>
+    stringifyEntityRef({
+      kind,
+      namespace,
+      name,
+    }),
+  );
+
+  return [...ownerGroupsNames, stringifyEntityRef(owner)];
+};
+
+const isEntity = (entity: Entity | undefined): entity is Entity =>
+  entity !== undefined;
+
+const getChildOwnershipEntityRefs = async (
+  entity: Entity,
+  catalogApi: CatalogApi,
+): Promise<string[]> => {
+  const childGroups = getEntityRelations(entity, RELATION_PARENT_OF, {
+    kind: 'Group',
+  });
+
+  const hasChildGroups = childGroups.length > 0;
+
+  if (hasChildGroups) {
+    const entityRefs = childGroups.map(r => stringifyEntityRef(r));
+    const childGroupResponse = await catalogApi.getEntitiesByRefs({
+      fields: ['kind', 'metadata.namespace', 'metadata.name'],
+      entityRefs,
     });
-    const ownerGroupsName = ownerGroups.map(ownerGroup =>
-      stringifyEntityRef({
-        kind: ownerGroup.kind,
-        namespace: ownerGroup.namespace,
-        name: ownerGroup.name,
-      }),
-    );
-    owners = [...owners, ...ownerGroupsName];
+    const childGroupEntities = childGroupResponse.items.filter(isEntity);
+
+    return (
+      await Promise.all(
+        childGroupEntities.map(childGroupEntity =>
+          limiter(() =>
+            getChildOwnershipEntityRefs(childGroupEntity, catalogApi),
+          ),
+        ),
+      )
+    ).flatMap(aggregated => aggregated);
   }
+
+  return [stringifyEntityRef(entity)];
+};
+
+const getOwners = async (
+  entity: Entity,
+  relations: EntityRelationsAggregation,
+  catalogApi: CatalogApi,
+): Promise<string[]> => {
+  const isGroup = entity.kind === 'Group';
+  const isAggregated = relations === 'aggregated';
+  const isUserEntity = entity.kind === 'User';
+
+  const owners: string[] = [];
+
+  if (isAggregated && isGroup) {
+    const childEntityRefs = await getChildOwnershipEntityRefs(
+      entity,
+      catalogApi,
+    );
+    owners.push(stringifyEntityRef(entity));
+    owners.push.apply(owners, childEntityRefs);
+  } else if (isAggregated && isUserEntity) {
+    const parentEntityRefs = getMemberOfEntityRefs(entity);
+    owners.push.apply(owners, parentEntityRefs);
+  } else {
+    owners.push(stringifyEntityRef(entity));
+  }
+
   return owners;
 };
 
-const getAggregatedOwnersEntityRef = async (
-  parentGroup: Entity,
+const getOwnedEntitiesByOwners = (
+  owners: string[],
+  kinds: string[],
   catalogApi: CatalogApi,
-): Promise<string[]> => {
-  const requestedEntities: Entity[] = [];
-  const outstandingEntities = new Map<string, Promise<Entity | undefined>>();
-  const processedEntities = new Set<string>();
-  requestedEntities.push(parentGroup);
-  let currentEntity = parentGroup;
-
-  while (requestedEntities.length > 0) {
-    const childRelations = getEntityRelations(
-      currentEntity,
-      RELATION_PARENT_OF,
+) =>
+  catalogApi.getEntities({
+    filter: [
       {
-        kind: 'Group',
+        kind: kinds,
+        'relations.ownedBy': owners,
       },
-    );
-
-    await Promise.all(
-      childRelations.map(childGroup =>
-        limiter(async () => {
-          const promise = catalogApi.getEntityByRef(childGroup);
-          outstandingEntities.set(childGroup.name, promise);
-          try {
-            const processedEntity = await promise;
-            if (processedEntity) {
-              requestedEntities.push(processedEntity);
-            }
-          } finally {
-            outstandingEntities.delete(childGroup.name);
-          }
-        }),
-      ),
-    );
-    requestedEntities.shift();
-    processedEntities.add(
-      stringifyEntityRef({
-        kind: currentEntity.kind,
-        namespace: currentEntity.metadata.namespace,
-        name: currentEntity.metadata.name,
-      }),
-    );
-    // always set currentEntity to the first element of array requestedEntities
-    currentEntity = requestedEntities[0];
-  }
-
-  return Array.from(processedEntities);
-};
+    ],
+    fields: [
+      'kind',
+      'metadata.name',
+      'metadata.namespace',
+      'spec.type',
+      'relations',
+    ],
+  });
 
 export function useGetEntities(
   entity: Entity,
-  relationsType: string,
-  isGroup: boolean,
+  relations: EntityRelationsAggregation,
   entityFilterKind?: string[],
   entityLimit = 6,
 ): {
@@ -151,25 +183,13 @@ export function useGetEntities(
     error,
     value: componentsWithCounters,
   } = useAsync(async () => {
-    const owners =
-      relationsType === 'aggregated' && isGroup
-        ? await getAggregatedOwnersEntityRef(entity, catalogApi)
-        : getOwnersEntityRef(entity);
-    const ownedEntitiesList = await catalogApi.getEntities({
-      filter: [
-        {
-          kind: kinds,
-          'relations.ownedBy': owners,
-        },
-      ],
-      fields: [
-        'kind',
-        'metadata.name',
-        'metadata.namespace',
-        'spec.type',
-        'relations',
-      ],
-    });
+    const owners = await getOwners(entity, relations, catalogApi);
+
+    const ownedEntitiesList = await getOwnedEntitiesByOwners(
+      owners,
+      kinds,
+      catalogApi,
+    );
 
     const counts = ownedEntitiesList.items.reduce(
       (acc: EntityTypeProps[], ownedEntity) => {
@@ -204,7 +224,7 @@ export function useGetEntities(
       kind: string;
       queryParams: string;
     }>;
-  }, [catalogApi, entity, relationsType]);
+  }, [catalogApi, entity, relations]);
 
   return {
     componentsWithCounters,
diff --git a/plugins/org/src/setupTests.ts b/plugins/org/src/setupTests.ts
index 28a35d2b06..09cb508b22 100644
--- a/plugins/org/src/setupTests.ts
+++ b/plugins/org/src/setupTests.ts
@@ -14,3 +14,7 @@
  * limitations under the License.
  */
 import '@testing-library/jest-dom';
+
+beforeEach(() => {
+  jest.clearAllMocks();
+});
diff --git a/plugins/pagerduty/CHANGELOG.md b/plugins/pagerduty/CHANGELOG.md
index 4ff94ae479..3919147d0a 100644
--- a/plugins/pagerduty/CHANGELOG.md
+++ b/plugins/pagerduty/CHANGELOG.md
@@ -1,5 +1,67 @@
 # @backstage/plugin-pagerduty
 
+## 0.6.5-next.2
+
+### Patch Changes
+
+- 8cec7664e146: Removed `@types/node` dependency
+- Updated dependencies
+  - @backstage/core-components@0.13.5-next.2
+  - @backstage/core-plugin-api@1.6.0-next.2
+  - @backstage/plugin-home-react@0.1.3-next.2
+  - @backstage/plugin-catalog-react@1.8.4-next.2
+  - @backstage/catalog-model@1.4.2-next.1
+  - @backstage/errors@1.2.1
+  - @backstage/theme@0.4.1
+
+## 0.6.5-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.8.4-next.1
+  - @backstage/core-components@0.13.5-next.1
+  - @backstage/plugin-home-react@0.1.3-next.1
+  - @backstage/catalog-model@1.4.2-next.0
+  - @backstage/core-plugin-api@1.6.0-next.1
+  - @backstage/errors@1.2.1
+  - @backstage/theme@0.4.1
+
+## 0.6.4-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-home-react@0.1.3-next.0
+  - @backstage/core-plugin-api@1.6.0-next.0
+  - @backstage/core-components@0.13.5-next.0
+  - @backstage/catalog-model@1.4.1
+  - @backstage/errors@1.2.1
+  - @backstage/theme@0.4.1
+  - @backstage/plugin-catalog-react@1.8.3-next.0
+
+## 0.6.2
+
+### Patch Changes
+
+- 5003fc966741: Add new `disableChangeEvents` prop to `EntityPagerDutyCard` to hide the Change Events tab and disable fetching of change events for the PagerDuty service.
+- Updated dependencies
+  - @backstage/plugin-home-react@0.1.2
+  - @backstage/core-components@0.13.4
+  - @backstage/plugin-catalog-react@1.8.1
+  - @backstage/core-plugin-api@1.5.3
+  - @backstage/catalog-model@1.4.1
+  - @backstage/errors@1.2.1
+  - @backstage/theme@0.4.1
+
+## 0.6.2-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.8.1-next.1
+  - @backstage/plugin-home-react@0.1.2-next.0
+
 ## 0.6.2-next.0
 
 ### Patch Changes
diff --git a/plugins/pagerduty/api-report.md b/plugins/pagerduty/api-report.md
index dd24aa9bec..24c2e103cf 100644
--- a/plugins/pagerduty/api-report.md
+++ b/plugins/pagerduty/api-report.md
@@ -12,22 +12,25 @@ import { ConfigApi } from '@backstage/core-plugin-api';
 import { DiscoveryApi } from '@backstage/core-plugin-api';
 import { Entity } from '@backstage/catalog-model';
 import { FetchApi } from '@backstage/core-plugin-api';
+import { JSX as JSX_2 } from 'react';
+import { default as React_2 } from 'react';
 import { ReactNode } from 'react';
 
 // @public (undocumented)
 export const EntityPagerDutyCard: (
   props: EntityPagerDutyCardProps,
-) => JSX.Element;
+) => JSX_2.Element;
 
 // @public (undocumented)
 export type EntityPagerDutyCardProps = {
   readOnly?: boolean;
+  disableChangeEvents?: boolean;
 };
 
 // @public (undocumented)
 export const HomePagePagerDutyCard: (
   props: CardExtensionProps<HomePagePagerDutyCardProps>,
-) => JSX.Element;
+) => JSX_2.Element;
 
 // @public (undocumented)
 export type HomePagePagerDutyCardProps = PagerDutyEntity & {
@@ -66,7 +69,7 @@ export type PagerDutyAssignee = {
 };
 
 // @public @deprecated (undocumented)
-export const PagerDutyCard: (props: EntityPagerDutyCardProps) => JSX.Element;
+export const PagerDutyCard: (props: EntityPagerDutyCardProps) => JSX_2.Element;
 
 // @public @deprecated (undocumented)
 export type PagerDutyCardProps = EntityPagerDutyCardProps;
@@ -214,7 +217,9 @@ export type PagerDutyUser = {
 };
 
 // @public (undocumented)
-export function TriggerButton(props: { children?: ReactNode }): JSX.Element;
+export function TriggerButton(props: {
+  children?: ReactNode;
+}): React_2.JSX.Element;
 
 // @public (undocumented)
 export class UnauthorizedError extends Error {}
diff --git a/plugins/pagerduty/catalog-info.yaml b/plugins/pagerduty/catalog-info.yaml
new file mode 100644
index 0000000000..c8585f0e55
--- /dev/null
+++ b/plugins/pagerduty/catalog-info.yaml
@@ -0,0 +1,10 @@
+apiVersion: backstage.io/v1alpha1
+kind: Component
+metadata:
+  name: backstage-plugin-pagerduty
+  title: '@backstage/plugin-pagerduty'
+  description: A Backstage plugin that integrates towards PagerDuty
+spec:
+  lifecycle: experimental
+  type: backstage-frontend-plugin
+  owner: maintainers
diff --git a/plugins/pagerduty/package.json b/plugins/pagerduty/package.json
index 13d56fd3f2..5420961a39 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.6.2-next.0",
+  "version": "0.6.5-next.2",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
@@ -23,6 +23,7 @@
     "backstage",
     "pagerduty"
   ],
+  "sideEffects": false,
   "scripts": {
     "build": "backstage-cli package build",
     "start": "backstage-cli package start",
@@ -62,7 +63,6 @@
     "@testing-library/jest-dom": "^5.10.1",
     "@testing-library/react": "^12.1.3",
     "@testing-library/user-event": "^14.0.0",
-    "@types/node": "^16.11.26",
     "msw": "^1.0.0"
   },
   "files": [
diff --git a/plugins/pagerduty/src/components/EntityPagerDutyCard/index.tsx b/plugins/pagerduty/src/components/EntityPagerDutyCard/index.tsx
index 50e6f3a096..b252069b90 100644
--- a/plugins/pagerduty/src/components/EntityPagerDutyCard/index.tsx
+++ b/plugins/pagerduty/src/components/EntityPagerDutyCard/index.tsx
@@ -30,12 +30,19 @@ export const isPluginApplicableToEntity = (entity: Entity) =>
 /** @public */
 export type EntityPagerDutyCardProps = {
   readOnly?: boolean;
+  disableChangeEvents?: boolean;
 };
 
 /** @public */
 export const EntityPagerDutyCard = (props: EntityPagerDutyCardProps) => {
-  const { readOnly } = props;
+  const { readOnly, disableChangeEvents } = props;
   const { entity } = useEntity();
   const pagerDutyEntity = getPagerDutyEntity(entity);
-  return <PagerDutyCard {...pagerDutyEntity} readOnly={readOnly} />;
+  return (
+    <PagerDutyCard
+      {...pagerDutyEntity}
+      readOnly={readOnly}
+      disableChangeEvents={disableChangeEvents}
+    />
+  );
 };
diff --git a/plugins/pagerduty/src/components/PagerDutyCard/index.tsx b/plugins/pagerduty/src/components/PagerDutyCard/index.tsx
index bb89865c5f..332d823f1f 100644
--- a/plugins/pagerduty/src/components/PagerDutyCard/index.tsx
+++ b/plugins/pagerduty/src/components/PagerDutyCard/index.tsx
@@ -46,11 +46,12 @@ const BasicCard = ({ children }: { children: ReactNode }) => (
 /** @public */
 export type PagerDutyCardProps = PagerDutyEntity & {
   readOnly?: boolean;
+  disableChangeEvents?: boolean;
 };
 
 /** @public */
 export const PagerDutyCard = (props: PagerDutyCardProps) => {
-  const { readOnly, integrationKey, name } = props;
+  const { readOnly, disableChangeEvents, integrationKey, name } = props;
   const api = useApi(pagerDutyApiRef);
   const [refreshIncidents, setRefreshIncidents] = useState<boolean>(false);
   const [refreshChangeEvents, setRefreshChangeEvents] =
@@ -169,12 +170,16 @@ export const PagerDutyCard = (props: PagerDutyCardProps) => {
                 refreshIncidents={refreshIncidents}
               />
             </CardTab>
-            <CardTab label="Change Events">
-              <ChangeEvents
-                serviceId={service!.id}
-                refreshEvents={refreshChangeEvents}
-              />
-            </CardTab>
+            <>
+              {disableChangeEvents !== true && (
+                <CardTab label="Change Events">
+                  <ChangeEvents
+                    serviceId={service!.id}
+                    refreshEvents={refreshChangeEvents}
+                  />
+                </CardTab>
+              )}
+            </>
           </TabbedCard>
           <EscalationPolicy policyId={service!.policyId} />
         </CardContent>
diff --git a/plugins/periskop-backend/CHANGELOG.md b/plugins/periskop-backend/CHANGELOG.md
index 2bf8f6c147..af061f074a 100644
--- a/plugins/periskop-backend/CHANGELOG.md
+++ b/plugins/periskop-backend/CHANGELOG.md
@@ -1,5 +1,51 @@
 # @backstage/plugin-periskop-backend
 
+## 0.1.22-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config@1.1.0-next.1
+  - @backstage/backend-common@0.19.5-next.2
+  - @backstage/backend-plugin-api@0.6.3-next.2
+
+## 0.1.22-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config@1.1.0-next.0
+  - @backstage/backend-common@0.19.5-next.1
+  - @backstage/backend-plugin-api@0.6.3-next.1
+
+## 0.1.21-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.19.4-next.0
+  - @backstage/backend-plugin-api@0.6.2-next.0
+  - @backstage/config@1.0.8
+
+## 0.1.19
+
+### Patch Changes
+
+- 629cbd194a87: Use `coreServices.rootConfig` instead of `coreService.config`
+- 12a8c94eda8d: Add package repository and homepage metadata
+- Updated dependencies
+  - @backstage/backend-common@0.19.2
+  - @backstage/backend-plugin-api@0.6.0
+  - @backstage/config@1.0.8
+
+## 0.1.19-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@0.6.0-next.2
+  - @backstage/backend-common@0.19.2-next.2
+
 ## 0.1.19-next.1
 
 ### Patch Changes
diff --git a/plugins/periskop-backend/api-report.md b/plugins/periskop-backend/api-report.md
index 7906bc4785..46d5de8d93 100644
--- a/plugins/periskop-backend/api-report.md
+++ b/plugins/periskop-backend/api-report.md
@@ -12,7 +12,8 @@ import { Logger } from 'winston';
 export function createRouter(options: RouterOptions): Promise<express.Router>;
 
 // @alpha
-export const periskopPlugin: () => BackendFeature;
+const periskopPlugin: () => BackendFeature;
+export default periskopPlugin;
 
 // @public (undocumented)
 export interface RouterOptions {
diff --git a/plugins/periskop-backend/catalog-info.yaml b/plugins/periskop-backend/catalog-info.yaml
new file mode 100644
index 0000000000..8ad2a7f261
--- /dev/null
+++ b/plugins/periskop-backend/catalog-info.yaml
@@ -0,0 +1,9 @@
+apiVersion: backstage.io/v1alpha1
+kind: Component
+metadata:
+  name: backstage-plugin-periskop-backend
+  title: '@backstage/plugin-periskop-backend'
+spec:
+  lifecycle: experimental
+  type: backstage-backend-plugin
+  owner: maintainers
diff --git a/plugins/periskop-backend/package.json b/plugins/periskop-backend/package.json
index 52c7d127b0..f1327810bf 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.19-next.1",
+  "version": "0.1.22-next.2",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
diff --git a/plugins/periskop-backend/src/index.ts b/plugins/periskop-backend/src/index.ts
index a053633745..17a6d0d054 100644
--- a/plugins/periskop-backend/src/index.ts
+++ b/plugins/periskop-backend/src/index.ts
@@ -15,4 +15,4 @@
  */
 
 export * from './service/router';
-export { periskopPlugin } from './plugin';
+export { periskopPlugin as default } from './plugin';
diff --git a/plugins/periskop/CHANGELOG.md b/plugins/periskop/CHANGELOG.md
index a12e00971f..b5d4598d24 100644
--- a/plugins/periskop/CHANGELOG.md
+++ b/plugins/periskop/CHANGELOG.md
@@ -1,5 +1,63 @@
 # @backstage/plugin-periskop
 
+## 0.1.22-next.2
+
+### Patch Changes
+
+- 8cec7664e146: Removed `@types/node` dependency
+- Updated dependencies
+  - @backstage/core-components@0.13.5-next.2
+  - @backstage/core-plugin-api@1.6.0-next.2
+  - @backstage/plugin-catalog-react@1.8.4-next.2
+  - @backstage/catalog-model@1.4.2-next.1
+  - @backstage/errors@1.2.1
+  - @backstage/theme@0.4.1
+
+## 0.1.22-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.8.4-next.1
+  - @backstage/core-components@0.13.5-next.1
+  - @backstage/catalog-model@1.4.2-next.0
+  - @backstage/core-plugin-api@1.6.0-next.1
+  - @backstage/errors@1.2.1
+  - @backstage/theme@0.4.1
+
+## 0.1.21-next.0
+
+### Patch Changes
+
+- 482bb5c0bbf8: Moved `@types/react` to be a regular dependency
+- Updated dependencies
+  - @backstage/core-plugin-api@1.6.0-next.0
+  - @backstage/core-components@0.13.5-next.0
+  - @backstage/catalog-model@1.4.1
+  - @backstage/errors@1.2.1
+  - @backstage/theme@0.4.1
+  - @backstage/plugin-catalog-react@1.8.3-next.0
+
+## 0.1.19
+
+### Patch Changes
+
+- 12a8c94eda8d: Add package repository and homepage metadata
+- Updated dependencies
+  - @backstage/core-components@0.13.4
+  - @backstage/plugin-catalog-react@1.8.1
+  - @backstage/core-plugin-api@1.5.3
+  - @backstage/catalog-model@1.4.1
+  - @backstage/errors@1.2.1
+  - @backstage/theme@0.4.1
+
+## 0.1.19-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.8.1-next.1
+
 ## 0.1.19-next.1
 
 ### Patch Changes
diff --git a/plugins/periskop/api-report.md b/plugins/periskop/api-report.md
index 3332dd9edb..578fb1dc49 100644
--- a/plugins/periskop/api-report.md
+++ b/plugins/periskop/api-report.md
@@ -10,6 +10,7 @@ import { BackstagePlugin } from '@backstage/core-plugin-api';
 import { ConfigApi } from '@backstage/core-plugin-api';
 import { DiscoveryApi } from '@backstage/core-plugin-api';
 import { Entity } from '@backstage/catalog-model';
+import { JSX as JSX_2 } from 'react';
 
 // @public (undocumented)
 export interface AggregatedError {
@@ -24,7 +25,7 @@ export interface AggregatedError {
 }
 
 // @public (undocumented)
-export const EntityPeriskopErrorsCard: () => JSX.Element;
+export const EntityPeriskopErrorsCard: () => JSX_2.Element;
 
 // @public (undocumented)
 interface Error_2 {
diff --git a/plugins/periskop/catalog-info.yaml b/plugins/periskop/catalog-info.yaml
new file mode 100644
index 0000000000..b4ca9bdd34
--- /dev/null
+++ b/plugins/periskop/catalog-info.yaml
@@ -0,0 +1,9 @@
+apiVersion: backstage.io/v1alpha1
+kind: Component
+metadata:
+  name: backstage-plugin-periskop
+  title: '@backstage/plugin-periskop'
+spec:
+  lifecycle: experimental
+  type: backstage-frontend-plugin
+  owner: maintainers
diff --git a/plugins/periskop/package.json b/plugins/periskop/package.json
index 3ac124e85c..5ba607e94b 100644
--- a/plugins/periskop/package.json
+++ b/plugins/periskop/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-periskop",
-  "version": "0.1.19-next.1",
+  "version": "0.1.22-next.2",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
@@ -18,6 +18,7 @@
     "main": "dist/index.esm.js",
     "types": "dist/index.d.ts"
   },
+  "sideEffects": false,
   "scripts": {
     "build": "backstage-cli package build",
     "start": "backstage-cli package start",
@@ -37,6 +38,7 @@
     "@material-ui/core": "^4.12.2",
     "@material-ui/icons": "^4.9.1",
     "@material-ui/lab": "4.0.0-alpha.61",
+    "@types/react": "^16.13.1 || ^17.0.0",
     "luxon": "^3.0.0",
     "react-use": "^17.2.4"
   },
@@ -55,8 +57,6 @@
     "@testing-library/react": "^12.1.3",
     "@testing-library/user-event": "^14.0.0",
     "@types/luxon": "^3.0.0",
-    "@types/node": "^16.11.26",
-    "@types/react": "^16.13.1 || ^17.0.0",
     "msw": "^1.0.0"
   },
   "files": [
diff --git a/plugins/permission-backend-module-policy-allow-all/.eslintrc.js b/plugins/permission-backend-module-policy-allow-all/.eslintrc.js
new file mode 100644
index 0000000000..e2a53a6ad2
--- /dev/null
+++ b/plugins/permission-backend-module-policy-allow-all/.eslintrc.js
@@ -0,0 +1 @@
+module.exports = require('@backstage/cli/config/eslint-factory')(__dirname);
diff --git a/plugins/permission-backend-module-policy-allow-all/CHANGELOG.md b/plugins/permission-backend-module-policy-allow-all/CHANGELOG.md
new file mode 100644
index 0000000000..8ed771d68a
--- /dev/null
+++ b/plugins/permission-backend-module-policy-allow-all/CHANGELOG.md
@@ -0,0 +1,16 @@
+# @backstage/plugin-permission-backend-module-allow-all-policy
+
+## 0.1.0-next.0
+
+### Minor Changes
+
+- 5f7b2153526b: Created package with policy `permissionModuleAllowAllPolicy`
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.19.5-next.2
+  - @backstage/plugin-auth-node@0.3.0-next.2
+  - @backstage/plugin-permission-node@0.7.14-next.2
+  - @backstage/backend-plugin-api@0.6.3-next.2
+  - @backstage/plugin-permission-common@0.7.8-next.1
diff --git a/plugins/permission-backend-module-policy-allow-all/README.md b/plugins/permission-backend-module-policy-allow-all/README.md
new file mode 100644
index 0000000000..1cdeadcf95
--- /dev/null
+++ b/plugins/permission-backend-module-policy-allow-all/README.md
@@ -0,0 +1,5 @@
+# @backstage/plugin-permission-backend-module-allow-all-policy
+
+The allow all policy backend module for the permission plugin.
+
+_This plugin was created through the Backstage CLI_
diff --git a/plugins/permission-backend-module-policy-allow-all/api-report.md b/plugins/permission-backend-module-policy-allow-all/api-report.md
new file mode 100644
index 0000000000..081655578d
--- /dev/null
+++ b/plugins/permission-backend-module-policy-allow-all/api-report.md
@@ -0,0 +1,11 @@
+## API Report File for "@backstage/plugin-permission-backend-module-allow-all-policy"
+
+> Do not edit this file. It is a report generated by [API Extractor](https://api-extractor.com/).
+
+```ts
+import { BackendFeature } from '@backstage/backend-plugin-api';
+
+// @public
+const permissionModuleAllowAllPolicy: () => BackendFeature;
+export default permissionModuleAllowAllPolicy;
+```
diff --git a/plugins/permission-backend-module-policy-allow-all/package.json b/plugins/permission-backend-module-policy-allow-all/package.json
new file mode 100644
index 0000000000..76caea26be
--- /dev/null
+++ b/plugins/permission-backend-module-policy-allow-all/package.json
@@ -0,0 +1,39 @@
+{
+  "name": "@backstage/plugin-permission-backend-module-allow-all-policy",
+  "description": "Allow all policy backend module for the permission plugin.",
+  "version": "0.1.0-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/backend-common": "workspace:^",
+    "@backstage/backend-plugin-api": "workspace:^",
+    "@backstage/plugin-auth-node": "workspace:^",
+    "@backstage/plugin-permission-common": "workspace:^",
+    "@backstage/plugin-permission-node": "workspace:^"
+  },
+  "devDependencies": {
+    "@backstage/backend-test-utils": "workspace:^",
+    "@backstage/cli": "workspace:^"
+  },
+  "files": [
+    "dist"
+  ]
+}
diff --git a/plugins/permission-backend-module-policy-allow-all/src/index.ts b/plugins/permission-backend-module-policy-allow-all/src/index.ts
new file mode 100644
index 0000000000..49fefc99db
--- /dev/null
+++ b/plugins/permission-backend-module-policy-allow-all/src/index.ts
@@ -0,0 +1,23 @@
+/*
+ * 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.
+ */
+
+/**
+ * The allow all policy backend module for the permission plugin.
+ *
+ * @packageDocumentation
+ */
+
+export { permissionModuleAllowAllPolicy as default } from './module';
diff --git a/plugins/permission-backend-module-policy-allow-all/src/module.ts b/plugins/permission-backend-module-policy-allow-all/src/module.ts
new file mode 100644
index 0000000000..47ab202a00
--- /dev/null
+++ b/plugins/permission-backend-module-policy-allow-all/src/module.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 { createBackendModule } from '@backstage/backend-plugin-api';
+import { policyExtensionPoint } from '@backstage/plugin-permission-node/alpha';
+import { AllowAllPermissionPolicy } from './policy';
+
+/**
+ * A permission policy module that allows all requests.
+ *
+ * @public
+ */
+export const permissionModuleAllowAllPolicy = createBackendModule({
+  moduleId: 'allowAllPolicy',
+  pluginId: 'permission',
+  register(reg) {
+    reg.registerInit({
+      deps: { policy: policyExtensionPoint },
+      async init({ policy }) {
+        policy.setPolicy(new AllowAllPermissionPolicy());
+      },
+    });
+  },
+});
diff --git a/plugins/permission-backend-module-policy-allow-all/src/policy.ts b/plugins/permission-backend-module-policy-allow-all/src/policy.ts
new file mode 100644
index 0000000000..da853e47db
--- /dev/null
+++ b/plugins/permission-backend-module-policy-allow-all/src/policy.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 { BackstageIdentityResponse } from '@backstage/plugin-auth-node';
+import {
+  AuthorizeResult,
+  PolicyDecision,
+} from '@backstage/plugin-permission-common';
+import {
+  PermissionPolicy,
+  PolicyQuery,
+} from '@backstage/plugin-permission-node';
+
+export class AllowAllPermissionPolicy implements PermissionPolicy {
+  async handle(
+    _request: PolicyQuery,
+    _user?: BackstageIdentityResponse,
+  ): Promise<PolicyDecision> {
+    return {
+      result: AuthorizeResult.ALLOW,
+    };
+  }
+}
diff --git a/plugins/permission-backend/CHANGELOG.md b/plugins/permission-backend/CHANGELOG.md
index 2d641baae8..ab2ef342f6 100644
--- a/plugins/permission-backend/CHANGELOG.md
+++ b/plugins/permission-backend/CHANGELOG.md
@@ -1,5 +1,71 @@
 # @backstage/plugin-permission-backend
 
+## 0.5.26-next.2
+
+### Patch Changes
+
+- 84ad6fccd4d5: Moved `permissionModuleAllowAllPolicy` to `@backstage/plugin-permission-backend-module-allow-all-policy`
+- Updated dependencies
+  - @backstage/config@1.1.0-next.1
+  - @backstage/backend-common@0.19.5-next.2
+  - @backstage/plugin-auth-node@0.3.0-next.2
+  - @backstage/plugin-permission-node@0.7.14-next.2
+  - @backstage/backend-plugin-api@0.6.3-next.2
+  - @backstage/plugin-permission-common@0.7.8-next.1
+  - @backstage/errors@1.2.1
+
+## 0.5.26-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config@1.1.0-next.0
+  - @backstage/backend-common@0.19.5-next.1
+  - @backstage/backend-plugin-api@0.6.3-next.1
+  - @backstage/plugin-auth-node@0.3.0-next.1
+  - @backstage/plugin-permission-common@0.7.8-next.0
+  - @backstage/plugin-permission-node@0.7.14-next.1
+  - @backstage/errors@1.2.1
+
+## 0.5.25-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-auth-node@0.3.0-next.0
+  - @backstage/backend-common@0.19.4-next.0
+  - @backstage/backend-plugin-api@0.6.2-next.0
+  - @backstage/config@1.0.8
+  - @backstage/errors@1.2.1
+  - @backstage/plugin-permission-common@0.7.7
+  - @backstage/plugin-permission-node@0.7.13-next.0
+
+## 0.5.23
+
+### Patch Changes
+
+- 629cbd194a87: Use `coreServices.rootConfig` instead of `coreService.config`
+- 12a8c94eda8d: Add package repository and homepage metadata
+- 0d6ddc62d8da: Refactor backend plugin creation parameter from callback to object.
+- Updated dependencies
+  - @backstage/backend-common@0.19.2
+  - @backstage/backend-plugin-api@0.6.0
+  - @backstage/plugin-auth-node@0.2.17
+  - @backstage/plugin-permission-node@0.7.11
+  - @backstage/config@1.0.8
+  - @backstage/errors@1.2.1
+  - @backstage/plugin-permission-common@0.7.7
+
+## 0.5.23-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@0.6.0-next.2
+  - @backstage/backend-common@0.19.2-next.2
+  - @backstage/plugin-permission-node@0.7.11-next.2
+  - @backstage/plugin-auth-node@0.2.17-next.2
+
 ## 0.5.23-next.1
 
 ### Patch Changes
diff --git a/plugins/permission-backend/alpha-api-report.md b/plugins/permission-backend/alpha-api-report.md
index 926691930b..acface76a4 100644
--- a/plugins/permission-backend/alpha-api-report.md
+++ b/plugins/permission-backend/alpha-api-report.md
@@ -6,10 +6,8 @@
 import { BackendFeature } from '@backstage/backend-plugin-api';
 
 // @alpha
-export const permissionModuleAllowAllPolicy: () => BackendFeature;
-
-// @alpha
-export const permissionPlugin: () => BackendFeature;
+const permissionPlugin: () => BackendFeature;
+export default permissionPlugin;
 
 // (No @packageDocumentation comment for this package)
 ```
diff --git a/plugins/permission-backend/catalog-info.yaml b/plugins/permission-backend/catalog-info.yaml
new file mode 100644
index 0000000000..13baa09802
--- /dev/null
+++ b/plugins/permission-backend/catalog-info.yaml
@@ -0,0 +1,9 @@
+apiVersion: backstage.io/v1alpha1
+kind: Component
+metadata:
+  name: backstage-plugin-permission-backend
+  title: '@backstage/plugin-permission-backend'
+spec:
+  lifecycle: experimental
+  type: backstage-backend-plugin
+  owner: permission-maintainers
diff --git a/plugins/permission-backend/package.json b/plugins/permission-backend/package.json
index 269cb12061..460bc32b10 100644
--- a/plugins/permission-backend/package.json
+++ b/plugins/permission-backend/package.json
@@ -1,13 +1,11 @@
 {
   "name": "@backstage/plugin-permission-backend",
-  "version": "0.5.23-next.1",
+  "version": "0.5.26-next.2",
   "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"
+    "access": "public"
   },
   "exports": {
     ".": "./src/index.ts",
diff --git a/plugins/permission-backend/src/alpha.ts b/plugins/permission-backend/src/alpha.ts
index f6a2bb4f09..c0283c6fd0 100644
--- a/plugins/permission-backend/src/alpha.ts
+++ b/plugins/permission-backend/src/alpha.ts
@@ -14,4 +14,4 @@
  * limitations under the License.
  */
 
-export { permissionPlugin, permissionModuleAllowAllPolicy } from './plugin';
+export { permissionPlugin as default } from './plugin';
diff --git a/plugins/permission-backend/src/plugin.ts b/plugins/permission-backend/src/plugin.ts
index a6b731b120..9cf0024e47 100644
--- a/plugins/permission-backend/src/plugin.ts
+++ b/plugins/permission-backend/src/plugin.ts
@@ -17,18 +17,9 @@
 import { loggerToWinstonLogger } from '@backstage/backend-common';
 import {
   coreServices,
-  createBackendModule,
   createBackendPlugin,
 } from '@backstage/backend-plugin-api';
-import { BackstageIdentityResponse } from '@backstage/plugin-auth-node';
-import {
-  AuthorizeResult,
-  PolicyDecision,
-} from '@backstage/plugin-permission-common';
-import {
-  PermissionPolicy,
-  PolicyQuery,
-} from '@backstage/plugin-permission-node';
+import { PermissionPolicy } from '@backstage/plugin-permission-node';
 import {
   policyExtensionPoint,
   PolicyExtensionPoint,
@@ -46,41 +37,12 @@ class PolicyExtensionPointImpl implements PolicyExtensionPoint {
   }
 }
 
-/**
- * A permission policy module that allows all requests.
- *
- * @alpha
- */
-export const permissionModuleAllowAllPolicy = createBackendModule({
-  moduleId: 'allowAllPolicy',
-  pluginId: 'permission',
-  register(reg) {
-    class AllowAllPermissionPolicy implements PermissionPolicy {
-      async handle(
-        _request: PolicyQuery,
-        _user?: BackstageIdentityResponse,
-      ): Promise<PolicyDecision> {
-        return {
-          result: AuthorizeResult.ALLOW,
-        };
-      }
-    }
-
-    reg.registerInit({
-      deps: { policy: policyExtensionPoint },
-      async init({ policy }) {
-        policy.setPolicy(new AllowAllPermissionPolicy());
-      },
-    });
-  },
-});
-
 /**
  * Permission plugin
  *
  * @alpha
  */
-export const permissionPlugin = createBackendPlugin(() => ({
+export const permissionPlugin = createBackendPlugin({
   pluginId: 'permission',
   register(env) {
     const policies = new PolicyExtensionPointImpl();
@@ -99,7 +61,7 @@ export const permissionPlugin = createBackendPlugin(() => ({
         const winstonLogger = loggerToWinstonLogger(logger);
         if (!policies.policy) {
           throw new Error(
-            'No policy module installed! Please install a policy module. If you want to allow all requests, use permissionModuleAllowAllPolicy',
+            'No policy module installed! Please install a policy module. If you want to allow all requests, use @backstage/plugin-permission-backend-module-allow-all-policy permissionModuleAllowAllPolicy',
           );
         }
 
@@ -115,4 +77,4 @@ export const permissionPlugin = createBackendPlugin(() => ({
       },
     });
   },
-}));
+});
diff --git a/plugins/permission-common/CHANGELOG.md b/plugins/permission-common/CHANGELOG.md
index b0a2cb2b42..caf6bacba6 100644
--- a/plugins/permission-common/CHANGELOG.md
+++ b/plugins/permission-common/CHANGELOG.md
@@ -1,5 +1,23 @@
 # @backstage/plugin-permission-common
 
+## 0.7.8-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config@1.1.0-next.1
+  - @backstage/errors@1.2.1
+  - @backstage/types@1.1.0
+
+## 0.7.8-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config@1.1.0-next.0
+  - @backstage/errors@1.2.1
+  - @backstage/types@1.1.0
+
 ## 0.7.7
 
 ### Patch Changes
@@ -433,7 +451,7 @@
 
 - b768259244: **BREAKING**: Authorize API request and response types have been updated. The existing `AuthorizeRequest` and `AuthorizeResponse` types now match the entire request and response objects for the /authorize endpoint, and new types `AuthorizeQuery` and `AuthorizeDecision` have been introduced for individual items in the request and response batches respectively.
 
-  **BREAKING**: PermissionClient has been updated to use the new request and response format in the latest version of @backstage/permission-backend.
+  **BREAKING**: PermissionClient has been updated to use the new request and response format in the latest version of @backstage/plugin-permission-backend.
 
 ### Patch Changes
 
@@ -446,7 +464,7 @@
 
 - b768259244: **BREAKING**: Authorize API request and response types have been updated. The existing `AuthorizeRequest` and `AuthorizeResponse` types now match the entire request and response objects for the /authorize endpoint, and new types `AuthorizeQuery` and `AuthorizeDecision` have been introduced for individual items in the request and response batches respectively.
 
-  **BREAKING**: PermissionClient has been updated to use the new request and response format in the latest version of @backstage/permission-backend.
+  **BREAKING**: PermissionClient has been updated to use the new request and response format in the latest version of @backstage/plugin-permission-backend.
 
 ### Patch Changes
 
diff --git a/plugins/permission-common/catalog-info.yaml b/plugins/permission-common/catalog-info.yaml
new file mode 100644
index 0000000000..d8d8918530
--- /dev/null
+++ b/plugins/permission-common/catalog-info.yaml
@@ -0,0 +1,10 @@
+apiVersion: backstage.io/v1alpha1
+kind: Component
+metadata:
+  name: backstage-plugin-permission-common
+  title: '@backstage/plugin-permission-common'
+  description: Isomorphic types and client for Backstage permissions and authorization
+spec:
+  lifecycle: experimental
+  type: backstage-common-library
+  owner: permission-maintainers
diff --git a/plugins/permission-common/package.json b/plugins/permission-common/package.json
index 32f137f560..a8b6b30169 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.7",
+  "version": "0.7.8-next.1",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "publishConfig": {
@@ -29,6 +29,7 @@
     "config.d.ts"
   ],
   "configSchema": "config.d.ts",
+  "sideEffects": false,
   "scripts": {
     "build": "backstage-cli package build",
     "lint": "backstage-cli package lint",
diff --git a/plugins/permission-node/CHANGELOG.md b/plugins/permission-node/CHANGELOG.md
index 41e5f3ca5b..d44cc37877 100644
--- a/plugins/permission-node/CHANGELOG.md
+++ b/plugins/permission-node/CHANGELOG.md
@@ -1,5 +1,62 @@
 # @backstage/plugin-permission-node
 
+## 0.7.14-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config@1.1.0-next.1
+  - @backstage/backend-common@0.19.5-next.2
+  - @backstage/plugin-auth-node@0.3.0-next.2
+  - @backstage/backend-plugin-api@0.6.3-next.2
+  - @backstage/plugin-permission-common@0.7.8-next.1
+  - @backstage/errors@1.2.1
+
+## 0.7.14-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config@1.1.0-next.0
+  - @backstage/backend-common@0.19.5-next.1
+  - @backstage/backend-plugin-api@0.6.3-next.1
+  - @backstage/plugin-auth-node@0.3.0-next.1
+  - @backstage/plugin-permission-common@0.7.8-next.0
+  - @backstage/errors@1.2.1
+
+## 0.7.13-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-auth-node@0.3.0-next.0
+  - @backstage/backend-common@0.19.4-next.0
+  - @backstage/backend-plugin-api@0.6.2-next.0
+  - @backstage/config@1.0.8
+  - @backstage/errors@1.2.1
+  - @backstage/plugin-permission-common@0.7.7
+
+## 0.7.11
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.19.2
+  - @backstage/backend-plugin-api@0.6.0
+  - @backstage/plugin-auth-node@0.2.17
+  - @backstage/config@1.0.8
+  - @backstage/errors@1.2.1
+  - @backstage/plugin-permission-common@0.7.7
+
+## 0.7.11-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@0.6.0-next.2
+  - @backstage/backend-common@0.19.2-next.2
+  - @backstage/plugin-auth-node@0.2.17-next.2
+
 ## 0.7.11-next.1
 
 ### Patch Changes
diff --git a/plugins/permission-node/catalog-info.yaml b/plugins/permission-node/catalog-info.yaml
new file mode 100644
index 0000000000..a85f952af8
--- /dev/null
+++ b/plugins/permission-node/catalog-info.yaml
@@ -0,0 +1,10 @@
+apiVersion: backstage.io/v1alpha1
+kind: Component
+metadata:
+  name: backstage-plugin-permission-node
+  title: '@backstage/plugin-permission-node'
+  description: Common permission and authorization utilities for backend plugins
+spec:
+  lifecycle: experimental
+  type: backstage-node-library
+  owner: permission-maintainers
diff --git a/plugins/permission-node/package.json b/plugins/permission-node/package.json
index c5f30ff4a0..d88a691ba0 100644
--- a/plugins/permission-node/package.json
+++ b/plugins/permission-node/package.json
@@ -1,14 +1,12 @@
 {
   "name": "@backstage/plugin-permission-node",
   "description": "Common permission and authorization utilities for backend plugins",
-  "version": "0.7.11-next.1",
+  "version": "0.7.14-next.2",
   "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"
+    "access": "public"
   },
   "exports": {
     ".": "./src/index.ts",
diff --git a/plugins/permission-react/CHANGELOG.md b/plugins/permission-react/CHANGELOG.md
index 47aa6a70a3..2fcfc4b3a5 100644
--- a/plugins/permission-react/CHANGELOG.md
+++ b/plugins/permission-react/CHANGELOG.md
@@ -1,5 +1,32 @@
 # @backstage/plugin-permission-react
 
+## 0.4.15-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-plugin-api@1.6.0-next.2
+  - @backstage/config@1.1.0-next.1
+  - @backstage/plugin-permission-common@0.7.8-next.1
+
+## 0.4.15-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config@1.1.0-next.0
+  - @backstage/core-plugin-api@1.6.0-next.1
+  - @backstage/plugin-permission-common@0.7.8-next.0
+
+## 0.4.15-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-plugin-api@1.6.0-next.0
+  - @backstage/config@1.0.8
+  - @backstage/plugin-permission-common@0.7.7
+
 ## 0.4.14
 
 ### Patch Changes
diff --git a/plugins/permission-react/api-report.md b/plugins/permission-react/api-report.md
index 293343b7ac..3c1961c92c 100644
--- a/plugins/permission-react/api-report.md
+++ b/plugins/permission-react/api-report.md
@@ -12,6 +12,7 @@ import { EvaluatePermissionRequest } from '@backstage/plugin-permission-common';
 import { EvaluatePermissionResponse } from '@backstage/plugin-permission-common';
 import { IdentityApi } from '@backstage/core-plugin-api';
 import { Permission } from '@backstage/plugin-permission-common';
+import { default as React_2 } from 'react';
 import { ReactElement } from 'react';
 import { ReactNode } from 'react';
 import { ResourcePermission } from '@backstage/plugin-permission-common';
@@ -65,7 +66,7 @@ export const PermissionedRoute: (
         resourceRef: string | undefined;
       }
   ),
-) => JSX.Element;
+) => React_2.JSX.Element;
 
 // @public
 export function RequirePermission(
diff --git a/plugins/permission-react/catalog-info.yaml b/plugins/permission-react/catalog-info.yaml
new file mode 100644
index 0000000000..119f7320ab
--- /dev/null
+++ b/plugins/permission-react/catalog-info.yaml
@@ -0,0 +1,9 @@
+apiVersion: backstage.io/v1alpha1
+kind: Component
+metadata:
+  name: backstage-plugin-permission-react
+  title: '@backstage/plugin-permission-react'
+spec:
+  lifecycle: experimental
+  type: backstage-web-library
+  owner: permission-maintainers
diff --git a/plugins/permission-react/package.json b/plugins/permission-react/package.json
index a8308b5a75..8c7c410909 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.14",
+  "version": "0.4.15-next.2",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
@@ -21,6 +21,7 @@
   "keywords": [
     "backstage"
   ],
+  "sideEffects": false,
   "scripts": {
     "build": "backstage-cli package build",
     "lint": "backstage-cli package lint",
diff --git a/plugins/playlist-backend/CHANGELOG.md b/plugins/playlist-backend/CHANGELOG.md
index f55ad9991e..cd800dabd1 100644
--- a/plugins/playlist-backend/CHANGELOG.md
+++ b/plugins/playlist-backend/CHANGELOG.md
@@ -1,5 +1,75 @@
 # @backstage/plugin-playlist-backend
 
+## 0.3.7-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config@1.1.0-next.1
+  - @backstage/backend-common@0.19.5-next.2
+  - @backstage/plugin-auth-node@0.3.0-next.2
+  - @backstage/plugin-permission-node@0.7.14-next.2
+  - @backstage/catalog-model@1.4.2-next.1
+  - @backstage/plugin-permission-common@0.7.8-next.1
+  - @backstage/catalog-client@1.4.4-next.1
+  - @backstage/errors@1.2.1
+  - @backstage/plugin-playlist-common@0.1.10-next.1
+
+## 0.3.7-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config@1.1.0-next.0
+  - @backstage/backend-common@0.19.5-next.1
+  - @backstage/catalog-model@1.4.2-next.0
+  - @backstage/plugin-auth-node@0.3.0-next.1
+  - @backstage/plugin-permission-common@0.7.8-next.0
+  - @backstage/plugin-permission-node@0.7.14-next.1
+  - @backstage/catalog-client@1.4.4-next.0
+  - @backstage/errors@1.2.1
+  - @backstage/plugin-playlist-common@0.1.10-next.0
+
+## 0.3.6-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-auth-node@0.3.0-next.0
+  - @backstage/backend-common@0.19.4-next.0
+  - @backstage/catalog-client@1.4.3
+  - @backstage/catalog-model@1.4.1
+  - @backstage/config@1.0.8
+  - @backstage/errors@1.2.1
+  - @backstage/plugin-permission-common@0.7.7
+  - @backstage/plugin-permission-node@0.7.13-next.0
+  - @backstage/plugin-playlist-common@0.1.9
+
+## 0.3.4
+
+### Patch Changes
+
+- 12a8c94eda8d: Add package repository and homepage metadata
+- Updated dependencies
+  - @backstage/backend-common@0.19.2
+  - @backstage/plugin-playlist-common@0.1.9
+  - @backstage/plugin-auth-node@0.2.17
+  - @backstage/plugin-permission-node@0.7.11
+  - @backstage/catalog-client@1.4.3
+  - @backstage/catalog-model@1.4.1
+  - @backstage/config@1.0.8
+  - @backstage/errors@1.2.1
+  - @backstage/plugin-permission-common@0.7.7
+
+## 0.3.4-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.19.2-next.2
+  - @backstage/plugin-permission-node@0.7.11-next.2
+  - @backstage/plugin-auth-node@0.2.17-next.2
+
 ## 0.3.4-next.1
 
 ### Patch Changes
diff --git a/plugins/playlist-backend/catalog-info.yaml b/plugins/playlist-backend/catalog-info.yaml
new file mode 100644
index 0000000000..79bdfd41da
--- /dev/null
+++ b/plugins/playlist-backend/catalog-info.yaml
@@ -0,0 +1,9 @@
+apiVersion: backstage.io/v1alpha1
+kind: Component
+metadata:
+  name: backstage-plugin-playlist-backend
+  title: '@backstage/plugin-playlist-backend'
+spec:
+  lifecycle: experimental
+  type: backstage-backend-plugin
+  owner: kuangp
diff --git a/plugins/playlist-backend/package.json b/plugins/playlist-backend/package.json
index 5285406e58..39670326ce 100644
--- a/plugins/playlist-backend/package.json
+++ b/plugins/playlist-backend/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-playlist-backend",
-  "version": "0.3.4-next.1",
+  "version": "0.3.7-next.2",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
diff --git a/plugins/playlist-common/CHANGELOG.md b/plugins/playlist-common/CHANGELOG.md
index ed624302c5..9dcc158cc7 100644
--- a/plugins/playlist-common/CHANGELOG.md
+++ b/plugins/playlist-common/CHANGELOG.md
@@ -1,5 +1,27 @@
 # @backstage/plugin-playlist-common
 
+## 0.1.10-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-permission-common@0.7.8-next.1
+
+## 0.1.10-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-permission-common@0.7.8-next.0
+
+## 0.1.9
+
+### Patch Changes
+
+- 12a8c94eda8d: Add package repository and homepage metadata
+- Updated dependencies
+  - @backstage/plugin-permission-common@0.7.7
+
 ## 0.1.9-next.0
 
 ### Patch Changes
diff --git a/plugins/playlist-common/catalog-info.yaml b/plugins/playlist-common/catalog-info.yaml
new file mode 100644
index 0000000000..9367544c2c
--- /dev/null
+++ b/plugins/playlist-common/catalog-info.yaml
@@ -0,0 +1,10 @@
+apiVersion: backstage.io/v1alpha1
+kind: Component
+metadata:
+  name: backstage-plugin-playlist-common
+  title: '@backstage/plugin-playlist-common'
+  description: Common functionalities for the playlist plugin
+spec:
+  lifecycle: experimental
+  type: backstage-common-library
+  owner: kuangp
diff --git a/plugins/playlist-common/package.json b/plugins/playlist-common/package.json
index 2ac82b4852..31ca2492a6 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.9-next.0",
+  "version": "0.1.10-next.1",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
@@ -20,6 +20,7 @@
     "url": "https://github.com/backstage/backstage",
     "directory": "plugins/playlist-common"
   },
+  "sideEffects": false,
   "scripts": {
     "build": "backstage-cli package build",
     "lint": "backstage-cli package lint",
diff --git a/plugins/playlist/CHANGELOG.md b/plugins/playlist/CHANGELOG.md
index 3850cc3e5d..5590049552 100644
--- a/plugins/playlist/CHANGELOG.md
+++ b/plugins/playlist/CHANGELOG.md
@@ -1,5 +1,88 @@
 # @backstage/plugin-playlist
 
+## 0.1.16-next.2
+
+### Patch Changes
+
+- 79847cb73ed7: Updated latest playlist screen in readme document
+- 8cec7664e146: Removed `@types/node` dependency
+- Updated dependencies
+  - @backstage/core-components@0.13.5-next.2
+  - @backstage/core-plugin-api@1.6.0-next.2
+  - @backstage/plugin-catalog-react@1.8.4-next.2
+  - @backstage/plugin-search-react@1.7.0-next.2
+  - @backstage/plugin-permission-react@0.4.15-next.2
+  - @backstage/catalog-model@1.4.2-next.1
+  - @backstage/plugin-permission-common@0.7.8-next.1
+  - @backstage/errors@1.2.1
+  - @backstage/theme@0.4.1
+  - @backstage/plugin-catalog-common@1.0.16-next.1
+  - @backstage/plugin-playlist-common@0.1.10-next.1
+
+## 0.1.16-next.1
+
+### Patch Changes
+
+- ec4b0f8cd957: change color of delete icon to secondary in playlist table
+- b5ba33a92750: Limit the use of the same playlist name when adding a playlist
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.8.4-next.1
+  - @backstage/core-components@0.13.5-next.1
+  - @backstage/plugin-search-react@1.7.0-next.1
+  - @backstage/catalog-model@1.4.2-next.0
+  - @backstage/core-plugin-api@1.6.0-next.1
+  - @backstage/plugin-permission-common@0.7.8-next.0
+  - @backstage/plugin-permission-react@0.4.15-next.1
+  - @backstage/plugin-catalog-common@1.0.16-next.0
+  - @backstage/errors@1.2.1
+  - @backstage/theme@0.4.1
+  - @backstage/plugin-playlist-common@0.1.10-next.0
+
+## 0.1.15-next.0
+
+### Patch Changes
+
+- 482bb5c0bbf8: Moved `@types/react` to be a regular dependency
+- Updated dependencies
+  - @backstage/core-plugin-api@1.6.0-next.0
+  - @backstage/core-components@0.13.5-next.0
+  - @backstage/catalog-model@1.4.1
+  - @backstage/errors@1.2.1
+  - @backstage/theme@0.4.1
+  - @backstage/plugin-catalog-common@1.0.15
+  - @backstage/plugin-catalog-react@1.8.3-next.0
+  - @backstage/plugin-permission-common@0.7.7
+  - @backstage/plugin-permission-react@0.4.15-next.0
+  - @backstage/plugin-playlist-common@0.1.9
+  - @backstage/plugin-search-react@1.6.5-next.0
+
+## 0.1.13
+
+### Patch Changes
+
+- d1e0588324d1: Displaying an alert popup each time the Playlist is created or deleted
+- 12a8c94eda8d: Add package repository and homepage metadata
+- 8a997547f02a: Adding alert popup whenever user delete the entities from playlist entity table
+- Updated dependencies
+  - @backstage/plugin-playlist-common@0.1.9
+  - @backstage/core-components@0.13.4
+  - @backstage/plugin-catalog-react@1.8.1
+  - @backstage/core-plugin-api@1.5.3
+  - @backstage/plugin-search-react@1.6.4
+  - @backstage/catalog-model@1.4.1
+  - @backstage/errors@1.2.1
+  - @backstage/theme@0.4.1
+  - @backstage/plugin-catalog-common@1.0.15
+  - @backstage/plugin-permission-common@0.7.7
+  - @backstage/plugin-permission-react@0.4.14
+
+## 0.1.13-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.8.1-next.1
+
 ## 0.1.13-next.1
 
 ### Patch Changes
diff --git a/plugins/playlist/README.md b/plugins/playlist/README.md
index e35f94b9e5..25caa02742 100644
--- a/plugins/playlist/README.md
+++ b/plugins/playlist/README.md
@@ -154,6 +154,10 @@ playlist:
 
 ![Create New Playlist example](./docs/playlist-create-new.png)
 
+### Edit Existing Playlist
+
+![Edit Existing Playlist example](./docs/playlist-edit-existing.png)
+
 ### Add Entities to Playlist
 
 ![Add Entities to Playlist example](./docs/playlist-add-entities.png)
diff --git a/plugins/playlist/api-report.md b/plugins/playlist/api-report.md
index 7a732a4a53..cf0ebe8a37 100644
--- a/plugins/playlist/api-report.md
+++ b/plugins/playlist/api-report.md
@@ -10,6 +10,7 @@ import { BackstagePlugin } from '@backstage/core-plugin-api';
 import { DiscoveryApi } from '@backstage/core-plugin-api';
 import { Entity } from '@backstage/catalog-model';
 import { FetchApi } from '@backstage/core-plugin-api';
+import { JSX as JSX_2 } from 'react';
 import { Playlist } from '@backstage/plugin-playlist-common';
 import { PlaylistMetadata } from '@backstage/plugin-playlist-common';
 import { RouteRef } from '@backstage/core-plugin-api';
@@ -17,7 +18,7 @@ import { RouteRef } from '@backstage/core-plugin-api';
 // @public (undocumented)
 export const EntityPlaylistDialog: (
   props: EntityPlaylistDialogProps,
-) => JSX.Element;
+) => JSX_2.Element;
 
 // @public (undocumented)
 export type EntityPlaylistDialogProps = {
@@ -93,7 +94,7 @@ export class PlaylistClient implements PlaylistApi {
 }
 
 // @public (undocumented)
-export const PlaylistIndexPage: () => JSX.Element;
+export const PlaylistIndexPage: () => JSX_2.Element;
 
 // @public (undocumented)
 export const playlistPlugin: BackstagePlugin<
diff --git a/plugins/playlist/catalog-info.yaml b/plugins/playlist/catalog-info.yaml
new file mode 100644
index 0000000000..1b8eaaabb0
--- /dev/null
+++ b/plugins/playlist/catalog-info.yaml
@@ -0,0 +1,9 @@
+apiVersion: backstage.io/v1alpha1
+kind: Component
+metadata:
+  name: backstage-plugin-playlist
+  title: '@backstage/plugin-playlist'
+spec:
+  lifecycle: experimental
+  type: backstage-frontend-plugin
+  owner: kuangp
diff --git a/plugins/playlist/docs/playlist-edit-existing.png b/plugins/playlist/docs/playlist-edit-existing.png
new file mode 100644
index 0000000000..64d3bc1381
Binary files /dev/null and b/plugins/playlist/docs/playlist-edit-existing.png differ
diff --git a/plugins/playlist/docs/playlist-view-single.png b/plugins/playlist/docs/playlist-view-single.png
index 0890c5013b..04f62bdee1 100644
Binary files a/plugins/playlist/docs/playlist-view-single.png and b/plugins/playlist/docs/playlist-view-single.png differ
diff --git a/plugins/playlist/package.json b/plugins/playlist/package.json
index 69e02df8dd..90b206285e 100644
--- a/plugins/playlist/package.json
+++ b/plugins/playlist/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-playlist",
-  "version": "0.1.13-next.1",
+  "version": "0.1.16-next.2",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
@@ -18,6 +18,7 @@
     "url": "https://github.com/backstage/backstage",
     "directory": "plugins/playlist"
   },
+  "sideEffects": false,
   "scripts": {
     "start": "backstage-cli package start",
     "build": "backstage-cli package build",
@@ -42,6 +43,7 @@
     "@material-ui/core": "^4.12.2",
     "@material-ui/icons": "^4.9.1",
     "@material-ui/lab": "4.0.0-alpha.61",
+    "@types/react": "^16.13.1 || ^17.0.0",
     "lodash": "^4.17.21",
     "pluralize": "^8.0.0",
     "qs": "^6.9.4",
@@ -63,8 +65,6 @@
     "@testing-library/react": "^12.1.3",
     "@testing-library/react-hooks": "^8.0.0",
     "@testing-library/user-event": "^14.0.0",
-    "@types/node": "*",
-    "@types/react": "^16.13.1 || ^17.0.0",
     "msw": "^1.0.0",
     "swr": "^2.0.0"
   },
diff --git a/plugins/playlist/src/components/PlaylistEditDialog/PlaylistEditDialog.test.tsx b/plugins/playlist/src/components/PlaylistEditDialog/PlaylistEditDialog.test.tsx
index 9f30d7608c..b01b5acbf2 100644
--- a/plugins/playlist/src/components/PlaylistEditDialog/PlaylistEditDialog.test.tsx
+++ b/plugins/playlist/src/components/PlaylistEditDialog/PlaylistEditDialog.test.tsx
@@ -18,11 +18,32 @@ import { IdentityApi, identityApiRef } from '@backstage/core-plugin-api';
 import { renderInTestApp, TestApiProvider } from '@backstage/test-utils';
 import { fireEvent, getByRole, waitFor } from '@testing-library/react';
 import { act } from '@testing-library/react-hooks';
+import { PlaylistApi, playlistApiRef } from '../../api';
 import React from 'react';
 
 import { PlaylistEditDialog } from './PlaylistEditDialog';
 
 describe('<PlaylistEditDialog/>', () => {
+  const samplePlaylists = [
+    {
+      id: 'id1',
+      name: 'playlist-1',
+      owner: 'group:default/some-owner',
+      public: true,
+      entities: 1,
+      followers: 2,
+      isFollowing: false,
+    },
+    {
+      id: 'id2',
+      name: 'playlist-2',
+      owner: 'group:default/another-owner',
+      public: true,
+      entities: 2,
+      followers: 1,
+      isFollowing: true,
+    },
+  ];
   it('handle saving with an edited playlist', async () => {
     const identityApi: Partial<IdentityApi> = {
       getBackstageIdentity: async () => ({
@@ -33,8 +54,18 @@ describe('<PlaylistEditDialog/>', () => {
     };
 
     const mockOnSave = jest.fn().mockImplementation(async () => {});
+    const playlistApi: Partial<PlaylistApi> = {
+      getAllPlaylists: jest
+        .fn()
+        .mockImplementation(async () => samplePlaylists),
+    };
     const rendered = await renderInTestApp(
-      <TestApiProvider apis={[[identityApiRef, identityApi]]}>
+      <TestApiProvider
+        apis={[
+          [identityApiRef, identityApi],
+          [playlistApiRef, playlistApi],
+        ]}
+      >
         <PlaylistEditDialog open onClose={jest.fn()} onSave={mockOnSave} />
       </TestApiProvider>,
     );
@@ -83,4 +114,53 @@ describe('<PlaylistEditDialog/>', () => {
       });
     });
   });
+
+  it('displays duplicate validation message for playlist name', async () => {
+    const identityApi: Partial<IdentityApi> = {
+      getBackstageIdentity: async () => ({
+        type: 'user',
+        userEntityRef: 'user:default/me',
+        ownershipEntityRefs: ['group:default/test-owner', 'user:default/me'],
+      }),
+    };
+
+    const mockOnSave = jest.fn().mockImplementation(async () => {});
+    const playlistApi: Partial<PlaylistApi> = {
+      getAllPlaylists: jest
+        .fn()
+        .mockImplementation(async () => [...samplePlaylists]),
+    };
+
+    const rendered = await renderInTestApp(
+      <TestApiProvider
+        apis={[
+          [identityApiRef, identityApi],
+          [playlistApiRef, playlistApi],
+        ]}
+      >
+        <PlaylistEditDialog open onClose={jest.fn()} onSave={mockOnSave} />
+      </TestApiProvider>,
+    );
+
+    act(() => {
+      fireEvent.input(
+        getByRole(rendered.getByTestId('edit-dialog-name-input'), 'textbox'),
+        {
+          target: {
+            value: 'playlist-1',
+          },
+        },
+      );
+
+      fireEvent.click(rendered.getByTestId('edit-dialog-save-button'));
+    });
+
+    await waitFor(() => {
+      expect(
+        rendered.getByText('A playlist with this name already exists'),
+      ).toBeInTheDocument();
+    });
+
+    expect(mockOnSave).not.toHaveBeenCalled();
+  });
 });
diff --git a/plugins/playlist/src/components/PlaylistEditDialog/PlaylistEditDialog.tsx b/plugins/playlist/src/components/PlaylistEditDialog/PlaylistEditDialog.tsx
index a213c7c51c..97bd4728b9 100644
--- a/plugins/playlist/src/components/PlaylistEditDialog/PlaylistEditDialog.tsx
+++ b/plugins/playlist/src/components/PlaylistEditDialog/PlaylistEditDialog.tsx
@@ -18,6 +18,7 @@ import { parseEntityRef } from '@backstage/catalog-model';
 import { identityApiRef, useApi } from '@backstage/core-plugin-api';
 import { humanizeEntityRef } from '@backstage/plugin-catalog-react';
 import { PlaylistMetadata } from '@backstage/plugin-playlist-common';
+import { playlistApiRef } from '../../api';
 import {
   Button,
   CircularProgress,
@@ -35,7 +36,7 @@ import {
   Select,
   TextField,
 } from '@material-ui/core';
-import React from 'react';
+import React, { useState } from 'react';
 import { useForm, Controller } from 'react-hook-form';
 import useAsync from 'react-use/lib/useAsync';
 import useAsyncFn from 'react-use/lib/useAsyncFn';
@@ -74,6 +75,13 @@ export const PlaylistEditDialog = ({
 }: PlaylistEditDialogProps) => {
   const classes = useStyles();
   const identityApi = useApi(identityApiRef);
+  const playlistApi = useApi(playlistApiRef);
+  const [playlistPromise] = useState(() =>
+    playlistApi.getAllPlaylists({}).catch(() => {
+      // We ensure that this promise never can throw, to make its usage simpler in the code below
+      return [];
+    }),
+  );
 
   const { loading: loadingOwnership, value: ownershipRefs } =
     useAsync(async () => {
@@ -81,6 +89,15 @@ export const PlaylistEditDialog = ({
       return ownershipEntityRefs;
     }, []);
 
+  const nameIsUnique = async (name: string) => {
+    const playlists = await playlistPromise;
+    if (name !== playlist.name && playlists.some(p => p.name === name)) {
+      return 'A playlist with this name already exists';
+    }
+
+    return true;
+  };
+
   const defaultValues = {
     ...playlist,
     public: playlist.public.toString(),
@@ -117,13 +134,17 @@ export const PlaylistEditDialog = ({
         <Controller
           name="name"
           control={control}
-          rules={{ required: true }}
+          rules={{
+            required: true,
+            validate: value => nameIsUnique(value),
+          }}
           render={({ field }) => (
             <TextField
               {...field}
               disabled={saving.loading}
               data-testid="edit-dialog-name-input"
               error={!!errors.name}
+              helperText={errors.name?.message}
               fullWidth
               label="Name"
               margin="dense"
diff --git a/plugins/playlist/src/components/PlaylistPage/AddEntitiesDrawer.tsx b/plugins/playlist/src/components/PlaylistPage/AddEntitiesDrawer.tsx
index fe08870bcd..d5a52dc83c 100644
--- a/plugins/playlist/src/components/PlaylistPage/AddEntitiesDrawer.tsx
+++ b/plugins/playlist/src/components/PlaylistPage/AddEntitiesDrawer.tsx
@@ -58,7 +58,8 @@ const useStyles = makeStyles((theme: Theme) =>
     searchBarContainer: {
       borderRadius: 30,
       display: 'flex',
-      height: '2.4em',
+      height: '100%',
+      boxShadow: 'none',
     },
     gridContainer: {
       height: '100%',
diff --git a/plugins/playlist/src/components/PlaylistPage/PlaylistEntitiesTable.tsx b/plugins/playlist/src/components/PlaylistPage/PlaylistEntitiesTable.tsx
index 3d8efe3bc5..c74859ce20 100644
--- a/plugins/playlist/src/components/PlaylistPage/PlaylistEntitiesTable.tsx
+++ b/plugins/playlist/src/components/PlaylistPage/PlaylistEntitiesTable.tsx
@@ -21,7 +21,7 @@ import {
   Table,
   TableFilter,
 } from '@backstage/core-components';
-import { errorApiRef, useApi } from '@backstage/core-plugin-api';
+import { errorApiRef, useApi, alertApiRef } from '@backstage/core-plugin-api';
 import { EntityRefLink } from '@backstage/plugin-catalog-react';
 import { usePermission } from '@backstage/plugin-permission-react';
 import { permissions } from '@backstage/plugin-playlist-common';
@@ -42,6 +42,7 @@ export const PlaylistEntitiesTable = ({
 }) => {
   const errorApi = useApi(errorApiRef);
   const playlistApi = useApi(playlistApiRef);
+  const alertApi = useApi(alertApiRef);
   const [openAddEntitiesDrawer, setOpenAddEntitiesDrawer] = useState(false);
 
   const { allowed: editAllowed } = usePermission({
@@ -73,16 +74,30 @@ export const PlaylistEntitiesTable = ({
   const removeEntity = useCallback(
     async (_, entity: Entity | Entity[]) => {
       try {
+        const entityArray = [entity].flat();
+        const entityNames = entityArray.map(
+          item => item.metadata.title ?? item.metadata.name,
+        );
         await playlistApi.removePlaylistEntities(
           playlistId,
           [entity].flat().map(stringifyEntityRef),
         );
         loadEntities();
+        const message =
+          entityNames.length === 1
+            ? `Removed entity '${entityNames[0]}'`
+            : `Removed entities: '${entityNames.join("', '")}'`;
+
+        alertApi.post({
+          message,
+          severity: 'success',
+          display: 'transient',
+        });
       } catch (e) {
         errorApi.post(e);
       }
     },
-    [errorApi, loadEntities, playlistApi, playlistId],
+    [errorApi, loadEntities, playlistApi, playlistId, alertApi],
   );
 
   const singularTitleLowerCase = useTitle({
@@ -93,7 +108,7 @@ export const PlaylistEntitiesTable = ({
   const actions = editAllowed
     ? [
         {
-          icon: DeleteIcon,
+          icon: () => <DeleteIcon color="secondary" />,
           tooltip: `Remove from ${singularTitleLowerCase}`,
           onClick: removeEntity,
         },
diff --git a/plugins/playlist/src/components/PlaylistPage/PlaylistHeader.tsx b/plugins/playlist/src/components/PlaylistPage/PlaylistHeader.tsx
index f892e8de7f..23a41b734b 100644
--- a/plugins/playlist/src/components/PlaylistPage/PlaylistHeader.tsx
+++ b/plugins/playlist/src/components/PlaylistPage/PlaylistHeader.tsx
@@ -81,6 +81,7 @@ export const PlaylistHeader = ({ playlist, onUpdate }: PlaylistHeaderProps) => {
   const playlistApi = useApi(playlistApiRef);
   const navigate = useNavigate();
   const rootRoute = useRouteRef(rootRouteRef);
+
   const [openEditDialog, setOpenEditDialog] = useState(false);
   const [openDeleteDialog, setOpenDeleteDialog] = useState(false);
 
@@ -99,12 +100,17 @@ export const PlaylistHeader = ({ playlist, onUpdate }: PlaylistHeaderProps) => {
       try {
         await playlistApi.updatePlaylist({ ...update, id: playlist.id });
         setOpenEditDialog(false);
-        onUpdate();
+        let message = `Updated playlist '${playlist.name}'`;
+        if (update.name !== playlist.name) {
+          message = `Updated playlist name '${playlist.name}' to '${update.name}'`;
+        }
+
         alertApi.post({
-          message: `Updated playlist '${playlist.name}'`,
+          message,
           severity: 'success',
           display: 'transient',
         });
+        onUpdate();
       } catch (e) {
         errorApi.post(e);
       }
@@ -116,15 +122,16 @@ export const PlaylistHeader = ({ playlist, onUpdate }: PlaylistHeaderProps) => {
     try {
       await playlistApi.deletePlaylist(playlist.id);
       navigate(rootRoute());
+      const message = `Deleted playlist '${playlist.name}'`;
       alertApi.post({
-        message: `Deleted playlist '${playlist.name}'`,
+        message,
         severity: 'success',
         display: 'transient',
       });
     } catch (e) {
       errorApi.post(e);
     }
-  }, [playlistApi]);
+  }, [playlistApi, alertApi]);
 
   const singularTitle = useTitle({
     pluralize: false,
@@ -166,7 +173,7 @@ export const PlaylistHeader = ({ playlist, onUpdate }: PlaylistHeaderProps) => {
           },
           {
             label: `Delete ${singularTitle}`,
-            icon: <DeleteIcon />,
+            icon: <DeleteIcon color="secondary" />,
             disabled: !deleteAllowed,
             onClick: () => setOpenDeleteDialog(true),
           },
diff --git a/plugins/proxy-backend/CHANGELOG.md b/plugins/proxy-backend/CHANGELOG.md
index 4a9e2bdb70..92211efac1 100644
--- a/plugins/proxy-backend/CHANGELOG.md
+++ b/plugins/proxy-backend/CHANGELOG.md
@@ -1,5 +1,59 @@
 # @backstage/plugin-proxy-backend
 
+## 0.3.3-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config@1.1.0-next.1
+  - @backstage/backend-common@0.19.5-next.2
+  - @backstage/backend-plugin-api@0.6.3-next.2
+
+## 0.3.3-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config@1.1.0-next.0
+  - @backstage/backend-common@0.19.5-next.1
+  - @backstage/backend-plugin-api@0.6.3-next.1
+
+## 0.3.2-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.19.4-next.0
+  - @backstage/backend-plugin-api@0.6.2-next.0
+  - @backstage/config@1.0.8
+
+## 0.3.0
+
+### Minor Changes
+
+- 7daf65bfcfa1: Defining proxy endpoints directly under the root `proxy` configuration key is deprecated. Endpoints should now be declared under `proxy.endpoints` instead. The `skipInvalidProxies` and `reviveConsumedRequestBodies` can now also be configured through static configuration.
+
+### Patch Changes
+
+- 629cbd194a87: Use `coreServices.rootConfig` instead of `coreService.config`
+- 4b82382ed8c2: Fixed invalid configuration schema. The configuration schema may be more strict as a result.
+- Updated dependencies
+  - @backstage/backend-common@0.19.2
+  - @backstage/backend-plugin-api@0.6.0
+  - @backstage/config@1.0.8
+
+## 0.3.0-next.2
+
+### Minor Changes
+
+- 7daf65bfcfa1: Defining proxy endpoints directly under the root `proxy` configuration key is deprecated. Endpoints should now be declared under `proxy.endpoints` instead. The `skipInvalidProxies` and `reviveConsumedRequestBodies` can now also be configured through static configuration.
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@0.6.0-next.2
+  - @backstage/backend-common@0.19.2-next.2
+
 ## 0.2.42-next.1
 
 ### Patch Changes
diff --git a/plugins/proxy-backend/api-report.md b/plugins/proxy-backend/api-report.md
index 9c5cf5f9ef..ae327d485a 100644
--- a/plugins/proxy-backend/api-report.md
+++ b/plugins/proxy-backend/api-report.md
@@ -13,7 +13,8 @@ import { PluginEndpointDiscovery } from '@backstage/backend-common';
 export function createRouter(options: RouterOptions): Promise<express.Router>;
 
 // @alpha
-export const proxyPlugin: () => BackendFeature;
+const proxyPlugin: () => BackendFeature;
+export default proxyPlugin;
 
 // @public (undocumented)
 export interface RouterOptions {
diff --git a/plugins/proxy-backend/catalog-info.yaml b/plugins/proxy-backend/catalog-info.yaml
new file mode 100644
index 0000000000..a60112d9f3
--- /dev/null
+++ b/plugins/proxy-backend/catalog-info.yaml
@@ -0,0 +1,12 @@
+apiVersion: backstage.io/v1alpha1
+kind: Component
+metadata:
+  name: backstage-plugin-proxy-backend
+  title: '@backstage/plugin-proxy-backend'
+  description: >-
+    A Backstage backend plugin that helps you set up proxy endpoints in the
+    backend
+spec:
+  lifecycle: experimental
+  type: backstage-backend-plugin
+  owner: maintainers
diff --git a/plugins/proxy-backend/package.json b/plugins/proxy-backend/package.json
index 959c946d55..62a95cb5a7 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.42-next.1",
+  "version": "0.3.3-next.2",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
diff --git a/plugins/proxy-backend/src/index.ts b/plugins/proxy-backend/src/index.ts
index 2658a557b7..3163abd381 100644
--- a/plugins/proxy-backend/src/index.ts
+++ b/plugins/proxy-backend/src/index.ts
@@ -21,4 +21,4 @@
  */
 
 export * from './service';
-export { proxyPlugin } from './plugin';
+export { proxyPlugin as default } from './plugin';
diff --git a/plugins/puppetdb/CHANGELOG.md b/plugins/puppetdb/CHANGELOG.md
index dbd5fde6df..22f96ad52c 100644
--- a/plugins/puppetdb/CHANGELOG.md
+++ b/plugins/puppetdb/CHANGELOG.md
@@ -1,5 +1,62 @@
 # @backstage/plugin-puppetdb
 
+## 0.1.7-next.2
+
+### Patch Changes
+
+- 8cec7664e146: Removed `@types/node` dependency
+- Updated dependencies
+  - @backstage/core-components@0.13.5-next.2
+  - @backstage/core-plugin-api@1.6.0-next.2
+  - @backstage/plugin-catalog-react@1.8.4-next.2
+  - @backstage/catalog-model@1.4.2-next.1
+  - @backstage/errors@1.2.1
+  - @backstage/theme@0.4.1
+
+## 0.1.7-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.8.4-next.1
+  - @backstage/core-components@0.13.5-next.1
+  - @backstage/catalog-model@1.4.2-next.0
+  - @backstage/core-plugin-api@1.6.0-next.1
+  - @backstage/errors@1.2.1
+  - @backstage/theme@0.4.1
+
+## 0.1.6-next.0
+
+### Patch Changes
+
+- 482bb5c0bbf8: Moved `@types/react` to be a regular dependency
+- Updated dependencies
+  - @backstage/core-plugin-api@1.6.0-next.0
+  - @backstage/core-components@0.13.5-next.0
+  - @backstage/catalog-model@1.4.1
+  - @backstage/errors@1.2.1
+  - @backstage/theme@0.4.1
+  - @backstage/plugin-catalog-react@1.8.3-next.0
+
+## 0.1.4
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.13.4
+  - @backstage/plugin-catalog-react@1.8.1
+  - @backstage/core-plugin-api@1.5.3
+  - @backstage/catalog-model@1.4.1
+  - @backstage/errors@1.2.1
+  - @backstage/theme@0.4.1
+
+## 0.1.4-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.8.1-next.1
+
 ## 0.1.4-next.0
 
 ### Patch Changes
diff --git a/plugins/puppetdb/api-report.md b/plugins/puppetdb/api-report.md
index 48a3276460..c7d1d0ff0e 100644
--- a/plugins/puppetdb/api-report.md
+++ b/plugins/puppetdb/api-report.md
@@ -7,7 +7,9 @@
 
 import { BackstagePlugin } from '@backstage/core-plugin-api';
 import { Entity } from '@backstage/catalog-model';
+import { JSX as JSX_2 } from 'react';
 import { PathParams } from '@backstage/core-plugin-api';
+import { default as React_2 } from 'react';
 import { RouteRef } from '@backstage/core-plugin-api';
 import { SubRouteRef } from '@backstage/core-plugin-api';
 
@@ -15,7 +17,7 @@ import { SubRouteRef } from '@backstage/core-plugin-api';
 export const isPuppetDbAvailable: (entity: Entity) => boolean;
 
 // @public
-export const PuppetDbPage: () => JSX.Element;
+export const PuppetDbPage: () => JSX_2.Element;
 
 // @public
 const puppetdbPlugin: BackstagePlugin<{}, {}, {}>;
@@ -29,7 +31,7 @@ export const puppetDbReportRouteRef: SubRouteRef<PathParams<'/:hash'>>;
 export const puppetDbRouteRef: RouteRef<undefined>;
 
 // @public (undocumented)
-export const Router: () => JSX.Element;
+export const Router: () => React_2.JSX.Element;
 
 // (No @packageDocumentation comment for this package)
 ```
diff --git a/plugins/puppetdb/catalog-info.yaml b/plugins/puppetdb/catalog-info.yaml
new file mode 100644
index 0000000000..98c8d34d81
--- /dev/null
+++ b/plugins/puppetdb/catalog-info.yaml
@@ -0,0 +1,12 @@
+apiVersion: backstage.io/v1alpha1
+kind: Component
+metadata:
+  name: backstage-plugin-puppetdb
+  title: '@backstage/plugin-puppetdb'
+  description: >-
+    Backstage plugin to visualize resource information and Puppet facts from
+    PuppetDB.
+spec:
+  lifecycle: experimental
+  type: backstage-frontend-plugin
+  owner: maintainers
diff --git a/plugins/puppetdb/package.json b/plugins/puppetdb/package.json
index ef9370200e..8596213746 100644
--- a/plugins/puppetdb/package.json
+++ b/plugins/puppetdb/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@backstage/plugin-puppetdb",
   "description": "Backstage plugin to visualize resource information and Puppet facts from PuppetDB.",
-  "version": "0.1.4-next.0",
+  "version": "0.1.7-next.2",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
@@ -24,6 +24,7 @@
     "puppetdb",
     "puppet"
   ],
+  "sideEffects": false,
   "scripts": {
     "start": "backstage-cli package start",
     "build": "backstage-cli package build",
@@ -43,6 +44,7 @@
     "@material-ui/core": "^4.12.2",
     "@material-ui/icons": "^4.9.1",
     "@material-ui/lab": "^4.0.0-alpha.57",
+    "@types/react": "^16.13.1 || ^17.0.0",
     "react-use": "^17.2.4"
   },
   "peerDependencies": {
@@ -58,8 +60,6 @@
     "@testing-library/jest-dom": "^5.10.1",
     "@testing-library/react": "^12.1.3",
     "@testing-library/user-event": "^14.0.0",
-    "@types/node": "*",
-    "@types/react": "^16.13.1 || ^17.0.0",
     "msw": "^1.0.1"
   },
   "files": [
diff --git a/plugins/rollbar-backend/CHANGELOG.md b/plugins/rollbar-backend/CHANGELOG.md
index 9789127cc4..a09b37a21e 100644
--- a/plugins/rollbar-backend/CHANGELOG.md
+++ b/plugins/rollbar-backend/CHANGELOG.md
@@ -1,5 +1,44 @@
 # @backstage/plugin-rollbar-backend
 
+## 0.1.48-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config@1.1.0-next.1
+  - @backstage/backend-common@0.19.5-next.2
+
+## 0.1.48-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config@1.1.0-next.0
+  - @backstage/backend-common@0.19.5-next.1
+
+## 0.1.47-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.19.4-next.0
+  - @backstage/config@1.0.8
+
+## 0.1.45
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.19.2
+  - @backstage/config@1.0.8
+
+## 0.1.45-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.19.2-next.2
+
 ## 0.1.45-next.1
 
 ### Patch Changes
diff --git a/plugins/rollbar-backend/catalog-info.yaml b/plugins/rollbar-backend/catalog-info.yaml
new file mode 100644
index 0000000000..132695d53b
--- /dev/null
+++ b/plugins/rollbar-backend/catalog-info.yaml
@@ -0,0 +1,10 @@
+apiVersion: backstage.io/v1alpha1
+kind: Component
+metadata:
+  name: backstage-plugin-rollbar-backend
+  title: '@backstage/plugin-rollbar-backend'
+  description: A Backstage backend plugin that integrates towards Rollbar
+spec:
+  lifecycle: experimental
+  type: backstage-backend-plugin
+  owner: andrewthauer
diff --git a/plugins/rollbar-backend/package.json b/plugins/rollbar-backend/package.json
index 3def2395f1..b9bae6c5eb 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.45-next.1",
+  "version": "0.1.48-next.2",
   "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 6bacf806bc..f6da79d81b 100644
--- a/plugins/rollbar/CHANGELOG.md
+++ b/plugins/rollbar/CHANGELOG.md
@@ -1,5 +1,58 @@
 # @backstage/plugin-rollbar
 
+## 0.4.24-next.2
+
+### Patch Changes
+
+- 8cec7664e146: Removed `@types/node` dependency
+- Updated dependencies
+  - @backstage/core-components@0.13.5-next.2
+  - @backstage/core-plugin-api@1.6.0-next.2
+  - @backstage/plugin-catalog-react@1.8.4-next.2
+  - @backstage/catalog-model@1.4.2-next.1
+  - @backstage/theme@0.4.1
+
+## 0.4.24-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.8.4-next.1
+  - @backstage/core-components@0.13.5-next.1
+  - @backstage/catalog-model@1.4.2-next.0
+  - @backstage/core-plugin-api@1.6.0-next.1
+  - @backstage/theme@0.4.1
+
+## 0.4.23-next.0
+
+### Patch Changes
+
+- 482bb5c0bbf8: Moved `@types/react` to be a regular dependency
+- Updated dependencies
+  - @backstage/core-plugin-api@1.6.0-next.0
+  - @backstage/core-components@0.13.5-next.0
+  - @backstage/catalog-model@1.4.1
+  - @backstage/theme@0.4.1
+  - @backstage/plugin-catalog-react@1.8.3-next.0
+
+## 0.4.21
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.13.4
+  - @backstage/plugin-catalog-react@1.8.1
+  - @backstage/core-plugin-api@1.5.3
+  - @backstage/catalog-model@1.4.1
+  - @backstage/theme@0.4.1
+
+## 0.4.21-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.8.1-next.1
+
 ## 0.4.21-next.0
 
 ### Patch Changes
diff --git a/plugins/rollbar/api-report.md b/plugins/rollbar/api-report.md
index 5ee8a50ce3..45c672e7bb 100644
--- a/plugins/rollbar/api-report.md
+++ b/plugins/rollbar/api-report.md
@@ -10,13 +10,15 @@ import { BackstagePlugin } from '@backstage/core-plugin-api';
 import { DiscoveryApi } from '@backstage/core-plugin-api';
 import { Entity } from '@backstage/catalog-model';
 import { IdentityApi } from '@backstage/core-plugin-api';
+import { JSX as JSX_2 } from 'react';
+import { default as React_2 } from 'react';
 import { RouteRef } from '@backstage/core-plugin-api';
 
 // @public (undocumented)
-export const EntityPageRollbar: () => JSX.Element;
+export const EntityPageRollbar: () => React_2.JSX.Element;
 
 // @public (undocumented)
-export const EntityRollbarContent: () => JSX.Element;
+export const EntityRollbarContent: () => JSX_2.Element;
 
 // @public (undocumented)
 const isPluginApplicableToEntity: (entity: Entity) => boolean;
@@ -238,5 +240,5 @@ export type RollbarTopActiveItem = {
 };
 
 // @public (undocumented)
-export const Router: () => JSX.Element;
+export const Router: () => React_2.JSX.Element;
 ```
diff --git a/plugins/rollbar/catalog-info.yaml b/plugins/rollbar/catalog-info.yaml
new file mode 100644
index 0000000000..bc3f88019b
--- /dev/null
+++ b/plugins/rollbar/catalog-info.yaml
@@ -0,0 +1,10 @@
+apiVersion: backstage.io/v1alpha1
+kind: Component
+metadata:
+  name: backstage-plugin-rollbar
+  title: '@backstage/plugin-rollbar'
+  description: A Backstage plugin that integrates towards Rollbar
+spec:
+  lifecycle: experimental
+  type: backstage-frontend-plugin
+  owner: andrewthauer
diff --git a/plugins/rollbar/package.json b/plugins/rollbar/package.json
index 8c17895e48..e6183240d8 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.21-next.0",
+  "version": "0.4.24-next.2",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
@@ -23,6 +23,7 @@
     "backstage",
     "rollbar"
   ],
+  "sideEffects": false,
   "scripts": {
     "build": "backstage-cli package build",
     "start": "backstage-cli package start",
@@ -41,6 +42,7 @@
     "@material-ui/core": "^4.12.2",
     "@material-ui/icons": "^4.9.1",
     "@material-ui/lab": "4.0.0-alpha.61",
+    "@types/react": "^16.13.1 || ^17.0.0",
     "lodash": "^4.17.21",
     "react-sparklines": "^1.7.0",
     "react-use": "^17.2.4"
@@ -60,8 +62,6 @@
     "@testing-library/react": "^12.1.3",
     "@testing-library/react-hooks": "^8.0.0",
     "@testing-library/user-event": "^14.0.0",
-    "@types/node": "^16.11.26",
-    "@types/react": "^16.13.1 || ^17.0.0",
     "cross-fetch": "^3.1.5",
     "msw": "^1.0.0"
   },
diff --git a/plugins/scaffolder-backend-module-confluence-to-markdown/CHANGELOG.md b/plugins/scaffolder-backend-module-confluence-to-markdown/CHANGELOG.md
index ea3e24c720..c8216e84fe 100644
--- a/plugins/scaffolder-backend-module-confluence-to-markdown/CHANGELOG.md
+++ b/plugins/scaffolder-backend-module-confluence-to-markdown/CHANGELOG.md
@@ -1,5 +1,65 @@
 # @backstage/plugin-scaffolder-backend-module-confluence-to-markdown
 
+## 0.2.4-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config@1.1.0-next.1
+  - @backstage/backend-common@0.19.5-next.2
+  - @backstage/integration@1.7.0-next.2
+  - @backstage/plugin-scaffolder-node@0.2.3-next.2
+  - @backstage/errors@1.2.1
+  - @backstage/types@1.1.0
+
+## 0.2.4-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config@1.1.0-next.0
+  - @backstage/integration@1.7.0-next.1
+  - @backstage/backend-common@0.19.5-next.1
+  - @backstage/plugin-scaffolder-node@0.2.3-next.1
+  - @backstage/errors@1.2.1
+  - @backstage/types@1.1.0
+
+## 0.2.3-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.19.4-next.0
+  - @backstage/integration@1.7.0-next.0
+  - @backstage/config@1.0.8
+  - @backstage/errors@1.2.1
+  - @backstage/types@1.1.0
+  - @backstage/plugin-scaffolder-node@0.2.2-next.0
+
+## 0.2.1
+
+### Patch Changes
+
+- 0a9b3b14e904: Added example for the `confluence:transform:markdown` that will show in the installed actions list
+- 12a8c94eda8d: Add package repository and homepage metadata
+- 0d347efc8f18: Use `fetchContents` directly instead of a `fetchPlainAction`
+- c186c631b429: Import helpers from the node package instead of the backend package
+- Updated dependencies
+  - @backstage/backend-common@0.19.2
+  - @backstage/plugin-scaffolder-node@0.2.0
+  - @backstage/integration@1.6.0
+  - @backstage/config@1.0.8
+  - @backstage/errors@1.2.1
+  - @backstage/types@1.1.0
+
+## 0.2.1-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-scaffolder-node@0.1.6-next.2
+  - @backstage/backend-common@0.19.2-next.2
+
 ## 0.2.1-next.1
 
 ### Patch Changes
diff --git a/plugins/scaffolder-backend-module-confluence-to-markdown/catalog-info.yaml b/plugins/scaffolder-backend-module-confluence-to-markdown/catalog-info.yaml
new file mode 100644
index 0000000000..8daba65491
--- /dev/null
+++ b/plugins/scaffolder-backend-module-confluence-to-markdown/catalog-info.yaml
@@ -0,0 +1,10 @@
+apiVersion: backstage.io/v1alpha1
+kind: Component
+metadata:
+  name: backstage-plugin-scaffolder-backend-module-confluence-to-markdown
+  title: '@backstage/plugin-scaffolder-backend-module-confluence-to-markdown'
+  description: The confluence-to-markdown module for @backstage/plugin-scaffolder-backend
+spec:
+  lifecycle: experimental
+  type: backstage-backend-plugin-module
+  owner: maintainers
diff --git a/plugins/scaffolder-backend-module-confluence-to-markdown/package.json b/plugins/scaffolder-backend-module-confluence-to-markdown/package.json
index 0d342d1717..55edfabbd5 100644
--- a/plugins/scaffolder-backend-module-confluence-to-markdown/package.json
+++ b/plugins/scaffolder-backend-module-confluence-to-markdown/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@backstage/plugin-scaffolder-backend-module-confluence-to-markdown",
   "description": "The confluence-to-markdown module for @backstage/plugin-scaffolder-backend",
-  "version": "0.2.1-next.1",
+  "version": "0.2.4-next.2",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
diff --git a/plugins/scaffolder-backend-module-confluence-to-markdown/src/actions/confluence/confluenceToMarkdown.examples.test.ts b/plugins/scaffolder-backend-module-confluence-to-markdown/src/actions/confluence/confluenceToMarkdown.examples.test.ts
new file mode 100644
index 0000000000..e5aeadbf00
--- /dev/null
+++ b/plugins/scaffolder-backend-module-confluence-to-markdown/src/actions/confluence/confluenceToMarkdown.examples.test.ts
@@ -0,0 +1,162 @@
+/*
+ * 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 { PassThrough } from 'stream';
+import { createConfluenceToMarkdownAction } from './confluenceToMarkdown';
+import { getVoidLogger } from '@backstage/backend-common';
+import { UrlReader } from '@backstage/backend-common';
+import { ConfigReader } from '@backstage/config';
+import { ScmIntegrations } from '@backstage/integration';
+import { setupRequestMockHandlers } from '@backstage/backend-test-utils';
+import mockFs from 'mock-fs';
+import os from 'os';
+import { readFile, writeFile, createWriteStream } from 'fs-extra';
+import { rest } from 'msw';
+import { setupServer } from 'msw/node';
+import { examples } from './confluenceToMarkdown.examples';
+import yaml from 'yaml';
+import { ActionContext } from '@backstage/plugin-scaffolder-node';
+
+jest.mock('fs-extra', () => ({
+  mkdirSync: jest.fn(),
+  readFile: jest.fn().mockResolvedValue('File contents'),
+  writeFile: jest.fn().mockImplementation(() => {
+    return Promise.resolve();
+  }),
+  outputFile: jest.fn(),
+  openSync: jest.fn(),
+  createWriteStream: jest.fn().mockReturnValue(new PassThrough()),
+  ensureDir: jest.fn(),
+}));
+
+describe('confluence:transform:markdown examples', () => {
+  const baseUrl = `https://confluence.example.com`;
+  const worker = setupServer();
+  setupRequestMockHandlers(worker);
+
+  const config = new ConfigReader({
+    confluence: {
+      baseUrl: baseUrl,
+      auth: {
+        token: 'fake_token',
+      },
+    },
+  });
+
+  const integrations = ScmIntegrations.fromConfig(
+    new ConfigReader({
+      integrations: {
+        github: [{ host: 'github.com', token: 'token' }],
+      },
+    }),
+  );
+
+  let reader: UrlReader;
+  let mockContext: ActionContext<{
+    confluenceUrls: string[];
+    repoUrl: string;
+  }>;
+
+  const logger = getVoidLogger();
+  jest.spyOn(logger, 'info');
+
+  const mockTmpDir = os.tmpdir();
+
+  beforeEach(() => {
+    reader = {
+      readUrl: jest.fn(),
+      readTree: jest.fn().mockResolvedValue({
+        dir: jest.fn(),
+      }),
+      search: jest.fn(),
+    };
+    mockContext = {
+      input: yaml.parse(examples[0].example).steps[0].input,
+      workspacePath: '/tmp',
+      logger,
+      logStream: new PassThrough(),
+      output: jest.fn(),
+      createTemporaryDirectory: jest.fn().mockResolvedValue(mockTmpDir),
+    };
+    mockFs({ [`${mockTmpDir}/src/docs`]: {} });
+  });
+  afterEach(() => {
+    jest.clearAllMocks();
+    mockFs.restore();
+  });
+
+  it('should call confluence to markdown action successfully with results array', async () => {
+    const options = {
+      reader,
+      integrations,
+      config,
+    };
+    const responseBody = {
+      results: [
+        {
+          id: '4444444',
+          type: 'page',
+          title: 'Testing',
+          body: {
+            export_view: {
+              value: '<p>hello world</p>',
+            },
+          },
+        },
+      ],
+    };
+    const responseBodyTwo = {
+      results: [
+        {
+          id: '4444444',
+          type: 'attachment',
+          title: 'testing.pdf',
+          metadata: {
+            mediaType: 'application/pdf',
+          },
+          _links: {
+            download: '/download/attachments/4444444/testing.pdf',
+          },
+        },
+      ],
+    };
+
+    worker.use(
+      rest.get(`${baseUrl}/rest/api/content`, (_, res, ctx) =>
+        res(ctx.status(200, 'OK'), ctx.json(responseBody)),
+      ),
+      rest.get(
+        `${baseUrl}/rest/api/content/4444444/child/attachment`,
+        (_, res, ctx) => res(ctx.status(200, 'OK'), ctx.json(responseBodyTwo)),
+      ),
+      rest.get(
+        `${baseUrl}/download/attachments/4444444/testing.pdf`,
+        (_, res, ctx) => res(ctx.status(200, 'OK'), ctx.body('hello')),
+      ),
+    );
+
+    const action = createConfluenceToMarkdownAction(options);
+
+    await action.handler(mockContext);
+
+    expect(logger.info).toHaveBeenCalledWith(
+      `Fetching the mkdocs.yml catalog from https://github.com/organization-name/repo-name/blob/main/mkdocs.yml`,
+    );
+    expect(logger.info).toHaveBeenCalledTimes(5);
+    expect(createWriteStream).toHaveBeenCalledTimes(1);
+    expect(readFile).toHaveBeenCalledTimes(1);
+    expect(writeFile).toHaveBeenCalledTimes(1);
+  });
+});
diff --git a/plugins/scaffolder-backend-module-confluence-to-markdown/src/actions/confluence/confluenceToMarkdown.examples.ts b/plugins/scaffolder-backend-module-confluence-to-markdown/src/actions/confluence/confluenceToMarkdown.examples.ts
new file mode 100644
index 0000000000..e5d10644a6
--- /dev/null
+++ b/plugins/scaffolder-backend-module-confluence-to-markdown/src/actions/confluence/confluenceToMarkdown.examples.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 { TemplateExample } from '@backstage/plugin-scaffolder-node';
+import yaml from 'yaml';
+
+export const examples: TemplateExample[] = [
+  {
+    description:
+      'Downloads content from provided Confluence URLs and converts it to Markdown.',
+    example: yaml.stringify({
+      steps: [
+        {
+          action: 'confluence:transform:markdown',
+          id: 'confluence-transform-markdown',
+          name: 'Transform Confluence content to Markdown',
+          input: {
+            confluenceUrls: [
+              'https://confluence.example.com/display/SPACEKEY/Page+Title',
+            ],
+            repoUrl:
+              'https://github.com/organization-name/repo-name/blob/main/mkdocs.yml',
+          },
+        },
+      ],
+    }),
+  },
+];
diff --git a/plugins/scaffolder-backend-module-confluence-to-markdown/src/actions/confluence/confluenceToMarkdown.ts b/plugins/scaffolder-backend-module-confluence-to-markdown/src/actions/confluence/confluenceToMarkdown.ts
index 71a3af11ae..e88f42e39c 100644
--- a/plugins/scaffolder-backend-module-confluence-to-markdown/src/actions/confluence/confluenceToMarkdown.ts
+++ b/plugins/scaffolder-backend-module-confluence-to-markdown/src/actions/confluence/confluenceToMarkdown.ts
@@ -33,6 +33,7 @@ import {
   createConfluenceVariables,
   getConfluenceConfig,
 } from './helpers';
+import { examples } from './confluenceToMarkdown.examples';
 
 /**
  * @public
@@ -53,6 +54,8 @@ export const createConfluenceToMarkdownAction = (options: {
     repoUrl: string;
   }>({
     id: 'confluence:transform:markdown',
+    description: 'Transforms Confluence content to Markdown',
+    examples,
     schema: {
       input: {
         properties: {
diff --git a/plugins/scaffolder-backend-module-cookiecutter/CHANGELOG.md b/plugins/scaffolder-backend-module-cookiecutter/CHANGELOG.md
index f6d1e6bd01..61a582692d 100644
--- a/plugins/scaffolder-backend-module-cookiecutter/CHANGELOG.md
+++ b/plugins/scaffolder-backend-module-cookiecutter/CHANGELOG.md
@@ -1,5 +1,63 @@
 # @backstage/plugin-scaffolder-backend-module-cookiecutter
 
+## 0.2.27-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config@1.1.0-next.1
+  - @backstage/backend-common@0.19.5-next.2
+  - @backstage/integration@1.7.0-next.2
+  - @backstage/plugin-scaffolder-node@0.2.3-next.2
+  - @backstage/errors@1.2.1
+  - @backstage/types@1.1.0
+
+## 0.2.27-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config@1.1.0-next.0
+  - @backstage/integration@1.7.0-next.1
+  - @backstage/backend-common@0.19.5-next.1
+  - @backstage/plugin-scaffolder-node@0.2.3-next.1
+  - @backstage/errors@1.2.1
+  - @backstage/types@1.1.0
+
+## 0.2.26-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.19.4-next.0
+  - @backstage/integration@1.7.0-next.0
+  - @backstage/config@1.0.8
+  - @backstage/errors@1.2.1
+  - @backstage/types@1.1.0
+  - @backstage/plugin-scaffolder-node@0.2.2-next.0
+
+## 0.2.24
+
+### Patch Changes
+
+- 12a8c94eda8d: Add package repository and homepage metadata
+- c186c631b429: Import helpers from the node package instead of the backend package
+- Updated dependencies
+  - @backstage/backend-common@0.19.2
+  - @backstage/plugin-scaffolder-node@0.2.0
+  - @backstage/integration@1.6.0
+  - @backstage/config@1.0.8
+  - @backstage/errors@1.2.1
+  - @backstage/types@1.1.0
+
+## 0.2.24-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-scaffolder-node@0.1.6-next.2
+  - @backstage/backend-common@0.19.2-next.2
+
 ## 0.2.24-next.1
 
 ### Patch Changes
diff --git a/plugins/scaffolder-backend-module-cookiecutter/catalog-info.yaml b/plugins/scaffolder-backend-module-cookiecutter/catalog-info.yaml
new file mode 100644
index 0000000000..18926d3925
--- /dev/null
+++ b/plugins/scaffolder-backend-module-cookiecutter/catalog-info.yaml
@@ -0,0 +1,12 @@
+apiVersion: backstage.io/v1alpha1
+kind: Component
+metadata:
+  name: backstage-plugin-scaffolder-backend-module-cookiecutter
+  title: '@backstage/plugin-scaffolder-backend-module-cookiecutter'
+  description: >-
+    A module for the scaffolder backend that lets you template projects using
+    cookiecutter
+spec:
+  lifecycle: experimental
+  type: backstage-backend-plugin-module
+  owner: maintainers
diff --git a/plugins/scaffolder-backend-module-cookiecutter/package.json b/plugins/scaffolder-backend-module-cookiecutter/package.json
index df1d81bbd3..7812a27b7b 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.24-next.1",
+  "version": "0.2.27-next.2",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
diff --git a/plugins/scaffolder-backend-module-gitlab/CHANGELOG.md b/plugins/scaffolder-backend-module-gitlab/CHANGELOG.md
index 4c50ef46fd..ae227974ce 100644
--- a/plugins/scaffolder-backend-module-gitlab/CHANGELOG.md
+++ b/plugins/scaffolder-backend-module-gitlab/CHANGELOG.md
@@ -1,5 +1,52 @@
 # @backstage/plugin-scaffolder-backend-module-gitlab
 
+## 0.2.6-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config@1.1.0-next.1
+  - @backstage/integration@1.7.0-next.2
+  - @backstage/plugin-scaffolder-node@0.2.3-next.2
+  - @backstage/errors@1.2.1
+
+## 0.2.6-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config@1.1.0-next.0
+  - @backstage/integration@1.7.0-next.1
+  - @backstage/plugin-scaffolder-node@0.2.3-next.1
+  - @backstage/errors@1.2.1
+
+## 0.2.5-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/integration@1.7.0-next.0
+  - @backstage/config@1.0.8
+  - @backstage/errors@1.2.1
+  - @backstage/plugin-scaffolder-node@0.2.2-next.0
+
+## 0.2.3
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-scaffolder-node@0.2.0
+  - @backstage/integration@1.6.0
+  - @backstage/config@1.0.8
+  - @backstage/errors@1.2.1
+
+## 0.2.3-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-scaffolder-node@0.1.6-next.2
+
 ## 0.2.3-next.1
 
 ### Patch Changes
diff --git a/plugins/scaffolder-backend-module-gitlab/catalog-info.yaml b/plugins/scaffolder-backend-module-gitlab/catalog-info.yaml
new file mode 100644
index 0000000000..c8af1e7fa5
--- /dev/null
+++ b/plugins/scaffolder-backend-module-gitlab/catalog-info.yaml
@@ -0,0 +1,9 @@
+apiVersion: backstage.io/v1alpha1
+kind: Component
+metadata:
+  name: backstage-plugin-scaffolder-backend-module-gitlab
+  title: '@backstage/plugin-scaffolder-backend-module-gitlab'
+spec:
+  lifecycle: experimental
+  type: backstage-backend-plugin-module
+  owner: maintainers
diff --git a/plugins/scaffolder-backend-module-gitlab/package.json b/plugins/scaffolder-backend-module-gitlab/package.json
index 8c9ba33a77..5931054df3 100644
--- a/plugins/scaffolder-backend-module-gitlab/package.json
+++ b/plugins/scaffolder-backend-module-gitlab/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-scaffolder-backend-module-gitlab",
-  "version": "0.2.3-next.1",
+  "version": "0.2.6-next.2",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
diff --git a/plugins/scaffolder-backend-module-rails/CHANGELOG.md b/plugins/scaffolder-backend-module-rails/CHANGELOG.md
index fa3f9201ac..17063054a8 100644
--- a/plugins/scaffolder-backend-module-rails/CHANGELOG.md
+++ b/plugins/scaffolder-backend-module-rails/CHANGELOG.md
@@ -1,5 +1,63 @@
 # @backstage/plugin-scaffolder-backend-module-rails
 
+## 0.4.20-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config@1.1.0-next.1
+  - @backstage/backend-common@0.19.5-next.2
+  - @backstage/integration@1.7.0-next.2
+  - @backstage/plugin-scaffolder-node@0.2.3-next.2
+  - @backstage/errors@1.2.1
+  - @backstage/types@1.1.0
+
+## 0.4.20-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config@1.1.0-next.0
+  - @backstage/integration@1.7.0-next.1
+  - @backstage/backend-common@0.19.5-next.1
+  - @backstage/plugin-scaffolder-node@0.2.3-next.1
+  - @backstage/errors@1.2.1
+  - @backstage/types@1.1.0
+
+## 0.4.19-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.19.4-next.0
+  - @backstage/integration@1.7.0-next.0
+  - @backstage/config@1.0.8
+  - @backstage/errors@1.2.1
+  - @backstage/types@1.1.0
+  - @backstage/plugin-scaffolder-node@0.2.2-next.0
+
+## 0.4.17
+
+### Patch Changes
+
+- 12a8c94eda8d: Add package repository and homepage metadata
+- c186c631b429: Import helpers from the node package instead of the backend package
+- Updated dependencies
+  - @backstage/backend-common@0.19.2
+  - @backstage/plugin-scaffolder-node@0.2.0
+  - @backstage/integration@1.6.0
+  - @backstage/config@1.0.8
+  - @backstage/errors@1.2.1
+  - @backstage/types@1.1.0
+
+## 0.4.17-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-scaffolder-node@0.1.6-next.2
+  - @backstage/backend-common@0.19.2-next.2
+
 ## 0.4.17-next.1
 
 ### Patch Changes
diff --git a/plugins/scaffolder-backend-module-rails/catalog-info.yaml b/plugins/scaffolder-backend-module-rails/catalog-info.yaml
new file mode 100644
index 0000000000..989b88219e
--- /dev/null
+++ b/plugins/scaffolder-backend-module-rails/catalog-info.yaml
@@ -0,0 +1,12 @@
+apiVersion: backstage.io/v1alpha1
+kind: Component
+metadata:
+  name: backstage-plugin-scaffolder-backend-module-rails
+  title: '@backstage/plugin-scaffolder-backend-module-rails'
+  description: >-
+    A module for the scaffolder backend that lets you template projects using
+    Rails
+spec:
+  lifecycle: experimental
+  type: backstage-backend-plugin-module
+  owner: maintainers
diff --git a/plugins/scaffolder-backend-module-rails/package.json b/plugins/scaffolder-backend-module-rails/package.json
index c514354955..83d93d4681 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.17-next.1",
+  "version": "0.4.20-next.2",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
diff --git a/plugins/scaffolder-backend-module-sentry/CHANGELOG.md b/plugins/scaffolder-backend-module-sentry/CHANGELOG.md
index fbeed9e5e3..9ab42214d5 100644
--- a/plugins/scaffolder-backend-module-sentry/CHANGELOG.md
+++ b/plugins/scaffolder-backend-module-sentry/CHANGELOG.md
@@ -1,5 +1,49 @@
 # @backstage/plugin-scaffolder-backend-module-sentry
 
+## 0.1.11-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config@1.1.0-next.1
+  - @backstage/plugin-scaffolder-node@0.2.3-next.2
+  - @backstage/errors@1.2.1
+
+## 0.1.11-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config@1.1.0-next.0
+  - @backstage/plugin-scaffolder-node@0.2.3-next.1
+  - @backstage/errors@1.2.1
+
+## 0.1.10-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config@1.0.8
+  - @backstage/errors@1.2.1
+  - @backstage/plugin-scaffolder-node@0.2.2-next.0
+
+## 0.1.8
+
+### Patch Changes
+
+- 12a8c94eda8d: Add package repository and homepage metadata
+- Updated dependencies
+  - @backstage/plugin-scaffolder-node@0.2.0
+  - @backstage/config@1.0.8
+  - @backstage/errors@1.2.1
+
+## 0.1.8-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-scaffolder-node@0.1.6-next.2
+
 ## 0.1.8-next.1
 
 ### Patch Changes
diff --git a/plugins/scaffolder-backend-module-sentry/catalog-info.yaml b/plugins/scaffolder-backend-module-sentry/catalog-info.yaml
new file mode 100644
index 0000000000..75b72fa661
--- /dev/null
+++ b/plugins/scaffolder-backend-module-sentry/catalog-info.yaml
@@ -0,0 +1,9 @@
+apiVersion: backstage.io/v1alpha1
+kind: Component
+metadata:
+  name: backstage-plugin-scaffolder-backend-module-sentry
+  title: '@backstage/plugin-scaffolder-backend-module-sentry'
+spec:
+  lifecycle: experimental
+  type: backstage-backend-plugin-module
+  owner: maintainers
diff --git a/plugins/scaffolder-backend-module-sentry/package.json b/plugins/scaffolder-backend-module-sentry/package.json
index 5b58d1ef87..0b747f2000 100644
--- a/plugins/scaffolder-backend-module-sentry/package.json
+++ b/plugins/scaffolder-backend-module-sentry/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-scaffolder-backend-module-sentry",
-  "version": "0.1.8-next.1",
+  "version": "0.1.11-next.2",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
diff --git a/plugins/scaffolder-backend-module-yeoman/CHANGELOG.md b/plugins/scaffolder-backend-module-yeoman/CHANGELOG.md
index fcf915a348..a0f424edc2 100644
--- a/plugins/scaffolder-backend-module-yeoman/CHANGELOG.md
+++ b/plugins/scaffolder-backend-module-yeoman/CHANGELOG.md
@@ -1,5 +1,49 @@
 # @backstage/plugin-scaffolder-backend-module-yeoman
 
+## 0.2.24-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config@1.1.0-next.1
+  - @backstage/plugin-scaffolder-node@0.2.3-next.2
+  - @backstage/types@1.1.0
+
+## 0.2.24-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config@1.1.0-next.0
+  - @backstage/plugin-scaffolder-node@0.2.3-next.1
+  - @backstage/types@1.1.0
+
+## 0.2.23-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config@1.0.8
+  - @backstage/types@1.1.0
+  - @backstage/plugin-scaffolder-node@0.2.2-next.0
+
+## 0.2.21
+
+### Patch Changes
+
+- 12a8c94eda8d: Add package repository and homepage metadata
+- Updated dependencies
+  - @backstage/plugin-scaffolder-node@0.2.0
+  - @backstage/config@1.0.8
+  - @backstage/types@1.1.0
+
+## 0.2.21-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-scaffolder-node@0.1.6-next.2
+
 ## 0.2.21-next.1
 
 ### Patch Changes
diff --git a/plugins/scaffolder-backend-module-yeoman/catalog-info.yaml b/plugins/scaffolder-backend-module-yeoman/catalog-info.yaml
new file mode 100644
index 0000000000..28d6030832
--- /dev/null
+++ b/plugins/scaffolder-backend-module-yeoman/catalog-info.yaml
@@ -0,0 +1,9 @@
+apiVersion: backstage.io/v1alpha1
+kind: Component
+metadata:
+  name: backstage-plugin-scaffolder-backend-module-yeoman
+  title: '@backstage/plugin-scaffolder-backend-module-yeoman'
+spec:
+  lifecycle: experimental
+  type: backstage-backend-plugin-module
+  owner: maintainers
diff --git a/plugins/scaffolder-backend-module-yeoman/package.json b/plugins/scaffolder-backend-module-yeoman/package.json
index 6e90170dab..ff366f9088 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.21-next.1",
+  "version": "0.2.24-next.2",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
diff --git a/plugins/scaffolder-backend/CHANGELOG.md b/plugins/scaffolder-backend/CHANGELOG.md
index dc8140c996..0995a4b047 100644
--- a/plugins/scaffolder-backend/CHANGELOG.md
+++ b/plugins/scaffolder-backend/CHANGELOG.md
@@ -1,5 +1,146 @@
 # @backstage/plugin-scaffolder-backend
 
+## 1.16.6-next.2
+
+### Patch Changes
+
+- ded27b83ead2: Add examples for `publish:bitbucket` scaffolder actions.
+- 814feeed7343: Update to handle invalid luxon values
+- Updated dependencies
+  - @backstage/plugin-catalog-backend@1.13.0-next.2
+  - @backstage/config@1.1.0-next.1
+  - @backstage/backend-tasks@0.5.8-next.2
+  - @backstage/backend-common@0.19.5-next.2
+  - @backstage/plugin-auth-node@0.3.0-next.2
+  - @backstage/plugin-catalog-node@1.4.4-next.2
+  - @backstage/plugin-permission-node@0.7.14-next.2
+  - @backstage/integration@1.7.0-next.2
+  - @backstage/backend-plugin-api@0.6.3-next.2
+  - @backstage/catalog-model@1.4.2-next.1
+  - @backstage/plugin-permission-common@0.7.8-next.1
+  - @backstage/plugin-scaffolder-node@0.2.3-next.2
+  - @backstage/catalog-client@1.4.4-next.1
+  - @backstage/errors@1.2.1
+  - @backstage/types@1.1.0
+  - @backstage/plugin-catalog-common@1.0.16-next.1
+  - @backstage/plugin-scaffolder-common@1.4.1-next.1
+
+## 1.16.6-next.1
+
+### Patch Changes
+
+- f3c0b95e3ef1: Add examples for `github:actions:dispatch` scaffolder actions.
+- Updated dependencies
+  - @backstage/plugin-catalog-backend@1.13.0-next.1
+  - @backstage/config@1.1.0-next.0
+  - @backstage/integration@1.7.0-next.1
+  - @backstage/backend-tasks@0.5.8-next.1
+  - @backstage/backend-common@0.19.5-next.1
+  - @backstage/backend-plugin-api@0.6.3-next.1
+  - @backstage/catalog-model@1.4.2-next.0
+  - @backstage/plugin-auth-node@0.3.0-next.1
+  - @backstage/plugin-permission-common@0.7.8-next.0
+  - @backstage/plugin-permission-node@0.7.14-next.1
+  - @backstage/plugin-scaffolder-node@0.2.3-next.1
+  - @backstage/plugin-catalog-node@1.4.4-next.1
+  - @backstage/catalog-client@1.4.4-next.0
+  - @backstage/plugin-catalog-common@1.0.16-next.0
+  - @backstage/plugin-scaffolder-common@1.4.1-next.0
+  - @backstage/errors@1.2.1
+  - @backstage/types@1.1.0
+
+## 1.16.3-next.0
+
+### Patch Changes
+
+- a4989552d828: Add examples for `publish:github` and `publish:gitlab` scaffolder actions.
+- 5f1a92b9f19f: Use `DefaultAzureDevOpsCredentialsProvider` to retrieve credentials for Azure DevOps.
+- fb57a4694fc6: Fixed the plugin and module ID of the alpha `catalogModuleTemplateKind` export.
+- cfc3ca6ce060: Changes needed to support MySQL
+- Updated dependencies
+  - @backstage/plugin-catalog-backend@1.12.2-next.0
+  - @backstage/plugin-auth-node@0.3.0-next.0
+  - @backstage/backend-common@0.19.4-next.0
+  - @backstage/integration@1.7.0-next.0
+  - @backstage/backend-tasks@0.5.7-next.0
+  - @backstage/backend-plugin-api@0.6.2-next.0
+  - @backstage/catalog-client@1.4.3
+  - @backstage/catalog-model@1.4.1
+  - @backstage/config@1.0.8
+  - @backstage/errors@1.2.1
+  - @backstage/types@1.1.0
+  - @backstage/plugin-catalog-common@1.0.15
+  - @backstage/plugin-catalog-node@1.4.3-next.0
+  - @backstage/plugin-permission-common@0.7.7
+  - @backstage/plugin-permission-node@0.7.13-next.0
+  - @backstage/plugin-scaffolder-common@1.4.0
+  - @backstage/plugin-scaffolder-node@0.2.2-next.0
+
+## 1.16.0
+
+### Minor Changes
+
+- e514aac3eac0: Introduce `each` property on action steps, allowing them to be ran repeatedly.
+
+### Patch Changes
+
+- 629cbd194a87: Use `coreServices.rootConfig` instead of `coreService.config`
+- 349611126ae2: Removed the options from the alpha `scaffolderPlugin` export. To extend the scaffolder plugin you instead now use the available extension points, `scaffolderActionsExtensionPoint`, `scaffolderTaskBrokerExtensionPoint`, and `scaffolderTemplatingExtensionPoint`.
+- 33c76caef72a: Added examples for the `fs:delete` and `fs:rename` actions
+- e07a4914f621: Deprecated the following type exports, which have been moved to `@backstage/plugin-scaffolder-node` instead:
+
+  - `TemplateFilter`
+  - `TemplateGlobal`
+  - `TaskStatus`
+  - `TaskCompletionState`
+  - `SerializedTask`
+  - `TaskEventType`
+  - `SerializedTaskEvent`
+  - `TaskBrokerDispatchResult`
+  - `TaskBrokerDispatchOptions`
+  - `TaskContext`
+  - `TaskBroker`
+
+- 0b1d775be05b: Adds examples to a few scaffolder actions.
+- 88bc6e27a213: The `concurrentTasksLimit` option can now be configured via static configuration as well. Setting it to 0 will now also disable the task worker.
+- 0f873325068d: Add examples for `github:repo:create` and `github:repo:push` scaffolder actions.
+- 5c28ebc79fd6: Updated dependency `esbuild` to `^0.19.0`.
+- d3b31a791eb1: Deprecated `executeShellCommand`, `RunCommandOptions`, and `fetchContents` from `@backstage/plugin-scaffolder-backend`, since they are useful for Scaffolder modules (who should not be importing from the plugin package itself). You should now import these from `@backstage/plugin-scaffolder-backend-node` instead. `RunCommandOptions` was renamed in the Node package as `ExecuteShellCommandOptions`, for consistency.
+- Updated dependencies
+  - @backstage/backend-common@0.19.2
+  - @backstage/plugin-catalog-backend@1.12.0
+  - @backstage/backend-plugin-api@0.6.0
+  - @backstage/plugin-scaffolder-node@0.2.0
+  - @backstage/plugin-catalog-node@1.4.1
+  - @backstage/plugin-auth-node@0.2.17
+  - @backstage/integration@1.6.0
+  - @backstage/backend-tasks@0.5.5
+  - @backstage/plugin-scaffolder-common@1.4.0
+  - @backstage/plugin-permission-node@0.7.11
+  - @backstage/catalog-client@1.4.3
+  - @backstage/catalog-model@1.4.1
+  - @backstage/config@1.0.8
+  - @backstage/errors@1.2.1
+  - @backstage/types@1.1.0
+  - @backstage/plugin-catalog-common@1.0.15
+  - @backstage/plugin-permission-common@0.7.7
+
+## 1.15.2-next.2
+
+### Patch Changes
+
+- 33c76caef72a: Added examples for the fs:delete and fs:rename actions
+- 0b1d775be05b: Adds examples to a few scaffolder actions.
+- Updated dependencies
+  - @backstage/plugin-catalog-backend@1.12.0-next.2
+  - @backstage/backend-plugin-api@0.6.0-next.2
+  - @backstage/backend-tasks@0.5.5-next.2
+  - @backstage/plugin-scaffolder-node@0.1.6-next.2
+  - @backstage/backend-common@0.19.2-next.2
+  - @backstage/plugin-catalog-node@1.4.1-next.2
+  - @backstage/plugin-permission-node@0.7.11-next.2
+  - @backstage/plugin-auth-node@0.2.17-next.2
+
 ## 1.15.2-next.1
 
 ### Patch Changes
diff --git a/plugins/scaffolder-backend/alpha-api-report.md b/plugins/scaffolder-backend/alpha-api-report.md
index 363fcafd17..20def133ad 100644
--- a/plugins/scaffolder-backend/alpha-api-report.md
+++ b/plugins/scaffolder-backend/alpha-api-report.md
@@ -12,11 +12,7 @@ import { PermissionCriteria } from '@backstage/plugin-permission-common';
 import { PermissionRule } from '@backstage/plugin-permission-node';
 import { PermissionRuleParams } from '@backstage/plugin-permission-common';
 import { ResourcePermission } from '@backstage/plugin-permission-common';
-import { TaskBroker } from '@backstage/plugin-scaffolder-backend';
-import { TemplateAction } from '@backstage/plugin-scaffolder-node';
 import { TemplateEntityStepV1beta3 } from '@backstage/plugin-scaffolder-common';
-import { TemplateFilter } from '@backstage/plugin-scaffolder-backend';
-import { TemplateGlobal } from '@backstage/plugin-scaffolder-backend';
 import { TemplateParametersV1beta3 } from '@backstage/plugin-scaffolder-common';
 
 // @alpha
@@ -90,18 +86,8 @@ export const scaffolderActionConditions: Conditions<{
 }>;
 
 // @alpha
-export const scaffolderPlugin: (
-  options?: ScaffolderPluginOptions | undefined,
-) => BackendFeature;
-
-// @alpha
-export type ScaffolderPluginOptions = {
-  actions?: TemplateAction<any, any>[];
-  taskWorkers?: number;
-  taskBroker?: TaskBroker;
-  additionalTemplateFilters?: Record<string, TemplateFilter>;
-  additionalTemplateGlobals?: Record<string, TemplateGlobal>;
-};
+const scaffolderPlugin: () => BackendFeature;
+export default scaffolderPlugin;
 
 // @alpha
 export const scaffolderTemplateConditions: Conditions<{
diff --git a/plugins/scaffolder-backend/api-report.md b/plugins/scaffolder-backend/api-report.md
index 4fe961056f..7fe4964827 100644
--- a/plugins/scaffolder-backend/api-report.md
+++ b/plugins/scaffolder-backend/api-report.md
@@ -19,11 +19,9 @@ import { GithubCredentialsProvider } from '@backstage/integration';
 import { HumanDuration } from '@backstage/types';
 import { IdentityApi } from '@backstage/plugin-auth-node';
 import { JsonObject } from '@backstage/types';
-import { JsonValue } from '@backstage/types';
 import { Knex } from 'knex';
 import { LocationSpec } from '@backstage/plugin-catalog-common';
 import { Logger } from 'winston';
-import { Observable } from '@backstage/types';
 import { Octokit } from 'octokit';
 import { PermissionEvaluator } from '@backstage/plugin-permission-common';
 import { PermissionRule } from '@backstage/plugin-permission-node';
@@ -35,12 +33,23 @@ import { RESOURCE_TYPE_SCAFFOLDER_TEMPLATE } from '@backstage/plugin-scaffolder-
 import { Schema } from 'jsonschema';
 import { ScmIntegrationRegistry } from '@backstage/integration';
 import { ScmIntegrations } from '@backstage/integration';
+import { SerializedTask as SerializedTask_2 } from '@backstage/plugin-scaffolder-node';
+import { SerializedTaskEvent as SerializedTaskEvent_2 } from '@backstage/plugin-scaffolder-node';
+import { TaskBroker as TaskBroker_2 } from '@backstage/plugin-scaffolder-node';
+import { TaskBrokerDispatchOptions as TaskBrokerDispatchOptions_2 } from '@backstage/plugin-scaffolder-node';
+import { TaskBrokerDispatchResult as TaskBrokerDispatchResult_2 } from '@backstage/plugin-scaffolder-node';
+import { TaskCompletionState as TaskCompletionState_2 } from '@backstage/plugin-scaffolder-node';
+import { TaskContext as TaskContext_2 } from '@backstage/plugin-scaffolder-node';
+import { TaskEventType as TaskEventType_2 } from '@backstage/plugin-scaffolder-node';
 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 { TaskStatus as TaskStatus_2 } from '@backstage/plugin-scaffolder-node';
 import { TemplateAction as TemplateAction_2 } from '@backstage/plugin-scaffolder-node';
 import { TemplateActionOptions } from '@backstage/plugin-scaffolder-node';
 import { TemplateEntityStepV1beta3 } from '@backstage/plugin-scaffolder-common';
+import { TemplateFilter as TemplateFilter_2 } from '@backstage/plugin-scaffolder-node';
+import { TemplateGlobal as TemplateGlobal_2 } from '@backstage/plugin-scaffolder-node';
 import { TemplateParametersV1beta3 } from '@backstage/plugin-scaffolder-common';
 import { UrlReader } from '@backstage/backend-common';
 import { ZodType } from 'zod';
@@ -886,89 +895,29 @@ export class ScaffolderEntitiesProcessor implements CatalogProcessor {
   validateEntityKind(entity: Entity): Promise<boolean>;
 }
 
-// @public
-export type SerializedTask = {
-  id: string;
-  spec: TaskSpec;
-  status: TaskStatus;
-  createdAt: string;
-  lastHeartbeatAt?: string;
-  createdBy?: string;
-  secrets?: TaskSecrets_2;
-};
+// @public @deprecated
+export type SerializedTask = SerializedTask_2;
 
-// @public
-export type SerializedTaskEvent = {
-  id: number;
-  taskId: string;
-  body: JsonObject;
-  type: TaskEventType;
-  createdAt: string;
-};
+// @public @deprecated
+export type SerializedTaskEvent = SerializedTaskEvent_2;
 
-// @public
-export interface TaskBroker {
-  // (undocumented)
-  cancel?(taskId: string): Promise<void>;
-  // (undocumented)
-  claim(): Promise<TaskContext>;
-  // (undocumented)
-  dispatch(
-    options: TaskBrokerDispatchOptions,
-  ): Promise<TaskBrokerDispatchResult>;
-  // (undocumented)
-  event$(options: { taskId: string; after: number | undefined }): Observable<{
-    events: SerializedTaskEvent[];
-  }>;
-  // (undocumented)
-  get(taskId: string): Promise<SerializedTask>;
-  // (undocumented)
-  list?(options?: { createdBy?: string }): Promise<{
-    tasks: SerializedTask[];
-  }>;
-  // (undocumented)
-  vacuumTasks(options: { timeoutS: number }): Promise<void>;
-}
+// @public @deprecated
+export type TaskBroker = TaskBroker_2;
 
-// @public
-export type TaskBrokerDispatchOptions = {
-  spec: TaskSpec;
-  secrets?: TaskSecrets_2;
-  createdBy?: string;
-};
+// @public @deprecated
+export type TaskBrokerDispatchOptions = TaskBrokerDispatchOptions_2;
 
-// @public
-export type TaskBrokerDispatchResult = {
-  taskId: string;
-};
+// @public @deprecated
+export type TaskBrokerDispatchResult = TaskBrokerDispatchResult_2;
 
-// @public
-export type TaskCompletionState = 'failed' | 'completed';
+// @public @deprecated
+export type TaskCompletionState = TaskCompletionState_2;
 
-// @public
-export interface TaskContext {
-  // (undocumented)
-  cancelSignal: AbortSignal;
-  // (undocumented)
-  complete(result: TaskCompletionState, metadata?: JsonObject): Promise<void>;
-  // (undocumented)
-  createdBy?: string;
-  // (undocumented)
-  done: boolean;
-  // (undocumented)
-  emitLog(message: string, logMetadata?: JsonObject): Promise<void>;
-  // (undocumented)
-  getWorkspaceName(): Promise<string>;
-  // (undocumented)
-  isDryRun?: boolean;
-  // (undocumented)
-  secrets?: TaskSecrets_2;
-  // (undocumented)
-  spec: TaskSpec;
-}
+// @public @deprecated
+export type TaskContext = TaskContext_2;
 
-// @public
-export type TaskEventType = 'completion' | 'log' | 'cancelled';
+// @public @deprecated
+export type TaskEventType = TaskEventType_2;
 
 // @public
 export class TaskManager implements TaskContext {
@@ -1000,13 +949,8 @@ export class TaskManager implements TaskContext {
 // @public @deprecated (undocumented)
 export type TaskSecrets = TaskSecrets_2;
 
-// @public
-export type TaskStatus =
-  | 'cancelled'
-  | 'completed'
-  | 'failed'
-  | 'open'
-  | 'processing';
+// @public @deprecated
+export type TaskStatus = TaskStatus_2;
 
 // @public
 export interface TaskStore {
@@ -1103,13 +1047,11 @@ export class TemplateActionRegistry {
   register(action: TemplateAction_2): void;
 }
 
-// @public (undocumented)
-export type TemplateFilter = (...args: JsonValue[]) => JsonValue | undefined;
+// @public @deprecated (undocumented)
+export type TemplateFilter = TemplateFilter_2;
 
-// @public (undocumented)
-export type TemplateGlobal =
-  | ((...args: JsonValue[]) => JsonValue | undefined)
-  | JsonValue;
+// @public @deprecated (undocumented)
+export type TemplateGlobal = TemplateGlobal_2;
 
 // @public (undocumented)
 export type TemplatePermissionRuleInput<
diff --git a/plugins/scaffolder-backend/catalog-info.yaml b/plugins/scaffolder-backend/catalog-info.yaml
new file mode 100644
index 0000000000..5bb93a2483
--- /dev/null
+++ b/plugins/scaffolder-backend/catalog-info.yaml
@@ -0,0 +1,10 @@
+apiVersion: backstage.io/v1alpha1
+kind: Component
+metadata:
+  name: backstage-plugin-scaffolder-backend
+  title: '@backstage/plugin-scaffolder-backend'
+  description: The Backstage backend plugin that helps you create new things
+spec:
+  lifecycle: production
+  type: backstage-backend-plugin
+  owner: maintainers
diff --git a/plugins/scaffolder-backend/config.d.ts b/plugins/scaffolder-backend/config.d.ts
index 7883284165..60ccd52257 100644
--- a/plugins/scaffolder-backend/config.d.ts
+++ b/plugins/scaffolder-backend/config.d.ts
@@ -28,5 +28,14 @@ export interface Config {
      * The commit message used when new components are created.
      */
     defaultCommitMessage?: string;
+
+    /**
+     * Sets the number of concurrent tasks that can be run at any given time on the TaskWorker.
+     *
+     * Defaults to 10.
+     *
+     * Set to 0 to disable task workers altogether.
+     */
+    concurrentTasksLimit?: number;
   };
 }
diff --git a/plugins/scaffolder-backend/package.json b/plugins/scaffolder-backend/package.json
index d1481e2068..0399684144 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.15.2-next.1",
+  "version": "1.16.6-next.2",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
@@ -110,7 +110,7 @@
     "@types/nunjucks": "^3.1.4",
     "@types/supertest": "^2.0.8",
     "@types/zen-observable": "^0.8.0",
-    "esbuild": "^0.18.0",
+    "esbuild": "^0.19.0",
     "jest-when": "^3.1.0",
     "mock-fs": "^5.1.0",
     "msw": "^1.0.0",
diff --git a/plugins/scaffolder-backend/src/ScaffolderPlugin.ts b/plugins/scaffolder-backend/src/ScaffolderPlugin.ts
index f361bfcdf9..98bd4a1d66 100644
--- a/plugins/scaffolder-backend/src/ScaffolderPlugin.ts
+++ b/plugins/scaffolder-backend/src/ScaffolderPlugin.ts
@@ -23,120 +23,104 @@ import { ScmIntegrations } from '@backstage/integration';
 import { catalogServiceRef } from '@backstage/plugin-catalog-node/alpha';
 import {
   scaffolderActionsExtensionPoint,
-  ScaffolderActionsExtensionPoint,
+  scaffolderTaskBrokerExtensionPoint,
+  scaffolderTemplatingExtensionPoint,
+  TaskBroker,
   TemplateAction,
-} from '@backstage/plugin-scaffolder-node';
-import {
   TemplateFilter,
   TemplateGlobal,
-  TaskBroker,
-} from '@backstage/plugin-scaffolder-backend';
+} from '@backstage/plugin-scaffolder-node';
 import { createBuiltinActions } from './scaffolder';
 import { createRouter } from './service/router';
 
 /**
- * Catalog plugin options
+ * Scaffolder plugin
  *
  * @alpha
  */
-export type ScaffolderPluginOptions = {
-  actions?: TemplateAction<any, any>[];
-  taskWorkers?: number;
-  taskBroker?: TaskBroker;
-  additionalTemplateFilters?: Record<string, TemplateFilter>;
-  additionalTemplateGlobals?: Record<string, TemplateGlobal>;
-};
+export const scaffolderPlugin = createBackendPlugin({
+  pluginId: 'scaffolder',
+  register(env) {
+    const addedActions = new Array<TemplateAction<any, any>>();
+    env.registerExtensionPoint(scaffolderActionsExtensionPoint, {
+      addActions(...newActions: TemplateAction<any>[]) {
+        addedActions.push(...newActions);
+      },
+    });
 
-class ScaffolderActionsExtensionPointImpl
-  implements ScaffolderActionsExtensionPoint
-{
-  #actions = new Array<TemplateAction<any, any>>();
+    let taskBroker: TaskBroker | undefined;
+    env.registerExtensionPoint(scaffolderTaskBrokerExtensionPoint, {
+      setTaskBroker(newTaskBroker) {
+        if (taskBroker) {
+          throw new Error('Task broker may only be set once');
+        }
+        taskBroker = newTaskBroker;
+      },
+    });
 
-  addActions(...actions: TemplateAction<any>[]): void {
-    this.#actions.push(...actions);
-  }
+    const additionalTemplateFilters: Record<string, TemplateFilter> = {};
+    const additionalTemplateGlobals: Record<string, TemplateGlobal> = {};
+    env.registerExtensionPoint(scaffolderTemplatingExtensionPoint, {
+      addTemplateFilters(newFilters) {
+        Object.assign(additionalTemplateFilters, newFilters);
+      },
+      addTemplateGlobals(newGlobals) {
+        Object.assign(additionalTemplateGlobals, newGlobals);
+      },
+    });
 
-  get actions() {
-    return this.#actions;
-  }
-}
+    env.registerInit({
+      deps: {
+        logger: coreServices.logger,
+        config: coreServices.rootConfig,
+        reader: coreServices.urlReader,
+        permissions: coreServices.permissions,
+        database: coreServices.database,
+        httpRouter: coreServices.httpRouter,
+        catalogClient: catalogServiceRef,
+      },
+      async init({
+        logger,
+        config,
+        reader,
+        database,
+        httpRouter,
+        catalogClient,
+        permissions,
+      }) {
+        const log = loggerToWinstonLogger(logger);
 
-/**
- * Catalog plugin
- *
- * @alpha
- */
-export const scaffolderPlugin = createBackendPlugin(
-  (options?: ScaffolderPluginOptions) => ({
-    pluginId: 'scaffolder',
-    register(env) {
-      const actionsExtensions = new ScaffolderActionsExtensionPointImpl();
-
-      env.registerExtensionPoint(
-        scaffolderActionsExtensionPoint,
-        actionsExtensions,
-      );
-
-      env.registerInit({
-        deps: {
-          logger: coreServices.logger,
-          config: coreServices.rootConfig,
-          reader: coreServices.urlReader,
-          permissions: coreServices.permissions,
-          database: coreServices.database,
-          httpRouter: coreServices.httpRouter,
-          catalogClient: catalogServiceRef,
-        },
-        async init({
-          logger,
-          config,
-          reader,
-          database,
-          httpRouter,
-          catalogClient,
-          permissions,
-        }) {
-          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,
+        const actions = [
+          ...addedActions,
+          ...createBuiltinActions({
+            integrations: ScmIntegrations.fromConfig(config),
             catalogClient,
             reader,
-            actions,
-            taskBroker,
-            taskWorkers,
+            config,
             additionalTemplateFilters,
             additionalTemplateGlobals,
-            permissions,
-          });
-          httpRouter.use(router);
-        },
-      });
-    },
-  }),
-);
+          }),
+        ];
+
+        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,
+          additionalTemplateFilters,
+          additionalTemplateGlobals,
+          permissions,
+        });
+        httpRouter.use(router);
+      },
+    });
+  },
+});
diff --git a/plugins/scaffolder-backend/src/alpha.ts b/plugins/scaffolder-backend/src/alpha.ts
index 713f2569aa..07228fab88 100644
--- a/plugins/scaffolder-backend/src/alpha.ts
+++ b/plugins/scaffolder-backend/src/alpha.ts
@@ -16,5 +16,4 @@
 
 export * from './modules';
 export * from './service';
-export { scaffolderPlugin } from './ScaffolderPlugin';
-export type { ScaffolderPluginOptions } from './ScaffolderPlugin';
+export { scaffolderPlugin as default } from './ScaffolderPlugin';
diff --git a/plugins/scaffolder-backend/src/lib/templating/SecureTemplater.ts b/plugins/scaffolder-backend/src/lib/templating/SecureTemplater.ts
index 488604e981..701863c7f6 100644
--- a/plugins/scaffolder-backend/src/lib/templating/SecureTemplater.ts
+++ b/plugins/scaffolder-backend/src/lib/templating/SecureTemplater.ts
@@ -16,6 +16,10 @@
 
 import { Isolate } from 'isolated-vm';
 import { resolvePackagePath } from '@backstage/backend-common';
+import {
+  TemplateFilter as _TemplateFilter,
+  TemplateGlobal as _TemplateGlobal,
+} from '@backstage/plugin-scaffolder-node';
 import fs from 'fs-extra';
 import { JsonValue } from '@backstage/types';
 
@@ -86,13 +90,17 @@ const { render, renderCompat } = (() => {
 })();
 `;
 
-/** @public */
-export type TemplateFilter = (...args: JsonValue[]) => JsonValue | undefined;
+/**
+ * @public
+ * @deprecated Import from `@backstage/plugin-scaffolder-node` instead.
+ */
+export type TemplateFilter = _TemplateFilter;
 
-/** @public */
-export type TemplateGlobal =
-  | ((...args: JsonValue[]) => JsonValue | undefined)
-  | JsonValue;
+/**
+ * @public
+ * @deprecated Import from `@backstage/plugin-scaffolder-node` instead.
+ */
+export type TemplateGlobal = _TemplateGlobal;
 
 export interface SecureTemplaterOptions {
   /* Enables jinja compatibility and the "jsonify" filter */
diff --git a/plugins/scaffolder-backend/src/modules/catalogModuleTemplateKind.ts b/plugins/scaffolder-backend/src/modules/catalogModuleTemplateKind.ts
index 3359bd1dba..81d3dc3e93 100644
--- a/plugins/scaffolder-backend/src/modules/catalogModuleTemplateKind.ts
+++ b/plugins/scaffolder-backend/src/modules/catalogModuleTemplateKind.ts
@@ -24,8 +24,8 @@ import { ScaffolderEntitiesProcessor } from '../processor';
  * @alpha
  */
 export const catalogModuleTemplateKind = createBackendModule({
-  moduleId: 'scaffolder',
-  pluginId: 'templateKind',
+  moduleId: 'templateKind',
+  pluginId: 'catalog',
   register(env) {
     env.registerInit({
       deps: {
diff --git a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/filesystem/delete.examples.test.ts b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/filesystem/delete.examples.test.ts
new file mode 100644
index 0000000000..10994e3824
--- /dev/null
+++ b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/filesystem/delete.examples.test.ts
@@ -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 { createFilesystemDeleteAction } from './delete';
+import { getVoidLogger } from '@backstage/backend-common';
+import { PassThrough } from 'stream';
+import { resolve as resolvePath } from 'path';
+import * as os from 'os';
+import mockFs from 'mock-fs';
+import fs from 'fs-extra';
+import yaml from 'yaml';
+import { examples } from './delete.examples';
+
+const root = os.platform() === 'win32' ? 'C:\\rootDir' : '/rootDir';
+const workspacePath = resolvePath(root, 'my-workspace');
+
+describe('fs:delete examples', () => {
+  const action = createFilesystemDeleteAction();
+
+  const files: string[] = yaml.parse(examples[0].example).steps[0].input.files;
+
+  const mockContext = {
+    input: {
+      files: files,
+    },
+    workspacePath,
+    logger: getVoidLogger(),
+    logStream: new PassThrough(),
+    output: jest.fn(),
+    createTemporaryDirectory: jest.fn(),
+  };
+
+  beforeEach(() => {
+    jest.restoreAllMocks();
+
+    mockFs({
+      [workspacePath]: {
+        [files[0]]: 'hello',
+        [files[1]]: 'world',
+        'a-folder': {
+          'unit-test-in-a-folder.js2': 'content',
+        },
+      },
+    });
+  });
+
+  afterEach(() => {
+    mockFs.restore();
+  });
+
+  it('should call fs.rm with the correct values', async () => {
+    files.forEach(file => {
+      const filePath = resolvePath(workspacePath, file);
+      const fileExists = fs.existsSync(filePath);
+      expect(fileExists).toBe(true);
+    });
+
+    await action.handler(mockContext);
+
+    files.forEach(file => {
+      const filePath = resolvePath(workspacePath, file);
+      const fileExists = fs.existsSync(filePath);
+      expect(fileExists).toBe(false);
+    });
+  });
+});
diff --git a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/filesystem/delete.examples.ts b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/filesystem/delete.examples.ts
new file mode 100644
index 0000000000..8aea076b9d
--- /dev/null
+++ b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/filesystem/delete.examples.ts
@@ -0,0 +1,36 @@
+/*
+ * 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 { TemplateExample } from '@backstage/plugin-scaffolder-node';
+import * as yaml from 'yaml';
+
+export const examples: TemplateExample[] = [
+  {
+    description: 'Delete specified files',
+    example: yaml.stringify({
+      steps: [
+        {
+          action: 'fs:delete',
+          id: 'deleteFiles',
+          name: 'Delete files',
+          input: {
+            files: ['file1.txt', 'file2.txt'],
+          },
+        },
+      ],
+    }),
+  },
+];
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 2f955c16ff..5787d245ab 100644
--- a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/filesystem/delete.ts
+++ b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/filesystem/delete.ts
@@ -18,6 +18,7 @@ import { createTemplateAction } from '@backstage/plugin-scaffolder-node';
 import { InputError } from '@backstage/errors';
 import { resolveSafeChildPath } from '@backstage/backend-common';
 import fs from 'fs-extra';
+import { examples } from './delete.examples';
 
 /**
  * Creates new action that enables deletion of files and directories in the workspace.
@@ -27,6 +28,7 @@ export const createFilesystemDeleteAction = () => {
   return createTemplateAction<{ files: string[] }>({
     id: 'fs:delete',
     description: 'Deletes files and directories from the workspace',
+    examples,
     schema: {
       input: {
         required: ['files'],
diff --git a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/filesystem/rename.examples.test.ts b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/filesystem/rename.examples.test.ts
new file mode 100644
index 0000000000..c4c27cc68e
--- /dev/null
+++ b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/filesystem/rename.examples.test.ts
@@ -0,0 +1,104 @@
+/*
+ * 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 * as os from 'os';
+import mockFs from 'mock-fs';
+import { resolve as resolvePath } from 'path';
+import { createFilesystemRenameAction } from './rename';
+import { getVoidLogger } from '@backstage/backend-common';
+import { PassThrough } from 'stream';
+import fs from 'fs-extra';
+import yaml from 'yaml';
+import { examples } from './rename.examples';
+
+const root = os.platform() === 'win32' ? 'C:\\rootDir' : '/rootDir';
+const workspacePath = resolvePath(root, 'my-workspace');
+
+describe('fs:rename examples', () => {
+  const action = createFilesystemRenameAction();
+  const files: { from: string; to: string }[] = yaml.parse(examples[0].example)
+    .steps[0].input.files;
+
+  const mockContext = {
+    input: {
+      files: files,
+    },
+    workspacePath,
+    logger: getVoidLogger(),
+    logStream: new PassThrough(),
+    output: jest.fn(),
+    createTemporaryDirectory: jest.fn(),
+  };
+
+  beforeEach(() => {
+    jest.restoreAllMocks();
+
+    mockFs({
+      [workspacePath]: {
+        [files[0].from]: 'hello',
+        [files[1].from]: 'world',
+        [files[2].from]: '!!!',
+        'file3Renamed.txt': 'I will be overwritten :(',
+        'a-folder': {
+          'file.md': 'content',
+        },
+      },
+    });
+  });
+
+  afterEach(() => {
+    mockFs.restore();
+  });
+
+  it('should call fs.move with the correct values', async () => {
+    mockContext.input.files.forEach(file => {
+      const filePath = resolvePath(workspacePath, file.from);
+      const fileExists = fs.existsSync(filePath);
+      expect(fileExists).toBe(true);
+    });
+
+    await action.handler(mockContext);
+
+    mockContext.input.files.forEach(file => {
+      const filePath = resolvePath(workspacePath, file.from);
+      const fileExists = fs.existsSync(filePath);
+      expect(fileExists).toBe(false);
+    });
+  });
+
+  it('should override when requested', async () => {
+    const sourceFile = files[2].from;
+    const destFile = files[2].to;
+    const sourceFilePath = resolvePath(workspacePath, sourceFile);
+    const destFilePath = resolvePath(workspacePath, destFile);
+
+    const sourceBeforeContent = fs.readFileSync(sourceFilePath, 'utf-8');
+    const destBeforeContent = fs.readFileSync(destFilePath, 'utf-8');
+
+    expect(sourceBeforeContent).not.toEqual(destBeforeContent);
+
+    await action.handler({
+      ...mockContext,
+      input: {
+        files,
+      },
+    });
+
+    const destAfterContent = fs.readFileSync(destFilePath, 'utf-8');
+
+    expect(sourceBeforeContent).toEqual(destAfterContent);
+  });
+});
diff --git a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/filesystem/rename.examples.ts b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/filesystem/rename.examples.ts
new file mode 100644
index 0000000000..59d7483a10
--- /dev/null
+++ b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/filesystem/rename.examples.ts
@@ -0,0 +1,40 @@
+/*
+ * 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 { TemplateExample } from '@backstage/plugin-scaffolder-node';
+import * as yaml from 'yaml';
+
+export const examples: TemplateExample[] = [
+  {
+    description: 'Rename specified files ',
+    example: yaml.stringify({
+      steps: [
+        {
+          action: 'fs:rename',
+          id: 'renameFiles',
+          name: 'Rename files',
+          input: {
+            files: [
+              { from: 'file1.txt', to: 'file1Renamed.txt' },
+              { from: 'file2.txt', to: 'file2Renamed.txt' },
+              { from: 'file3.txt', to: 'file3Renamed.txt', overwrite: true },
+            ],
+          },
+        },
+      ],
+    }),
+  },
+];
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 c29ba221c4..5d9d666d15 100644
--- a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/filesystem/rename.ts
+++ b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/filesystem/rename.ts
@@ -18,6 +18,7 @@ import { createTemplateAction } from '@backstage/plugin-scaffolder-node';
 import { resolveSafeChildPath } from '@backstage/backend-common';
 import { InputError } from '@backstage/errors';
 import fs from 'fs-extra';
+import { examples } from './rename.examples';
 
 /**
  * Creates a new action that allows renames of files and directories in the workspace.
@@ -33,6 +34,7 @@ export const createFilesystemRenameAction = () => {
   }>({
     id: 'fs:rename',
     description: 'Renames files and directories within the workspace',
+    examples,
     schema: {
       input: {
         required: ['files'],
diff --git a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/github/githubActionsDispatch.examples.test.ts b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/github/githubActionsDispatch.examples.test.ts
new file mode 100644
index 0000000000..fe04142a98
--- /dev/null
+++ b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/github/githubActionsDispatch.examples.test.ts
@@ -0,0 +1,133 @@
+/*
+ * 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 {
+  ScmIntegrations,
+  DefaultGithubCredentialsProvider,
+  GithubCredentialsProvider,
+} 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';
+import yaml from 'yaml';
+import { examples } from './githubActionsDispatch.examples';
+
+const mockOctokit = {
+  rest: {
+    actions: {
+      createWorkflowDispatch: jest.fn(),
+    },
+  },
+};
+jest.mock('octokit', () => ({
+  Octokit: class {
+    constructor() {
+      return mockOctokit;
+    }
+  },
+}));
+
+describe('github:actions:dispatch', () => {
+  const config = new ConfigReader({
+    integrations: {
+      github: [
+        { host: 'github.com', token: 'tokenlols' },
+        { host: 'ghe.github.com' },
+      ],
+    },
+  });
+
+  const integrations = ScmIntegrations.fromConfig(config);
+  let githubCredentialsProvider: GithubCredentialsProvider;
+  let action: TemplateAction<any>;
+
+  const mockContext = {
+    input: {
+      repoUrl: 'github.com?repo=repo&owner=owner',
+      workflowId: 'a-workflow-id',
+      branchOrTagName: 'main',
+    },
+    workspacePath: 'lol',
+    logger: getVoidLogger(),
+    logStream: new PassThrough(),
+    output: jest.fn(),
+    createTemporaryDirectory: jest.fn(),
+  };
+
+  beforeEach(() => {
+    jest.resetAllMocks();
+    githubCredentialsProvider =
+      DefaultGithubCredentialsProvider.fromIntegrations(integrations);
+    action = createGithubActionsDispatchAction({
+      integrations,
+      githubCredentialsProvider,
+    });
+  });
+
+  it('should call the githubApis for creating WorkflowDispatch without an input object', async () => {
+    mockOctokit.rest.actions.createWorkflowDispatch.mockResolvedValue({
+      data: {
+        foo: 'bar',
+      },
+    });
+
+    const repoUrl = 'github.com?repo=repo&owner=owner';
+    const workflowId = 'dispatch_workflow';
+    const branchOrTagName = 'main';
+    const ctx = Object.assign({}, mockContext, {
+      input: { repoUrl, workflowId, branchOrTagName },
+    });
+    await action.handler(ctx);
+
+    expect(
+      mockOctokit.rest.actions.createWorkflowDispatch,
+    ).toHaveBeenCalledWith({
+      owner: 'owner',
+      repo: 'repo',
+      workflow_id: workflowId,
+      ref: branchOrTagName,
+    });
+  });
+
+  it('should call the githubApis for creating WorkflowDispatch with an input object', async () => {
+    mockOctokit.rest.actions.createWorkflowDispatch.mockResolvedValue({
+      data: {
+        foo: 'bar',
+      },
+    });
+
+    const repoUrl = 'github.com?repo=repo&owner=owner';
+    const workflowId = 'dispatch_workflow';
+    const branchOrTagName = 'main';
+    const workflowInputs = yaml.parse(examples[1].example).steps[0].input
+      .workflowInputs;
+    const ctx = Object.assign({}, mockContext, {
+      input: { repoUrl, workflowId, branchOrTagName, workflowInputs },
+    });
+    await action.handler(ctx);
+    expect(
+      mockOctokit.rest.actions.createWorkflowDispatch,
+    ).toHaveBeenCalledWith({
+      owner: 'owner',
+      repo: 'repo',
+      workflow_id: workflowId,
+      ref: branchOrTagName,
+      inputs: workflowInputs,
+    });
+  });
+});
diff --git a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/github/githubActionsDispatch.examples.ts b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/github/githubActionsDispatch.examples.ts
new file mode 100644
index 0000000000..33ad86dd89
--- /dev/null
+++ b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/github/githubActionsDispatch.examples.ts
@@ -0,0 +1,74 @@
+/*
+ * 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 { TemplateExample } from '@backstage/plugin-scaffolder-node';
+import yaml from 'yaml';
+
+export const examples: TemplateExample[] = [
+  {
+    description: 'GitHub Action Workflow Without Inputs.',
+    example: yaml.stringify({
+      steps: [
+        {
+          action: 'github:actions:dispatch',
+          name: 'Dispatch Github Action Workflow',
+          input: {
+            repoUrl: 'github.com?repo=repo&owner=owner',
+            workflowId: 'WORKFLOW_ID',
+            branchOrTagName: 'main',
+          },
+        },
+      ],
+    }),
+  },
+  {
+    description: 'GitHub Action Workflow With Inputs',
+    example: yaml.stringify({
+      steps: [
+        {
+          action: 'github:actions:dispatch',
+          name: 'Dispatch Github Action Workflow with inputs',
+          input: {
+            repoUrl: 'github.com?repo=repo&owner=owner',
+            workflowId: 'WORKFLOW_ID',
+            branchOrTagName: 'main',
+            workflowInputs: {
+              input1: 'value1',
+              input2: 'value2',
+            },
+          },
+        },
+      ],
+    }),
+  },
+  {
+    description: 'GitHub Action Workflow With Custom Token',
+    example: yaml.stringify({
+      steps: [
+        {
+          action: 'github:actions:dispatch',
+          name: 'Dispatch GitHub Action Workflow (custom token)',
+          input: {
+            repoUrl: 'github.com?repo=reponame&owner=owner',
+            workflowId: 'WORKFLOW_ID',
+            branchOrTagName: 'release-1.0',
+            token: '${{ secrets.MY_CUSTOM_TOKEN }}',
+          },
+        },
+      ],
+    }),
+  },
+];
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 cd1593ee9f..6623ee1f27 100644
--- a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/github/githubActionsDispatch.ts
+++ b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/github/githubActionsDispatch.ts
@@ -23,6 +23,7 @@ import { createTemplateAction } from '@backstage/plugin-scaffolder-node';
 import { Octokit } from 'octokit';
 import { parseRepoUrl } from '../publish/util';
 import { getOctokitOptions } from './helpers';
+import { examples } from './githubActionsDispatch.examples';
 
 /**
  * Creates a new action that dispatches a GitHub Action workflow for a given branch or tag.
@@ -44,6 +45,7 @@ export function createGithubActionsDispatchAction(options: {
     id: 'github:actions:dispatch',
     description:
       'Dispatches a GitHub Action workflow for a given branch or tag',
+    examples,
     schema: {
       input: {
         type: 'object',
diff --git a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/github/githubRepoCreate.examples.test.ts b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/github/githubRepoCreate.examples.test.ts
new file mode 100644
index 0000000000..71bbc7c1c6
--- /dev/null
+++ b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/github/githubRepoCreate.examples.test.ts
@@ -0,0 +1,192 @@
+/*
+ * 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 { TemplateAction } from '@backstage/plugin-scaffolder-node';
+
+jest.mock('../helpers');
+
+import { getVoidLogger } from '@backstage/backend-common';
+import { ConfigReader } from '@backstage/config';
+import {
+  DefaultGithubCredentialsProvider,
+  GithubCredentialsProvider,
+  ScmIntegrations,
+} from '@backstage/integration';
+import { PassThrough } from 'stream';
+import { createGithubRepoCreateAction } from './githubRepoCreate';
+import { entityRefToName } from '../helpers';
+import yaml from 'yaml';
+import { examples } from './githubRepoCreate.examples';
+
+const publicKey = '2Sg8iYjAxxmI2LvUXpJjkYrMxURPc8r+dB7TJyvvcCU=';
+
+const mockOctokit = {
+  rest: {
+    users: {
+      getByUsername: jest.fn(),
+    },
+    repos: {
+      addCollaborator: jest.fn(),
+      createInOrg: jest.fn(),
+      createForAuthenticatedUser: jest.fn(),
+      replaceAllTopics: jest.fn(),
+    },
+    teams: {
+      addOrUpdateRepoPermissionsInOrg: jest.fn(),
+      getByName: jest.fn(),
+    },
+    actions: {
+      createRepoVariable: jest.fn(),
+      createOrUpdateRepoSecret: jest.fn(),
+      getRepoPublicKey: jest.fn(),
+    },
+  },
+};
+jest.mock('octokit', () => ({
+  Octokit: class {
+    constructor() {
+      return mockOctokit;
+    }
+  },
+}));
+
+describe('github:repo:create examples', () => {
+  const config = new ConfigReader({
+    integrations: {
+      github: [
+        { host: 'github.com', token: 'tokenlols' },
+        { host: 'ghe.github.com' },
+      ],
+    },
+  });
+
+  const integrations = ScmIntegrations.fromConfig(config);
+  let githubCredentialsProvider: GithubCredentialsProvider;
+  let action: TemplateAction<any>;
+
+  const mockContext = {
+    input: {
+      repoUrl: 'github.com?repo=repo&owner=owner',
+    },
+    workspacePath: 'lol',
+    logger: getVoidLogger(),
+    logStream: new PassThrough(),
+    output: jest.fn(),
+    createTemporaryDirectory: jest.fn(),
+  };
+
+  beforeEach(() => {
+    githubCredentialsProvider =
+      DefaultGithubCredentialsProvider.fromIntegrations(integrations);
+    action = createGithubRepoCreateAction({
+      integrations,
+      githubCredentialsProvider,
+    });
+    (entityRefToName as jest.Mock).mockImplementation((s: string) => s);
+    mockOctokit.rest.actions.getRepoPublicKey.mockResolvedValue({
+      data: {
+        key: publicKey,
+        key_id: 'keyid',
+      },
+    });
+  });
+
+  afterEach(jest.resetAllMocks);
+
+  it('should call the githubApis with the correct values for createInOrg', async () => {
+    mockOctokit.rest.users.getByUsername.mockResolvedValue({
+      data: { type: 'Organization' },
+    });
+
+    mockOctokit.rest.repos.createInOrg.mockResolvedValue({ data: {} });
+
+    await action.handler({
+      ...mockContext,
+      input: yaml.parse(examples[0].example).steps[0].input,
+    });
+
+    expect(mockOctokit.rest.repos.createInOrg).toHaveBeenCalledWith({
+      name: 'repo',
+      org: 'owner',
+      private: true,
+      delete_branch_on_merge: false,
+      allow_squash_merge: true,
+      squash_merge_commit_title: 'COMMIT_OR_PR_TITLE',
+      squash_merge_commit_message: 'COMMIT_MESSAGES',
+      allow_merge_commit: true,
+      allow_rebase_merge: true,
+      allow_auto_merge: false,
+      visibility: 'private',
+    });
+  });
+
+  it('should call the githubApis with a description for createInOrg', async () => {
+    mockOctokit.rest.users.getByUsername.mockResolvedValue({
+      data: { type: 'Organization' },
+    });
+
+    mockOctokit.rest.repos.createInOrg.mockResolvedValue({ data: {} });
+
+    await action.handler({
+      ...mockContext,
+      input: yaml.parse(examples[1].example).steps[0].input,
+    });
+
+    expect(mockOctokit.rest.repos.createInOrg).toHaveBeenCalledWith({
+      name: 'repo',
+      description: 'My new repository',
+      org: 'owner',
+      private: true,
+      delete_branch_on_merge: false,
+      allow_squash_merge: true,
+      squash_merge_commit_title: 'COMMIT_OR_PR_TITLE',
+      squash_merge_commit_message: 'COMMIT_MESSAGES',
+      allow_merge_commit: true,
+      allow_rebase_merge: true,
+      allow_auto_merge: false,
+      visibility: 'private',
+    });
+  });
+
+  it('should call the githubApis with wiki and issues disabled for createInOrg', async () => {
+    mockOctokit.rest.users.getByUsername.mockResolvedValue({
+      data: { type: 'Organization' },
+    });
+
+    mockOctokit.rest.repos.createInOrg.mockResolvedValue({ data: {} });
+
+    await action.handler({
+      ...mockContext,
+      input: yaml.parse(examples[2].example).steps[0].input,
+    });
+
+    expect(mockOctokit.rest.repos.createInOrg).toHaveBeenCalledWith({
+      name: 'repo',
+      org: 'owner',
+      private: true,
+      delete_branch_on_merge: false,
+      allow_squash_merge: true,
+      squash_merge_commit_title: 'COMMIT_OR_PR_TITLE',
+      squash_merge_commit_message: 'COMMIT_MESSAGES',
+      allow_merge_commit: true,
+      allow_rebase_merge: true,
+      allow_auto_merge: false,
+      visibility: 'private',
+      has_issues: false, // disable issues
+      has_wiki: false, // disable wiki
+    });
+  });
+});
diff --git a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/github/githubRepoCreate.examples.ts b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/github/githubRepoCreate.examples.ts
new file mode 100644
index 0000000000..a58da1ee29
--- /dev/null
+++ b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/github/githubRepoCreate.examples.ts
@@ -0,0 +1,66 @@
+/*
+ * 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 { TemplateExample } from '@backstage/plugin-scaffolder-node';
+import yaml from 'yaml';
+
+export const examples: TemplateExample[] = [
+  {
+    description: 'Creates a GitHub repository with default configuration.',
+    example: yaml.stringify({
+      steps: [
+        {
+          action: 'github:repo:create',
+          name: 'Create a new GitHub repository',
+          input: {
+            repoUrl: 'github.com?repo=repo&owner=owner',
+          },
+        },
+      ],
+    }),
+  },
+  {
+    description: 'Add a description.',
+    example: yaml.stringify({
+      steps: [
+        {
+          action: 'github:repo:create',
+          name: 'Create a new GitHub repository with a description',
+          input: {
+            repoUrl: 'github.com?repo=repo&owner=owner',
+            description: 'My new repository',
+          },
+        },
+      ],
+    }),
+  },
+  {
+    description: 'Disable wiki and issues.',
+    example: yaml.stringify({
+      steps: [
+        {
+          action: 'github:repo:create',
+          name: 'Create a new GitHub repository without wiki and issues',
+          input: {
+            repoUrl: 'github.com?repo=repo&owner=owner',
+            hasIssues: false,
+            hasWiki: false,
+          },
+        },
+      ],
+    }),
+  },
+];
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 0ec1c83910..e0fde3b193 100644
--- a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/github/githubRepoCreate.ts
+++ b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/github/githubRepoCreate.ts
@@ -28,6 +28,7 @@ import {
 } from './helpers';
 import * as inputProps from './inputProperties';
 import * as outputProps from './outputProperties';
+import { examples } from './githubRepoCreate.examples';
 
 /**
  * Creates a new action that initializes a git repository
@@ -96,6 +97,7 @@ export function createGithubRepoCreateAction(options: {
   }>({
     id: 'github:repo:create',
     description: 'Creates a GitHub repository.',
+    examples,
     schema: {
       input: {
         type: 'object',
diff --git a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/github/githubRepoPush.examples.test.ts b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/github/githubRepoPush.examples.test.ts
new file mode 100644
index 0000000000..84d489272d
--- /dev/null
+++ b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/github/githubRepoPush.examples.test.ts
@@ -0,0 +1,131 @@
+/*
+ * 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 { TemplateAction } from '@backstage/plugin-scaffolder-node';
+import { getVoidLogger } from '@backstage/backend-common';
+import { ConfigReader } from '@backstage/config';
+import {
+  DefaultGithubCredentialsProvider,
+  GithubCredentialsProvider,
+  ScmIntegrations,
+} from '@backstage/integration';
+import { PassThrough } from 'stream';
+import { initRepoAndPush } from '../helpers';
+import { createGithubRepoPushAction } from './githubRepoPush';
+import { examples } from './githubRepoPush.examples';
+import yaml from 'yaml';
+
+const mockGit = {
+  init: jest.fn(),
+  add: jest.fn(),
+  checkout: jest.fn(),
+  commit: jest
+    .fn()
+    .mockResolvedValue('220f19cc36b551763d157f1b5e4a4b446165dbd6'),
+  fetch: jest.fn(),
+  addRemote: jest.fn(),
+  push: jest.fn(),
+};
+
+jest.mock('@backstage/backend-common', () => ({
+  Git: {
+    fromAuth() {
+      return mockGit;
+    },
+  },
+  getVoidLogger: jest.requireActual('@backstage/backend-common').getVoidLogger,
+}));
+
+jest.mock('../helpers');
+
+const initRepoAndPushMocked = initRepoAndPush as jest.Mock<
+  Promise<{ commitHash: string }>
+>;
+
+const mockOctokit = {
+  rest: {
+    repos: {
+      get: jest.fn(),
+    },
+  },
+};
+jest.mock('octokit', () => ({
+  Octokit: class {
+    constructor() {
+      return mockOctokit;
+    }
+  },
+}));
+
+describe('github:repo:push examples', () => {
+  const config = new ConfigReader({
+    integrations: {
+      github: [
+        { host: 'github.com', token: 'tokenlols' },
+        { host: 'ghe.github.com' },
+      ],
+    },
+  });
+
+  const integrations = ScmIntegrations.fromConfig(config);
+  let githubCredentialsProvider: GithubCredentialsProvider;
+  let action: TemplateAction<any>;
+
+  const mockContext = {
+    workspacePath: 'lol',
+    logger: getVoidLogger(),
+    logStream: new PassThrough(),
+    output: jest.fn(),
+    createTemporaryDirectory: jest.fn(),
+  };
+
+  beforeEach(() => {
+    jest.resetAllMocks();
+
+    initRepoAndPushMocked.mockResolvedValue({ commitHash: 'test123' });
+
+    githubCredentialsProvider =
+      DefaultGithubCredentialsProvider.fromIntegrations(integrations);
+    action = createGithubRepoPushAction({
+      integrations,
+      config,
+      githubCredentialsProvider,
+    });
+  });
+
+  it('should call initRepoAndPush with the correct values', async () => {
+    mockOctokit.rest.repos.get.mockResolvedValue({
+      data: {
+        clone_url: 'https://github.com/clone/url.git',
+        html_url: 'https://github.com/html/url',
+      },
+    });
+
+    await action.handler({
+      ...mockContext,
+      input: yaml.parse(examples[0].example).steps[0].input,
+    });
+
+    expect(initRepoAndPush).toHaveBeenCalledWith({
+      dir: mockContext.workspacePath,
+      remoteUrl: 'https://github.com/clone/url.git',
+      defaultBranch: 'master',
+      auth: { username: 'x-access-token', password: 'tokenlols' },
+      logger: mockContext.logger,
+      commitMessage: 'initial commit',
+      gitAuthorInfo: {},
+    });
+  });
+});
diff --git a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/github/githubRepoPush.examples.ts b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/github/githubRepoPush.examples.ts
new file mode 100644
index 0000000000..5d3ba1e9d8
--- /dev/null
+++ b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/github/githubRepoPush.examples.ts
@@ -0,0 +1,65 @@
+/*
+ * 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 { TemplateExample } from '@backstage/plugin-scaffolder-node';
+import yaml from 'yaml';
+
+export const examples: TemplateExample[] = [
+  {
+    description: 'Setup repo with no modifications to branch protection rules',
+    example: yaml.stringify({
+      steps: [
+        {
+          action: 'github:repo:push',
+          name: 'Create test repo with testuser as owner.',
+          input: {
+            repoUrl: 'github.com?repo=test&owner=testuser',
+          },
+        },
+      ],
+    }),
+  },
+  {
+    description: 'Setup repo with required codeowners check',
+    example: yaml.stringify({
+      steps: [
+        {
+          action: 'github:repo:push',
+          name: 'Require codeowner branch protection rule',
+          input: {
+            repoUrl: 'github.com?repo=reponame&owner=owner',
+            requireCodeOwnerReviews: true,
+          },
+        },
+      ],
+    }),
+  },
+  {
+    description: 'Change the default required number of approvals',
+    example: yaml.stringify({
+      steps: [
+        {
+          action: 'github:repo:push',
+          name: 'Require two approvals before merging',
+          input: {
+            repoUrl: 'github.com?repo=reponame&owner=owner',
+            requiredApprovingReviewCount: 2,
+          },
+        },
+      ],
+    }),
+  },
+];
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 fb15535453..e30eedad02 100644
--- a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/github/githubRepoPush.ts
+++ b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/github/githubRepoPush.ts
@@ -26,6 +26,7 @@ import { parseRepoUrl } from '../publish/util';
 import { getOctokitOptions, initRepoPushAndProtect } from './helpers';
 import * as inputProps from './inputProperties';
 import * as outputProps from './outputProperties';
+import { examples } from './githubRepoPush.examples';
 
 /**
  * Creates a new action that initializes a git repository of the content in the workspace
@@ -76,6 +77,7 @@ export function createGithubRepoPushAction(options: {
     id: 'github:repo:push',
     description:
       'Initializes a git repository of contents in workspace and publishes it to GitHub.',
+    examples,
     schema: {
       input: {
         type: 'object',
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 9f68eb848a..9b7673ea29 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
@@ -42,7 +42,10 @@ describe('publish:azure', () => {
   const config = new ConfigReader({
     integrations: {
       azure: [
-        { host: 'dev.azure.com', token: 'tokenlols' },
+        {
+          host: 'dev.azure.com',
+          credentials: [{ personalAccessToken: 'tokenlols' }],
+        },
         { host: 'myazurehostnotoken.com' },
       ],
     },
@@ -115,7 +118,9 @@ describe('publish:azure', () => {
             'myazurehostnotoken.com?repo=bob&owner=owner&organization=org',
         },
       }),
-    ).rejects.toThrow(/No token provided for Azure Integration/);
+    ).rejects.toThrow(
+      /No credentials provided https:\/\/myazurehostnotoken.com\/org, please check your integrations config/,
+    );
   });
 
   it('should throw when no repo is returned', async () => {
@@ -260,7 +265,10 @@ describe('publish:azure', () => {
     const customAuthorConfig = new ConfigReader({
       integrations: {
         azure: [
-          { host: 'dev.azure.com', token: 'tokenlols' },
+          {
+            host: 'dev.azure.com',
+            credentials: [{ personalAccessToken: 'tokenlols' }],
+          },
           { host: 'myazurehostnotoken.com' },
         ],
       },
@@ -301,7 +309,10 @@ describe('publish:azure', () => {
     const customAuthorConfig = new ConfigReader({
       integrations: {
         azure: [
-          { host: 'dev.azure.com', token: 'tokenlols' },
+          {
+            host: 'dev.azure.com',
+            credentials: [{ personalAccessToken: 'tokenlols' }],
+          },
           { host: 'myazurehostnotoken.com' },
         ],
       },
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 96b7c87204..b6c0226163 100644
--- a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/publish/azure.ts
+++ b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/publish/azure.ts
@@ -15,10 +15,17 @@
  */
 
 import { InputError } from '@backstage/errors';
-import { ScmIntegrationRegistry } from '@backstage/integration';
+import {
+  DefaultAzureDevOpsCredentialsProvider,
+  ScmIntegrationRegistry,
+} from '@backstage/integration';
 import { initRepoAndPush } from '../helpers';
 import { GitRepositoryCreateOptions } from 'azure-devops-node-api/interfaces/GitInterfaces';
-import { getPersonalAccessTokenHandler, WebApi } from 'azure-devops-node-api';
+import {
+  getBearerHandler,
+  getPersonalAccessTokenHandler,
+  WebApi,
+} from 'azure-devops-node-api';
 import { getRepoSourceDirectory, parseRepoUrl } from './util';
 import { createTemplateAction } from '@backstage/plugin-scaffolder-node';
 import { Config } from '@backstage/config';
@@ -135,22 +142,23 @@ export function createPublishAzureAction(options: {
         );
       }
 
-      const integrationConfig = integrations.azure.byHost(host);
+      const url = `https://${host}/${organization}`;
+      const credentialProvider =
+        DefaultAzureDevOpsCredentialsProvider.fromIntegrations(integrations);
+      const credentials = await credentialProvider.getCredentials({ url: url });
 
-      if (!integrationConfig) {
+      if (credentials === undefined && ctx.input.token === undefined) {
         throw new InputError(
-          `No matching integration configuration for host ${host}, please check your integrations config`,
+          `No credentials provided ${url}, please check your integrations config`,
         );
       }
 
-      if (!integrationConfig.config.token && !ctx.input.token) {
-        throw new InputError(`No token provided for Azure Integration ${host}`);
-      }
+      const authHandler =
+        ctx.input.token || credentials?.type === 'pat'
+          ? getPersonalAccessTokenHandler(ctx.input.token ?? credentials!.token)
+          : getBearerHandler(credentials!.token);
 
-      const token = ctx.input.token ?? integrationConfig.config.token!;
-      const authHandler = getPersonalAccessTokenHandler(token);
-
-      const webApi = new WebApi(`https://${host}/${organization}`, authHandler);
+      const webApi = new WebApi(url, authHandler);
       const client = await webApi.getGitApi();
       const createOptions: GitRepositoryCreateOptions = { name: repo };
       const returnedRepo = await client.createRepository(createOptions, owner);
@@ -187,14 +195,19 @@ export function createPublishAzureAction(options: {
           : config.getOptionalString('scaffolder.defaultAuthor.email'),
       };
 
+      const auth =
+        ctx.input.token || credentials?.type === 'pat'
+          ? {
+              username: 'notempty',
+              password: ctx.input.token ?? credentials!.token,
+            }
+          : { token: credentials!.token };
+
       const commitResult = await initRepoAndPush({
         dir: getRepoSourceDirectory(ctx.workspacePath, ctx.input.sourcePath),
         remoteUrl,
         defaultBranch,
-        auth: {
-          username: 'notempty',
-          password: token,
-        },
+        auth: auth,
         logger: ctx.logger,
         commitMessage: gitCommitMessage
           ? gitCommitMessage
diff --git a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/publish/bitbucket.examples.test.ts b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/publish/bitbucket.examples.test.ts
new file mode 100644
index 0000000000..2514c44637
--- /dev/null
+++ b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/publish/bitbucket.examples.test.ts
@@ -0,0 +1,369 @@
+/*
+ * 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.
+ */
+
+jest.mock('../helpers', () => {
+  return {
+    initRepoAndPush: jest.fn().mockResolvedValue({
+      commitHash: '220f19cc36b551763d157f1b5e4a4b446165dbd6',
+    }),
+    commitAndPushRepo: jest.fn().mockResolvedValue({
+      commitHash: '220f19cc36b551763d157f1b5e4a4b446165dbd6',
+    }),
+  };
+});
+
+import { createPublishBitbucketAction } from './bitbucket';
+import { rest } from 'msw';
+import { setupServer } from 'msw/node';
+import { setupRequestMockHandlers } from '@backstage/backend-test-utils';
+import { ScmIntegrations } from '@backstage/integration';
+import { ConfigReader } from '@backstage/config';
+import { getVoidLogger } from '@backstage/backend-common';
+import { PassThrough } from 'stream';
+import { initRepoAndPush } from '../helpers';
+import yaml from 'yaml';
+import { examples } from './bitbucket.examples';
+
+describe('publish:bitbucket', () => {
+  const config = new ConfigReader({
+    integrations: {
+      bitbucket: [
+        {
+          host: 'bitbucket.org',
+          token: 'tokenlols',
+        },
+        {
+          host: 'hosted.bitbucket.com',
+          token: 'thing',
+          apiBaseUrl: 'https://hosted.bitbucket.com/rest/api/1.0',
+        },
+        {
+          host: 'notoken.bitbucket.com',
+        },
+      ],
+    },
+  });
+
+  const integrations = ScmIntegrations.fromConfig(config);
+  const action = createPublishBitbucketAction({ integrations, config });
+  const mockContext = {
+    input: {
+      repoUrl: 'bitbucket.org?workspace=workspace&project=project&repo=repo',
+      repoVisibility: 'private' as const,
+    },
+    workspacePath: 'lol',
+    logger: getVoidLogger(),
+    logStream: new PassThrough(),
+    output: jest.fn(),
+    createTemporaryDirectory: jest.fn(),
+  };
+  const server = setupServer();
+  setupRequestMockHandlers(server);
+
+  beforeEach(() => {
+    jest.resetAllMocks();
+  });
+
+  it('should call initAndPush with the correct values', async () => {
+    server.use(
+      rest.post(
+        'https://api.bitbucket.org/2.0/repositories/workspace/repo',
+        (_, res, ctx) =>
+          res(
+            ctx.status(200),
+            ctx.set('Content-Type', 'application/json'),
+            ctx.json({
+              links: {
+                html: {
+                  href: 'https://bitbucket.org/workspace/repo',
+                },
+                clone: [
+                  {
+                    name: 'https',
+                    href: 'https://bitbucket.org/workspace/cloneurl',
+                  },
+                ],
+              },
+            }),
+          ),
+      ),
+    );
+
+    await action.handler({
+      ...mockContext,
+      input: yaml.parse(examples[0].example).steps[0].input,
+    });
+
+    expect(initRepoAndPush).toHaveBeenCalledWith({
+      dir: mockContext.workspacePath,
+      remoteUrl: 'https://bitbucket.org/workspace/cloneurl',
+      defaultBranch: 'master',
+      auth: { username: 'x-token-auth', password: 'tokenlols' },
+      logger: mockContext.logger,
+      commitMessage: 'initial commit',
+      gitAuthorInfo: {},
+    });
+  });
+
+  it('should call initAndPush with the correct default branch', async () => {
+    server.use(
+      rest.post(
+        'https://api.bitbucket.org/2.0/repositories/workspace/repo',
+        (_, res, ctx) =>
+          res(
+            ctx.status(200),
+            ctx.set('Content-Type', 'application/json'),
+            ctx.json({
+              links: {
+                html: {
+                  href: 'https://bitbucket.org/workspace/repo',
+                },
+                clone: [
+                  {
+                    name: 'https',
+                    href: 'https://bitbucket.org/workspace/cloneurl',
+                  },
+                ],
+              },
+            }),
+          ),
+      ),
+    );
+
+    await action.handler({
+      ...mockContext,
+      input: yaml.parse(examples[3].example).steps[0].input,
+    });
+
+    expect(initRepoAndPush).toHaveBeenCalledWith({
+      dir: mockContext.workspacePath,
+      remoteUrl: 'https://bitbucket.org/workspace/cloneurl',
+      defaultBranch: 'main',
+      auth: { username: 'x-token-auth', password: 'tokenlols' },
+      logger: mockContext.logger,
+      commitMessage: 'initial commit',
+      gitAuthorInfo: {},
+    });
+  });
+
+  it('should call initAndPush with the specified source path', async () => {
+    server.use(
+      rest.post(
+        'https://api.bitbucket.org/2.0/repositories/workspace/repo',
+        (_, res, ctx) =>
+          res(
+            ctx.status(200),
+            ctx.set('Content-Type', 'application/json'),
+            ctx.json({
+              links: {
+                html: {
+                  href: 'https://bitbucket.org/workspace/repo',
+                },
+                clone: [
+                  {
+                    name: 'https',
+                    href: 'https://bitbucket.org/workspace/cloneurl',
+                  },
+                ],
+              },
+            }),
+          ),
+      ),
+    );
+
+    await action.handler({
+      ...mockContext,
+      input: yaml.parse(examples[4].example).steps[0].input,
+    });
+    expect(initRepoAndPush).toHaveBeenCalledWith({
+      dir: `${mockContext.workspacePath}/repoRoot`,
+      remoteUrl: 'https://bitbucket.org/workspace/cloneurl',
+      auth: { username: 'x-token-auth', password: 'tokenlols' },
+      logger: mockContext.logger,
+      defaultBranch: 'main',
+      commitMessage: 'initial commit',
+      gitAuthorInfo: {},
+    });
+  });
+
+  it('should call initAndPush with the authentication token', async () => {
+    server.use(
+      rest.post(
+        'https://api.bitbucket.org/2.0/repositories/workspace/repo',
+        (_, res, ctx) =>
+          res(
+            ctx.status(200),
+            ctx.set('Content-Type', 'application/json'),
+            ctx.json({
+              links: {
+                html: {
+                  href: 'https://bitbucket.org/workspace/repo',
+                },
+                clone: [
+                  {
+                    name: 'https',
+                    href: 'https://bitbucket.org/workspace/cloneurl',
+                  },
+                ],
+              },
+            }),
+          ),
+      ),
+    );
+
+    await action.handler({
+      ...mockContext,
+      input: yaml.parse(examples[6].example).steps[0].input,
+    });
+    expect(initRepoAndPush).toHaveBeenCalledWith({
+      dir: mockContext.workspacePath,
+      remoteUrl: 'https://bitbucket.org/workspace/cloneurl',
+      auth: { username: 'x-token-auth', password: 'your-auth-token' },
+      logger: mockContext.logger,
+      defaultBranch: 'main',
+      commitMessage: 'initial commit',
+      gitAuthorInfo: {},
+    });
+  });
+
+  it('should call initAndPush with the custom commit message', async () => {
+    server.use(
+      rest.post(
+        'https://api.bitbucket.org/2.0/repositories/workspace/repo',
+        (_, res, ctx) =>
+          res(
+            ctx.status(200),
+            ctx.set('Content-Type', 'application/json'),
+            ctx.json({
+              links: {
+                html: {
+                  href: 'https://bitbucket.org/workspace/repo',
+                },
+                clone: [
+                  {
+                    name: 'https',
+                    href: 'https://bitbucket.org/workspace/cloneurl',
+                  },
+                ],
+              },
+            }),
+          ),
+      ),
+    );
+
+    await action.handler({
+      ...mockContext,
+      input: yaml.parse(examples[7].example).steps[0].input,
+    });
+
+    expect(initRepoAndPush).toHaveBeenCalledWith({
+      dir: mockContext.workspacePath,
+      remoteUrl: 'https://bitbucket.org/workspace/cloneurl',
+      auth: { username: 'x-token-auth', password: 'your-auth-token' },
+      logger: mockContext.logger,
+      defaultBranch: 'main',
+      commitMessage: 'Initial commit with custom message',
+      gitAuthorInfo: { email: undefined, name: undefined },
+    });
+  });
+
+  it('should call initAndPush with the custom author name and email for the commit.', async () => {
+    server.use(
+      rest.post(
+        'https://api.bitbucket.org/2.0/repositories/workspace/repo',
+        (_, res, ctx) =>
+          res(
+            ctx.status(200),
+            ctx.set('Content-Type', 'application/json'),
+            ctx.json({
+              links: {
+                html: {
+                  href: 'https://bitbucket.org/workspace/repo',
+                },
+                clone: [
+                  {
+                    name: 'https',
+                    href: 'https://bitbucket.org/workspace/cloneurl',
+                  },
+                ],
+              },
+            }),
+          ),
+      ),
+    );
+
+    await action.handler({
+      ...mockContext,
+      input: yaml.parse(examples[8].example).steps[0].input,
+    });
+
+    expect(initRepoAndPush).toHaveBeenCalledWith({
+      dir: mockContext.workspacePath,
+      remoteUrl: 'https://bitbucket.org/workspace/cloneurl',
+      auth: { username: 'x-token-auth', password: 'your-auth-token' },
+      logger: mockContext.logger,
+      defaultBranch: 'main',
+      commitMessage: 'Initial commit with custom message',
+      gitAuthorInfo: { email: 'your.email@example.com', name: 'Your Name' },
+    });
+  });
+
+  describe('LFS for hosted bitbucket', () => {
+    const repoCreationResponse = {
+      links: {
+        self: [
+          {
+            href: 'https://bitbucket.mycompany.com/projects/project/repos/repo',
+          },
+        ],
+        clone: [
+          {
+            name: 'http',
+            href: 'https://bitbucket.mycompany.com/scm/project/repo',
+          },
+        ],
+      },
+    };
+
+    it('should call the correct APIs to enable LFS if requested and the host is hosted bitbucket', async () => {
+      expect.assertions(1);
+      server.use(
+        rest.post(
+          'https://hosted.bitbucket.com/rest/api/1.0/projects/project/repos',
+          (_, res, ctx) => {
+            return res(
+              ctx.status(201),
+              ctx.set('Content-Type', 'application/json'),
+              ctx.json(repoCreationResponse),
+            );
+          },
+        ),
+        rest.put(
+          'https://hosted.bitbucket.com/rest/git-lfs/admin/projects/project/repos/repo/enabled',
+          (req, res, ctx) => {
+            expect(req.headers.get('Authorization')).toBe('Bearer thing');
+            return res(ctx.status(204));
+          },
+        ),
+      );
+
+      await action.handler({
+        ...mockContext,
+        input: yaml.parse(examples[5].example).steps[0].input,
+      });
+    });
+  });
+});
diff --git a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/publish/bitbucket.examples.ts b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/publish/bitbucket.examples.ts
new file mode 100644
index 0000000000..6667afcc9e
--- /dev/null
+++ b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/publish/bitbucket.examples.ts
@@ -0,0 +1,196 @@
+/*
+ * 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 { TemplateExample } from '@backstage/plugin-scaffolder-node';
+import yaml from 'yaml';
+
+export const examples: TemplateExample[] = [
+  {
+    description:
+      'Initializes a git repository of contents in workspace and publish it to Bitbucket with default configuration.',
+    example: yaml.stringify({
+      steps: [
+        {
+          id: 'publish',
+          action: 'publish:bitbucket',
+          name: 'Publish to Bitbucket',
+          input: {
+            repoUrl:
+              'bitbucket.org?repo=repo&workspace=workspace&project=project',
+          },
+        },
+      ],
+    }),
+  },
+  {
+    description: 'Add a description.',
+    example: yaml.stringify({
+      steps: [
+        {
+          id: 'publish',
+          action: 'publish:bitbucket',
+          name: 'Publish to Bitbucket',
+          input: {
+            repoUrl:
+              'bitbucket.org?repo=repo&workspace=workspace&project=project',
+            description: 'Initialize a git repository',
+          },
+        },
+      ],
+    }),
+  },
+  {
+    description: 'Change visibility of the repository.',
+    example: yaml.stringify({
+      steps: [
+        {
+          id: 'publish',
+          action: 'publish:bitbucket',
+          name: 'Publish to Bitbucket',
+          input: {
+            repoUrl:
+              'bitbucket.org?repo=repo&workspace=workspace&project=project',
+            description: 'Initialize a git repository',
+            repoVisibility: 'public',
+          },
+        },
+      ],
+    }),
+  },
+  {
+    description: 'Set the default branch.',
+    example: yaml.stringify({
+      steps: [
+        {
+          id: 'publish',
+          action: 'publish:bitbucket',
+          name: 'Publish to Bitbucket',
+          input: {
+            repoUrl:
+              'bitbucket.org?repo=repo&workspace=workspace&project=project',
+            description: 'Initialize a git repository',
+            repoVisibility: 'public',
+            defaultBranch: 'main',
+          },
+        },
+      ],
+    }),
+  },
+  {
+    description: 'Specify a source path within the workspace.',
+    example: yaml.stringify({
+      steps: [
+        {
+          id: 'publish',
+          action: 'publish:bitbucket',
+          name: 'Publish to Bitbucket',
+          input: {
+            repoUrl:
+              'bitbucket.org?repo=repo&workspace=workspace&project=project',
+            description: 'Initialize a git repository',
+            repoVisibility: 'public',
+            defaultBranch: 'main',
+            sourcePath: './repoRoot',
+          },
+        },
+      ],
+    }),
+  },
+  {
+    description: 'Enable LFS for the repository.',
+    example: yaml.stringify({
+      steps: [
+        {
+          id: 'publish',
+          action: 'publish:bitbucket',
+          name: 'Publish to Bitbucket',
+          input: {
+            repoUrl: 'hosted.bitbucket.com?project=project&repo=repo',
+            description: 'Initialize a git repository',
+            repoVisibility: 'public',
+            defaultBranch: 'main',
+            sourcePath: './repoRoot',
+            enableLFS: true,
+          },
+        },
+      ],
+    }),
+  },
+  {
+    description: 'Provide an authentication token for Bitbucket.',
+    example: yaml.stringify({
+      steps: [
+        {
+          id: 'publish',
+          action: 'publish:bitbucket',
+          name: 'Publish to Bitbucket',
+          input: {
+            repoUrl:
+              'bitbucket.org?repo=repo&workspace=workspace&project=project',
+            description: 'Initialize a git repository',
+            repoVisibility: 'public',
+            defaultBranch: 'main',
+            token: 'your-auth-token',
+          },
+        },
+      ],
+    }),
+  },
+  {
+    description: 'Set a custom commit message.',
+    example: yaml.stringify({
+      steps: [
+        {
+          id: 'publish',
+          action: 'publish:bitbucket',
+          name: 'Publish to Bitbucket',
+          input: {
+            repoUrl:
+              'bitbucket.org?repo=repo&workspace=workspace&project=project',
+            description: 'Initialize a git repository',
+            repoVisibility: 'public',
+            defaultBranch: 'main',
+            token: 'your-auth-token',
+            gitCommitMessage: 'Initial commit with custom message',
+          },
+        },
+      ],
+    }),
+  },
+  {
+    description: 'Set a custom author name and email for the commit.',
+    example: yaml.stringify({
+      steps: [
+        {
+          id: 'publish',
+          action: 'publish:bitbucket',
+          name: 'Publish to Bitbucket',
+          input: {
+            repoUrl:
+              'bitbucket.org?repo=repo&workspace=workspace&project=project',
+            description: 'Initialize a git repository',
+            repoVisibility: 'public',
+            defaultBranch: 'main',
+            token: 'your-auth-token',
+            gitCommitMessage: 'Initial commit with custom message',
+            gitAuthorName: 'Your Name',
+            gitAuthorEmail: 'your.email@example.com',
+          },
+        },
+      ],
+    }),
+  },
+];
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 6a7341bdc9..a4d664e0e7 100644
--- a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/publish/bitbucket.ts
+++ b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/publish/bitbucket.ts
@@ -24,6 +24,7 @@ import fetch, { Response, RequestInit } from 'node-fetch';
 import { initRepoAndPush } from '../helpers';
 import { getRepoSourceDirectory, parseRepoUrl } from './util';
 import { Config } from '@backstage/config';
+import { examples } from './bitbucket.examples';
 
 const createBitbucketCloudRepository = async (opts: {
   workspace: string;
@@ -221,6 +222,7 @@ export function createPublishBitbucketAction(options: {
     id: 'publish:bitbucket',
     description:
       'Initializes a git repository of the content in the workspace, and publishes it to Bitbucket.',
+    examples,
     schema: {
       input: {
         type: 'object',
diff --git a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/publish/github.examples.test.ts b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/publish/github.examples.test.ts
new file mode 100644
index 0000000000..4d87ec97c4
--- /dev/null
+++ b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/publish/github.examples.test.ts
@@ -0,0 +1,151 @@
+/*
+ * 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.
+ */
+jest.mock('../helpers');
+
+import { TemplateAction } from '@backstage/plugin-scaffolder-node';
+import { getVoidLogger } from '@backstage/backend-common';
+import { ConfigReader } from '@backstage/config';
+import {
+  DefaultGithubCredentialsProvider,
+  GithubCredentialsProvider,
+  ScmIntegrations,
+} from '@backstage/integration';
+import { PassThrough } from 'stream';
+import { entityRefToName, initRepoAndPush } from '../helpers';
+import { createPublishGithubAction } from './github';
+import { examples } from './github.examples';
+import yaml from 'yaml';
+
+const publicKey = '2Sg8iYjAxxmI2LvUXpJjkYrMxURPc8r+dB7TJyvvcCU=';
+
+const initRepoAndPushMocked = initRepoAndPush as jest.Mock<
+  Promise<{ commitHash: string }>
+>;
+
+const mockOctokit = {
+  rest: {
+    users: {
+      getByUsername: jest.fn(),
+    },
+    repos: {
+      addCollaborator: jest.fn(),
+      createInOrg: jest.fn(),
+      createForAuthenticatedUser: jest.fn(),
+      replaceAllTopics: jest.fn(),
+    },
+    teams: {
+      getByName: jest.fn(),
+      addOrUpdateRepoPermissionsInOrg: jest.fn(),
+    },
+    actions: {
+      createRepoVariable: jest.fn(),
+      createOrUpdateRepoSecret: jest.fn(),
+      getRepoPublicKey: jest.fn(),
+    },
+  },
+};
+jest.mock('octokit', () => ({
+  Octokit: class {
+    constructor() {
+      return mockOctokit;
+    }
+  },
+}));
+
+describe('publish:github', () => {
+  const config = new ConfigReader({
+    integrations: {
+      github: [
+        { host: 'github.com', token: 'tokenlols' },
+        { host: 'ghe.github.com' },
+      ],
+    },
+  });
+
+  const { entityRefToName: realFamiliarizeEntityName } =
+    jest.requireActual('../helpers');
+  const integrations = ScmIntegrations.fromConfig(config);
+  let githubCredentialsProvider: GithubCredentialsProvider;
+  let action: TemplateAction<any>;
+
+  const mockContext = {
+    input: {
+      repoUrl: 'github.com?repo=repo&owner=owner',
+      description: 'description',
+      repoVisibility: 'private' as const,
+      access: 'owner/blam',
+    },
+    workspacePath: 'lol',
+    logger: getVoidLogger(),
+    logStream: new PassThrough(),
+    output: jest.fn(),
+    createTemporaryDirectory: jest.fn(),
+  };
+
+  beforeEach(() => {
+    initRepoAndPushMocked.mockResolvedValue({
+      commitHash: '220f19cc36b551763d157f1b5e4a4b446165dbd6',
+    });
+    githubCredentialsProvider =
+      DefaultGithubCredentialsProvider.fromIntegrations(integrations);
+    action = createPublishGithubAction({
+      integrations,
+      config,
+      githubCredentialsProvider,
+    });
+
+    // restore real implmentation
+    (entityRefToName as jest.Mock).mockImplementation(
+      realFamiliarizeEntityName,
+    );
+    mockOctokit.rest.actions.getRepoPublicKey.mockResolvedValue({
+      data: {
+        key: publicKey,
+        key_id: 'keyid',
+      },
+    });
+  });
+
+  afterEach(jest.resetAllMocks);
+
+  it('should call initRepoAndPush with the correct values', async () => {
+    mockOctokit.rest.users.getByUsername.mockResolvedValue({
+      data: { type: 'User' },
+    });
+
+    mockOctokit.rest.repos.createForAuthenticatedUser.mockResolvedValue({
+      data: {
+        clone_url: 'https://github.com/clone/url.git',
+        html_url: 'https://github.com/html/url',
+      },
+    });
+
+    await action.handler({
+      ...mockContext,
+      input: yaml.parse(examples[0].example).steps[0].input,
+    });
+
+    expect(initRepoAndPush).toHaveBeenCalledWith({
+      dir: mockContext.workspacePath,
+      remoteUrl: 'https://github.com/clone/url.git',
+      defaultBranch: 'master',
+      auth: { username: 'x-access-token', password: 'tokenlols' },
+      logger: mockContext.logger,
+      commitMessage: 'initial commit',
+      gitAuthorInfo: {},
+    });
+  });
+});
diff --git a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/publish/github.examples.ts b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/publish/github.examples.ts
new file mode 100644
index 0000000000..65f2ccdaa3
--- /dev/null
+++ b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/publish/github.examples.ts
@@ -0,0 +1,70 @@
+/*
+ * 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 { TemplateExample } from '@backstage/plugin-scaffolder-node';
+import yaml from 'yaml';
+
+export const examples: TemplateExample[] = [
+  {
+    description:
+      'Initializes a git repository of contents in workspace and publish it to GitHub with default configuration.',
+    example: yaml.stringify({
+      steps: [
+        {
+          id: 'publish',
+          action: 'publish:github',
+          name: 'Publish to GitHub',
+          input: {
+            repoUrl: 'github.com?repo=repo&owner=owner',
+          },
+        },
+      ],
+    }),
+  },
+  {
+    description: 'Add a description.',
+    example: yaml.stringify({
+      steps: [
+        {
+          id: 'publish',
+          action: 'publish:github',
+          name: 'Publish to GitHub',
+          input: {
+            repoUrl: 'github.com?repo=repo&owner=owner',
+            description: 'Initialize a git repository',
+          },
+        },
+      ],
+    }),
+  },
+  {
+    description: 'Change visibility of the repository.',
+    example: yaml.stringify({
+      steps: [
+        {
+          id: 'publish',
+          action: 'publish:github',
+          name: 'Publish to GitHub',
+          input: {
+            repoUrl: 'github.com?repo=repo&owner=owner',
+            description: 'Initialize a git repository',
+            repoVisibility: 'public',
+          },
+        },
+      ],
+    }),
+  },
+];
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 9336c38b63..e5b6071863 100644
--- a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/publish/github.ts
+++ b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/publish/github.ts
@@ -30,6 +30,7 @@ import {
 import * as inputProps from '../github/inputProperties';
 import * as outputProps from '../github/outputProperties';
 import { parseRepoUrl } from './util';
+import { examples } from './github.examples';
 
 /**
  * Creates a new action that initializes a git repository of the content in the workspace
@@ -111,6 +112,7 @@ export function createPublishGithubAction(options: {
     id: 'publish:github',
     description:
       'Initializes a git repository of contents in workspace and publishes it to GitHub.',
+    examples,
     schema: {
       input: {
         type: 'object',
diff --git a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/publish/gitlab.examples.test.ts b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/publish/gitlab.examples.test.ts
new file mode 100644
index 0000000000..5d58431c61
--- /dev/null
+++ b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/publish/gitlab.examples.test.ts
@@ -0,0 +1,115 @@
+/*
+ * 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 yaml from 'yaml';
+
+jest.mock('../helpers', () => {
+  return {
+    initRepoAndPush: jest.fn().mockResolvedValue({
+      commitHash: '220f19cc36b551763d157f1b5e4a4b446165dbd6',
+    }),
+    commitAndPushRepo: jest.fn().mockResolvedValue({
+      commitHash: '220f19cc36b551763d157f1b5e4a4b446165dbd6',
+    }),
+  };
+});
+
+import { createPublishGitlabAction } from './gitlab';
+import { ScmIntegrations } from '@backstage/integration';
+import { ConfigReader } from '@backstage/config';
+import { getVoidLogger } from '@backstage/backend-common';
+import { PassThrough } from 'stream';
+import { initRepoAndPush } from '../helpers';
+import { examples } from './gitlab.examples';
+
+const mockGitlabClient = {
+  Namespaces: {
+    show: jest.fn(),
+  },
+  Projects: {
+    create: jest.fn(),
+  },
+  Users: {
+    current: jest.fn(),
+  },
+  ProjectMembers: {
+    add: jest.fn(),
+  },
+};
+jest.mock('@gitbeaker/node', () => ({
+  Gitlab: class {
+    constructor() {
+      return mockGitlabClient;
+    }
+  },
+}));
+
+describe('publish:gitlab', () => {
+  const config = new ConfigReader({
+    integrations: {
+      gitlab: [
+        {
+          host: 'gitlab.com',
+          token: 'tokenlols',
+          apiBaseUrl: 'https://api.gitlab.com',
+        },
+        {
+          host: 'hosted.gitlab.com',
+          apiBaseUrl: 'https://api.hosted.gitlab.com',
+        },
+      ],
+    },
+  });
+
+  const integrations = ScmIntegrations.fromConfig(config);
+  const action = createPublishGitlabAction({ integrations, config });
+  const mockContext = {
+    input: {
+      repoUrl: 'gitlab.com?repo=repo&owner=owner',
+    },
+    workspacePath: 'lol',
+    logger: getVoidLogger(),
+    logStream: new PassThrough(),
+    output: jest.fn(),
+    createTemporaryDirectory: jest.fn(),
+  };
+
+  beforeEach(() => {
+    jest.resetAllMocks();
+  });
+
+  it('should call initRepoAndPush with the correct values', async () => {
+    mockGitlabClient.Users.current.mockResolvedValue({ id: 12345 });
+    mockGitlabClient.Namespaces.show.mockResolvedValue({ id: 1234 });
+    mockGitlabClient.Projects.create.mockResolvedValue({
+      http_url_to_repo: 'http://mockurl.git',
+    });
+
+    await action.handler({
+      ...mockContext,
+      input: yaml.parse(examples[0].example).steps[0].input,
+    });
+
+    expect(initRepoAndPush).toHaveBeenCalledWith({
+      dir: mockContext.workspacePath,
+      defaultBranch: 'master',
+      remoteUrl: 'http://mockurl.git',
+      auth: { username: 'oauth2', password: 'tokenlols' },
+      logger: mockContext.logger,
+      commitMessage: 'initial commit',
+      gitAuthorInfo: {},
+    });
+  });
+});
diff --git a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/publish/gitlab.examples.ts b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/publish/gitlab.examples.ts
new file mode 100644
index 0000000000..ac259866e3
--- /dev/null
+++ b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/publish/gitlab.examples.ts
@@ -0,0 +1,71 @@
+/*
+ * 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 { TemplateExample } from '@backstage/plugin-scaffolder-node';
+import yaml from 'yaml';
+
+export const examples: TemplateExample[] = [
+  {
+    description:
+      'Initializes a git repository of the content in the workspace, and publishes it to GitLab.',
+    example: yaml.stringify({
+      steps: [
+        {
+          id: 'publish',
+          action: 'publish:gitlab',
+          name: 'Publish to GitLab',
+          input: {
+            repoUrl: 'gitlab.com?repo=project_name&owner=group_name',
+          },
+        },
+      ],
+    }),
+  },
+  {
+    description: 'Add a description.',
+    example: yaml.stringify({
+      steps: [
+        {
+          id: 'publish',
+          action: 'publish:gitlab',
+          name: 'Publish to GitLab',
+          input: {
+            repoUrl: 'gitlab.com?repo=project_name&owner=group_name',
+            description: 'Initialize a git repository',
+          },
+        },
+      ],
+    }),
+  },
+  {
+    description:
+      'Sets the commit message on the repository. The default value is `initial commit`.',
+    example: yaml.stringify({
+      steps: [
+        {
+          id: 'publish',
+          action: 'publish:gitlab',
+          name: 'Publish to GitLab',
+          input: {
+            repoUrl: 'gitlab.com?repo=project_name&owner=group_name',
+            description: 'Initialize a git repository',
+            gitCommitMessage: 'Started a project.',
+          },
+        },
+      ],
+    }),
+  },
+];
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 4045fd6958..dbab7b11b8 100644
--- a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/publish/gitlab.ts
+++ b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/publish/gitlab.ts
@@ -21,6 +21,7 @@ import { Gitlab } from '@gitbeaker/node';
 import { initRepoAndPush } from '../helpers';
 import { getRepoSourceDirectory, parseRepoUrl } from './util';
 import { Config } from '@backstage/config';
+import { examples } from './gitlab.examples';
 
 /**
  * Creates a new action that initializes a git repository of the content in the workspace
@@ -49,6 +50,7 @@ export function createPublishGitlabAction(options: {
     id: 'publish:gitlab',
     description:
       'Initializes a git repository of the content in the workspace, and publishes it to GitLab.',
+    examples,
     schema: {
       input: {
         type: 'object',
diff --git a/plugins/scaffolder-backend/src/scaffolder/tasks/DatabaseTaskStore.ts b/plugins/scaffolder-backend/src/scaffolder/tasks/DatabaseTaskStore.ts
index f3cb9b645e..40ffdb17d4 100644
--- a/plugins/scaffolder-backend/src/scaffolder/tasks/DatabaseTaskStore.ts
+++ b/plugins/scaffolder-backend/src/scaffolder/tasks/DatabaseTaskStore.ts
@@ -69,7 +69,7 @@ export type DatabaseTaskStoreOptions = {
 };
 
 /**
- * Typeguard to help DatabaseTaskStore understand when database is PluginDatabaseManager vs. when database is a Knex instance.
+ * Type guard to help DatabaseTaskStore understand when database is PluginDatabaseManager vs. when database is a Knex instance.
  *
  * * @public
  */
@@ -81,7 +81,13 @@ function isPluginDatabaseManager(
 
 const parseSqlDateToIsoString = <T>(input: T): T | string => {
   if (typeof input === 'string') {
-    return DateTime.fromSQL(input, { zone: 'UTC' }).toISO();
+    const parsed = DateTime.fromSQL(input, { zone: 'UTC' });
+    if (!parsed.isValid) {
+      throw new Error(
+        `Failed to parse database timestamp '${input}', ${parsed.invalidReason}: ${parsed.invalidExplanation}`,
+      );
+    }
+    return parsed.toISO()!;
   }
 
   return input;
@@ -261,18 +267,21 @@ export class DatabaseTaskStore implements TaskStore {
     tasks: { taskId: string }[];
   }> {
     const { timeoutS } = options;
-
+    let heartbeatInterval = this.db.raw(`? - interval '${timeoutS} seconds'`, [
+      this.db.fn.now(),
+    ]);
+    if (this.db.client.config.client.includes('mysql')) {
+      heartbeatInterval = this.db.raw(
+        `date_sub(now(), interval ${timeoutS} second)`,
+      );
+    } else if (this.db.client.config.client.includes('sqlite3')) {
+      heartbeatInterval = this.db.raw(`datetime('now', ?)`, [
+        `-${timeoutS} seconds`,
+      ]);
+    }
     const rawRows = await this.db<RawDbTaskRow>('tasks')
       .where('status', 'processing')
-      .andWhere(
-        'last_heartbeat_at',
-        '<=',
-        this.db.client.config.client.includes('sqlite3')
-          ? this.db.raw(`datetime('now', ?)`, [`-${timeoutS} seconds`])
-          : this.db.raw(`? - interval '${timeoutS} seconds'`, [
-              this.db.fn.now(),
-            ]),
-      );
+      .andWhere('last_heartbeat_at', '<=', heartbeatInterval);
     const tasks = rawRows.map(row => ({
       taskId: row.id,
     }));
diff --git a/plugins/scaffolder-backend/src/scaffolder/tasks/NunjucksWorkflowRunner.test.ts b/plugins/scaffolder-backend/src/scaffolder/tasks/NunjucksWorkflowRunner.test.ts
index 5d4f7b73cc..253a6c4388 100644
--- a/plugins/scaffolder-backend/src/scaffolder/tasks/NunjucksWorkflowRunner.test.ts
+++ b/plugins/scaffolder-backend/src/scaffolder/tasks/NunjucksWorkflowRunner.test.ts
@@ -573,6 +573,101 @@ describe('DefaultWorkflowRunner', () => {
     });
   });
 
+  describe('each', () => {
+    it('should run a step repeatedly - flat values', async () => {
+      const task = createMockTaskWithSpec({
+        apiVersion: 'scaffolder.backstage.io/v1beta3',
+        steps: [
+          {
+            id: 'test',
+            name: 'name',
+            each: '${{parameters.colors}}',
+            action: 'jest-mock-action',
+            input: { color: '${{each.value}}' },
+          },
+        ],
+        output: {},
+        parameters: {
+          colors: ['blue', 'green', 'red'],
+        },
+      });
+
+      await runner.execute(task);
+
+      expect(fakeActionHandler).toHaveBeenCalledWith(
+        expect.objectContaining({ input: { color: 'blue' } }),
+      );
+      expect(fakeActionHandler).toHaveBeenCalledWith(
+        expect.objectContaining({ input: { color: 'green' } }),
+      );
+      expect(fakeActionHandler).toHaveBeenCalledWith(
+        expect.objectContaining({ input: { color: 'red' } }),
+      );
+    });
+
+    it('should run a step repeatedly - object list', async () => {
+      const task = createMockTaskWithSpec({
+        apiVersion: 'scaffolder.backstage.io/v1beta3',
+        steps: [
+          {
+            id: 'test',
+            name: 'name',
+            each: '${{parameters.settings}}',
+            action: 'jest-mock-action',
+            input: {
+              key: '${{each.key}}',
+              value: '${{each.value}}',
+            },
+          },
+        ],
+        output: {},
+        parameters: {
+          settings: [{ color: 'blue' }],
+        },
+      });
+
+      await runner.execute(task);
+
+      expect(fakeActionHandler).toHaveBeenCalledWith(
+        expect.objectContaining({
+          input: { key: '0', value: { color: 'blue' } },
+        }),
+      );
+    });
+
+    it('should run a step repeatedly - object', async () => {
+      const task = createMockTaskWithSpec({
+        apiVersion: 'scaffolder.backstage.io/v1beta3',
+        steps: [
+          {
+            id: 'test',
+            name: 'name',
+            each: '${{parameters.settings}}',
+            action: 'jest-mock-action',
+            input: { key: '${{each.key}}', value: '${{each.value}}' },
+          },
+        ],
+        output: {},
+        parameters: {
+          settings: { color: 'blue', transparent: 'yes' },
+        },
+      });
+
+      await runner.execute(task);
+
+      expect(fakeActionHandler).toHaveBeenCalledWith(
+        expect.objectContaining({
+          input: { key: 'color', value: 'blue' },
+        }),
+      );
+      expect(fakeActionHandler).toHaveBeenCalledWith(
+        expect.objectContaining({
+          input: { key: 'transparent', value: 'yes' },
+        }),
+      );
+    });
+  });
+
   describe('secrets', () => {
     it('should pass through the secrets to the context', async () => {
       const task = createMockTaskWithSpec(
diff --git a/plugins/scaffolder-backend/src/scaffolder/tasks/NunjucksWorkflowRunner.ts b/plugins/scaffolder-backend/src/scaffolder/tasks/NunjucksWorkflowRunner.ts
index da690bcb82..1f93ded94c 100644
--- a/plugins/scaffolder-backend/src/scaffolder/tasks/NunjucksWorkflowRunner.ts
+++ b/plugins/scaffolder-backend/src/scaffolder/tasks/NunjucksWorkflowRunner.ts
@@ -25,7 +25,7 @@ import * as winston from 'winston';
 import fs from 'fs-extra';
 import path from 'path';
 import nunjucks from 'nunjucks';
-import { JsonObject, JsonValue } from '@backstage/types';
+import { JsonArray, JsonObject, JsonValue } from '@backstage/types';
 import { InputError, NotAllowedError } from '@backstage/errors';
 import { PassThrough } from 'stream';
 import { generateExampleOutput, isTruthy } from './helper';
@@ -76,6 +76,7 @@ type TemplateContext = {
     entity?: UserEntity;
     ref?: string;
   };
+  each?: JsonValue;
 };
 
 const isValidTaskSpec = (taskSpec: TaskSpec): taskSpec is TaskSpecV1beta3 => {
@@ -311,25 +312,63 @@ export class NunjucksWorkflowRunner implements WorkflowRunner {
       const tmpDirs = new Array<string>();
       const stepOutput: { [outputName: string]: JsonValue } = {};
 
-      await action.handler({
-        input,
-        secrets: task.secrets ?? {},
-        logger: taskLogger,
-        logStream: streamLogger,
-        workspacePath,
-        createTemporaryDirectory: async () => {
-          const tmpDir = await fs.mkdtemp(`${workspacePath}_step-${step.id}-`);
-          tmpDirs.push(tmpDir);
-          return tmpDir;
-        },
-        output(name: string, value: JsonValue) {
-          stepOutput[name] = value;
-        },
-        templateInfo: task.spec.templateInfo,
-        user: task.spec.user,
-        isDryRun: task.isDryRun,
-        signal: task.cancelSignal,
-      });
+      const iterations = new Array<JsonValue>();
+      if (step.each) {
+        const each = await this.render(step.each, context, renderTemplate);
+        iterations.push(
+          ...Object.keys(each).map((key: any) => {
+            return { key: key, value: each[key] };
+          }),
+        );
+      } else {
+        iterations.push({});
+      }
+
+      let actionInput = input;
+      for (const iteration of iterations) {
+        if (step.each) {
+          taskLogger.info(`Running step each: ${iteration}`);
+          const iterationContext = {
+            ...context,
+            each: iteration,
+          };
+          // re-render input with the modified context that includes each
+          actionInput =
+            (step.input &&
+              this.render(
+                step.input,
+                { ...iterationContext, secrets: task.secrets ?? {} },
+                renderTemplate,
+              )) ??
+            {};
+        }
+        await action.handler({
+          input: actionInput,
+          secrets: task.secrets ?? {},
+          logger: taskLogger,
+          logStream: streamLogger,
+          workspacePath,
+          createTemporaryDirectory: async () => {
+            const tmpDir = await fs.mkdtemp(
+              `${workspacePath}_step-${step.id}-`,
+            );
+            tmpDirs.push(tmpDir);
+            return tmpDir;
+          },
+          output(name: string, value: JsonValue) {
+            if (step.each) {
+              stepOutput[name] = stepOutput[name] || [];
+              (stepOutput[name] as JsonArray).push(value);
+            } else {
+              stepOutput[name] = value;
+            }
+          },
+          templateInfo: task.spec.templateInfo,
+          user: task.spec.user,
+          isDryRun: task.isDryRun,
+          signal: task.cancelSignal,
+        });
+      }
 
       // Remove all temporary directories that were created when executing the action
       for (const tmpDir of tmpDirs) {
diff --git a/plugins/scaffolder-backend/src/scaffolder/tasks/types.ts b/plugins/scaffolder-backend/src/scaffolder/tasks/types.ts
index 112276b9dd..4560f27c0b 100644
--- a/plugins/scaffolder-backend/src/scaffolder/tasks/types.ts
+++ b/plugins/scaffolder-backend/src/scaffolder/tasks/types.ts
@@ -14,131 +14,94 @@
  * limitations under the License.
  */
 
-import { JsonValue, JsonObject, Observable } from '@backstage/types';
+import { JsonValue, JsonObject } from '@backstage/types';
 import { TaskSpec, TaskStep } from '@backstage/plugin-scaffolder-common';
 import { TaskSecrets } from '@backstage/plugin-scaffolder-node';
-import { TemplateAction } from '@backstage/plugin-scaffolder-node';
+import {
+  TemplateAction,
+  TaskStatus as _TaskStatus,
+  TaskCompletionState as _TaskCompletionState,
+  SerializedTask as _SerializedTask,
+  TaskEventType as _TaskEventType,
+  SerializedTaskEvent as _SerializedTaskEvent,
+  TaskBrokerDispatchResult as _TaskBrokerDispatchResult,
+  TaskBrokerDispatchOptions as _TaskBrokerDispatchOptions,
+  TaskContext as _TaskContext,
+  TaskBroker as _TaskBroker,
+} from '@backstage/plugin-scaffolder-node';
 
 /**
  * The status of each step of the Task
  *
  * @public
+ * @deprecated Import from `@backstage/plugin-scaffolder-node` instead.
  */
-export type TaskStatus =
-  | 'cancelled'
-  | 'completed'
-  | 'failed'
-  | 'open'
-  | 'processing';
+export type TaskStatus = _TaskStatus;
 
 /**
  * The state of a completed task.
  *
  * @public
+ * @deprecated Import from `@backstage/plugin-scaffolder-node` instead.
  */
-export type TaskCompletionState = 'failed' | 'completed';
+export type TaskCompletionState = _TaskCompletionState;
 
 /**
  * SerializedTask
  *
  * @public
+ * @deprecated Import from `@backstage/plugin-scaffolder-node` instead.
  */
-export type SerializedTask = {
-  id: string;
-  spec: TaskSpec;
-  status: TaskStatus;
-  createdAt: string;
-  lastHeartbeatAt?: string;
-  createdBy?: string;
-  secrets?: TaskSecrets;
-};
+export type SerializedTask = _SerializedTask;
 
 /**
  * TaskEventType
  *
  * @public
+ * @deprecated Import from `@backstage/plugin-scaffolder-node` instead.
  */
-export type TaskEventType = 'completion' | 'log' | 'cancelled';
+export type TaskEventType = _TaskEventType;
 
 /**
  * SerializedTaskEvent
  *
  * @public
+ * @deprecated Import from `@backstage/plugin-scaffolder-node` instead.
  */
-export type SerializedTaskEvent = {
-  id: number;
-  taskId: string;
-  body: JsonObject;
-  type: TaskEventType;
-  createdAt: string;
-};
+export type SerializedTaskEvent = _SerializedTaskEvent;
 
 /**
- * The result of {@link TaskBroker.dispatch}
+ * The result of `TaskBroker.dispatch`.
  *
  * @public
+ * @deprecated Import from `@backstage/plugin-scaffolder-node` instead.
  */
-export type TaskBrokerDispatchResult = {
-  taskId: string;
-};
+export type TaskBrokerDispatchResult = _TaskBrokerDispatchResult;
 
 /**
- * The options passed to {@link TaskBroker.dispatch}
+ * The options passed to `TaskBroker.dispatch`.
  * Currently a spec and optional secrets
  *
  * @public
+ * @deprecated Import from `@backstage/plugin-scaffolder-node` instead.
  */
-export type TaskBrokerDispatchOptions = {
-  spec: TaskSpec;
-  secrets?: TaskSecrets;
-  createdBy?: string;
-};
+export type TaskBrokerDispatchOptions = _TaskBrokerDispatchOptions;
 
 /**
  * Task
  *
  * @public
+ * @deprecated Import from `@backstage/plugin-scaffolder-node` instead.
  */
-export interface TaskContext {
-  cancelSignal: AbortSignal;
-  spec: TaskSpec;
-  secrets?: TaskSecrets;
-  createdBy?: string;
-  done: boolean;
-  isDryRun?: boolean;
-
-  complete(result: TaskCompletionState, metadata?: JsonObject): Promise<void>;
-
-  emitLog(message: string, logMetadata?: JsonObject): Promise<void>;
-
-  getWorkspaceName(): Promise<string>;
-}
+export type TaskContext = _TaskContext;
 
 /**
  * TaskBroker
  *
  * @public
+ * @deprecated Import from `@backstage/plugin-scaffolder-node` instead.
  */
-export interface TaskBroker {
-  cancel?(taskId: string): Promise<void>;
-
-  claim(): Promise<TaskContext>;
-
-  dispatch(
-    options: TaskBrokerDispatchOptions,
-  ): Promise<TaskBrokerDispatchResult>;
-
-  vacuumTasks(options: { timeoutS: number }): Promise<void>;
-
-  event$(options: {
-    taskId: string;
-    after: number | undefined;
-  }): Observable<{ events: SerializedTaskEvent[] }>;
-
-  get(taskId: string): Promise<SerializedTask>;
-
-  list?(options?: { createdBy?: string }): Promise<{ tasks: SerializedTask[] }>;
-}
+export type TaskBroker = _TaskBroker;
 
 /**
  * TaskStoreEmitOptions
diff --git a/plugins/scaffolder-backend/src/service/router.ts b/plugins/scaffolder-backend/src/service/router.ts
index 1771067367..15f7c11eba 100644
--- a/plugins/scaffolder-backend/src/service/router.ts
+++ b/plugins/scaffolder-backend/src/service/router.ts
@@ -231,13 +231,15 @@ export async function createRouter(
     catalogClient,
     actions,
     taskWorkers,
-    concurrentTasksLimit,
     scheduler,
     additionalTemplateFilters,
     additionalTemplateGlobals,
     permissions,
     permissionRules,
   } = options;
+  const concurrentTasksLimit =
+    options.concurrentTasksLimit ??
+    options.config.getOptionalNumber('scaffolder.concurrentTasksLimit');
 
   const logger = parentLogger.child({ plugin: 'scaffolder' });
 
@@ -275,19 +277,21 @@ export async function createRouter(
   const actionRegistry = new TemplateActionRegistry();
 
   const workers = [];
-  for (let i = 0; i < (taskWorkers || 1); i++) {
-    const worker = await TaskWorker.create({
-      taskBroker,
-      actionRegistry,
-      integrations,
-      logger,
-      workingDirectory,
-      additionalTemplateFilters,
-      additionalTemplateGlobals,
-      concurrentTasksLimit,
-      permissions,
-    });
-    workers.push(worker);
+  if (concurrentTasksLimit !== 0) {
+    for (let i = 0; i < (taskWorkers || 1); i++) {
+      const worker = await TaskWorker.create({
+        taskBroker,
+        actionRegistry,
+        integrations,
+        logger,
+        workingDirectory,
+        additionalTemplateFilters,
+        additionalTemplateGlobals,
+        concurrentTasksLimit,
+        permissions,
+      });
+      workers.push(worker);
+    }
   }
 
   const actionsToRegister = Array.isArray(actions)
diff --git a/plugins/scaffolder-common/CHANGELOG.md b/plugins/scaffolder-common/CHANGELOG.md
index 6fd5948a5c..1478dd8ba9 100644
--- a/plugins/scaffolder-common/CHANGELOG.md
+++ b/plugins/scaffolder-common/CHANGELOG.md
@@ -1,5 +1,36 @@
 # @backstage/plugin-scaffolder-common
 
+## 1.4.1-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/catalog-model@1.4.2-next.1
+  - @backstage/plugin-permission-common@0.7.8-next.1
+  - @backstage/types@1.1.0
+
+## 1.4.1-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/catalog-model@1.4.2-next.0
+  - @backstage/plugin-permission-common@0.7.8-next.0
+  - @backstage/types@1.1.0
+
+## 1.4.0
+
+### Minor Changes
+
+- e514aac3eac0: Introduce `each` property on action steps, allowing them to be ran repeatedly.
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/catalog-model@1.4.1
+  - @backstage/types@1.1.0
+  - @backstage/plugin-permission-common@0.7.7
+
 ## 1.3.2
 
 ### Patch Changes
diff --git a/plugins/scaffolder-common/api-report.md b/plugins/scaffolder-common/api-report.md
index 7c40780b57..6113c72659 100644
--- a/plugins/scaffolder-common/api-report.md
+++ b/plugins/scaffolder-common/api-report.md
@@ -5,6 +5,7 @@
 ```ts
 import { Entity } from '@backstage/catalog-model';
 import type { EntityMeta } from '@backstage/catalog-model';
+import type { JsonArray } from '@backstage/types';
 import { JsonObject } from '@backstage/types';
 import type { JsonValue } from '@backstage/types';
 import { KindValidator } from '@backstage/catalog-model';
@@ -36,6 +37,7 @@ export interface TaskSpecV1beta3 {
 // @public
 export interface TaskStep {
   action: string;
+  each?: string | JsonArray;
   id: string;
   if?: string | boolean;
   input?: JsonObject;
diff --git a/plugins/scaffolder-common/catalog-info.yaml b/plugins/scaffolder-common/catalog-info.yaml
new file mode 100644
index 0000000000..1a8d2481f0
--- /dev/null
+++ b/plugins/scaffolder-common/catalog-info.yaml
@@ -0,0 +1,12 @@
+apiVersion: backstage.io/v1alpha1
+kind: Component
+metadata:
+  name: backstage-plugin-scaffolder-common
+  title: '@backstage/plugin-scaffolder-common'
+  description: >-
+    Common functionalities for the scaffolder, to be shared between scaffolder
+    and scaffolder-backend plugin
+spec:
+  lifecycle: production
+  type: backstage-common-library
+  owner: maintainers
diff --git a/plugins/scaffolder-common/package.json b/plugins/scaffolder-common/package.json
index a0baa4470f..98d99ee303 100644
--- a/plugins/scaffolder-common/package.json
+++ b/plugins/scaffolder-common/package.json
@@ -1,15 +1,12 @@
 {
   "name": "@backstage/plugin-scaffolder-common",
   "description": "Common functionalities for the scaffolder, to be shared between scaffolder and scaffolder-backend plugin",
-  "version": "1.3.2",
+  "version": "1.4.1-next.1",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
   "publishConfig": {
-    "access": "public",
-    "main": "dist/index.cjs.js",
-    "module": "dist/index.esm.js",
-    "types": "dist/index.d.ts"
+    "access": "public"
   },
   "exports": {
     ".": "./src/index.ts",
@@ -41,6 +38,7 @@
   "files": [
     "dist"
   ],
+  "sideEffects": false,
   "scripts": {
     "build": "backstage-cli package build",
     "lint": "backstage-cli package lint",
diff --git a/plugins/scaffolder-common/src/TaskSpec.ts b/plugins/scaffolder-common/src/TaskSpec.ts
index 7c06fe2b99..6b144b4f78 100644
--- a/plugins/scaffolder-common/src/TaskSpec.ts
+++ b/plugins/scaffolder-common/src/TaskSpec.ts
@@ -15,7 +15,7 @@
  */
 
 import type { EntityMeta, UserEntity } from '@backstage/catalog-model';
-import type { JsonObject, JsonValue } from '@backstage/types';
+import type { JsonArray, JsonObject, JsonValue } from '@backstage/types';
 
 /**
  * Information about a template that is stored on a task specification.
@@ -70,6 +70,10 @@ export interface TaskStep {
    * When this is false, or if the templated value string evaluates to something that is falsy the step will be skipped.
    */
   if?: string | boolean;
+  /**
+   * Run step repeatedly
+   */
+  each?: string | JsonArray;
 }
 
 /**
diff --git a/plugins/scaffolder-node/CHANGELOG.md b/plugins/scaffolder-node/CHANGELOG.md
index fd1605c2df..eb1981df26 100644
--- a/plugins/scaffolder-node/CHANGELOG.md
+++ b/plugins/scaffolder-node/CHANGELOG.md
@@ -1,5 +1,75 @@
 # @backstage/plugin-scaffolder-node
 
+## 0.2.3-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.19.5-next.2
+  - @backstage/integration@1.7.0-next.2
+  - @backstage/backend-plugin-api@0.6.3-next.2
+  - @backstage/catalog-model@1.4.2-next.1
+  - @backstage/errors@1.2.1
+  - @backstage/types@1.1.0
+  - @backstage/plugin-scaffolder-common@1.4.1-next.1
+
+## 0.2.3-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/integration@1.7.0-next.1
+  - @backstage/backend-common@0.19.5-next.1
+  - @backstage/backend-plugin-api@0.6.3-next.1
+  - @backstage/catalog-model@1.4.2-next.0
+  - @backstage/plugin-scaffolder-common@1.4.1-next.0
+  - @backstage/errors@1.2.1
+  - @backstage/types@1.1.0
+
+## 0.2.2-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.19.4-next.0
+  - @backstage/integration@1.7.0-next.0
+  - @backstage/backend-plugin-api@0.6.2-next.0
+  - @backstage/catalog-model@1.4.1
+  - @backstage/errors@1.2.1
+  - @backstage/types@1.1.0
+  - @backstage/plugin-scaffolder-common@1.4.0
+
+## 0.2.0
+
+### Minor Changes
+
+- e514aac3eac0: Introduce `each` property on action steps, allowing them to be ran repeatedly.
+
+### Patch Changes
+
+- 12a8c94eda8d: Add package repository and homepage metadata
+- e07a4914f621: Added several new types that were moved from `@backstage/plugin-scaffolder-backend`.
+- 349611126ae2: Added two new alpha extension points, `scaffolderTaskBrokerExtensionPoint` and `scaffolderTemplatingExtensionPoint`.
+- 0b1d775be05b: Export `TemplateExample` from the `createTemplateAction` type.
+- d3b31a791eb1: Deprecated `executeShellCommand`, `RunCommandOptions`, and `fetchContents` from `@backstage/plugin-scaffolder-backend`, since they are useful for Scaffolder modules (who should not be importing from the plugin package itself). You should now import these from `@backstage/plugin-scaffolder-backend-node` instead. `RunCommandOptions` was renamed in the Node package as `ExecuteShellCommandOptions`, for consistency.
+- Updated dependencies
+  - @backstage/backend-common@0.19.2
+  - @backstage/backend-plugin-api@0.6.0
+  - @backstage/integration@1.6.0
+  - @backstage/plugin-scaffolder-common@1.4.0
+  - @backstage/catalog-model@1.4.1
+  - @backstage/errors@1.2.1
+  - @backstage/types@1.1.0
+
+## 0.1.6-next.2
+
+### Patch Changes
+
+- 0b1d775be05b: Export `TemplateExample` from the `createTemplateAction` type.
+- Updated dependencies
+  - @backstage/backend-plugin-api@0.6.0-next.2
+  - @backstage/backend-common@0.19.2-next.2
+
 ## 0.1.6-next.1
 
 ### Patch Changes
diff --git a/plugins/scaffolder-node/api-report.md b/plugins/scaffolder-node/api-report.md
index 52e729fcb7..52ce3c8d13 100644
--- a/plugins/scaffolder-node/api-report.md
+++ b/plugins/scaffolder-node/api-report.md
@@ -7,10 +7,17 @@
 
 import { ExtensionPoint } from '@backstage/backend-plugin-api';
 import { JsonObject } from '@backstage/types';
+import { JsonValue } from '@backstage/types';
 import { Logger } from 'winston';
+import { Observable } from '@backstage/types';
 import { Schema } from 'jsonschema';
 import { ScmIntegrations } from '@backstage/integration';
 import { SpawnOptionsWithoutStdio } from 'child_process';
+import { TaskBroker as TaskBroker_2 } from '@backstage/plugin-scaffolder-node';
+import { TaskSpec } from '@backstage/plugin-scaffolder-common';
+import { TemplateAction as TemplateAction_2 } from '@backstage/plugin-scaffolder-node';
+import { TemplateFilter as TemplateFilter_2 } from '@backstage/plugin-scaffolder-node';
+import { TemplateGlobal as TemplateGlobal_2 } from '@backstage/plugin-scaffolder-node';
 import { TemplateInfo } from '@backstage/plugin-scaffolder-common';
 import { UrlReader } from '@backstage/backend-common';
 import { UserEntity } from '@backstage/catalog-model';
@@ -39,6 +46,7 @@ export type ActionContext<
     ref?: string;
   };
   signal?: AbortSignal;
+  each?: JsonObject;
 };
 
 // @public
@@ -104,17 +112,129 @@ export function fetchFile(options: {
 // @alpha
 export interface ScaffolderActionsExtensionPoint {
   // (undocumented)
-  addActions(...actions: TemplateAction<any, any>[]): void;
+  addActions(...actions: TemplateAction_2<any, any>[]): void;
 }
 
 // @alpha
 export const scaffolderActionsExtensionPoint: ExtensionPoint<ScaffolderActionsExtensionPoint>;
 
+// @alpha
+export interface ScaffolderTaskBrokerExtensionPoint {
+  // (undocumented)
+  setTaskBroker(taskBroker: TaskBroker_2): void;
+}
+
+// @alpha
+export const scaffolderTaskBrokerExtensionPoint: ExtensionPoint<ScaffolderTaskBrokerExtensionPoint>;
+
+// @alpha
+export interface ScaffolderTemplatingExtensionPoint {
+  // (undocumented)
+  addTemplateFilters(filters: Record<string, TemplateFilter_2>): void;
+  // (undocumented)
+  addTemplateGlobals(filters: Record<string, TemplateGlobal_2>): void;
+}
+
+// @alpha
+export const scaffolderTemplatingExtensionPoint: ExtensionPoint<ScaffolderTemplatingExtensionPoint>;
+
+// @public
+export type SerializedTask = {
+  id: string;
+  spec: TaskSpec;
+  status: TaskStatus;
+  createdAt: string;
+  lastHeartbeatAt?: string;
+  createdBy?: string;
+  secrets?: TaskSecrets;
+};
+
+// @public
+export type SerializedTaskEvent = {
+  id: number;
+  taskId: string;
+  body: JsonObject;
+  type: TaskEventType;
+  createdAt: string;
+};
+
+// @public
+export interface TaskBroker {
+  // (undocumented)
+  cancel?(taskId: string): Promise<void>;
+  // (undocumented)
+  claim(): Promise<TaskContext>;
+  // (undocumented)
+  dispatch(
+    options: TaskBrokerDispatchOptions,
+  ): Promise<TaskBrokerDispatchResult>;
+  // (undocumented)
+  event$(options: { taskId: string; after: number | undefined }): Observable<{
+    events: SerializedTaskEvent[];
+  }>;
+  // (undocumented)
+  get(taskId: string): Promise<SerializedTask>;
+  // (undocumented)
+  list?(options?: { createdBy?: string }): Promise<{
+    tasks: SerializedTask[];
+  }>;
+  // (undocumented)
+  vacuumTasks(options: { timeoutS: number }): Promise<void>;
+}
+
+// @public
+export type TaskBrokerDispatchOptions = {
+  spec: TaskSpec;
+  secrets?: TaskSecrets;
+  createdBy?: string;
+};
+
+// @public
+export type TaskBrokerDispatchResult = {
+  taskId: string;
+};
+
+// @public
+export type TaskCompletionState = 'failed' | 'completed';
+
+// @public
+export interface TaskContext {
+  // (undocumented)
+  cancelSignal: AbortSignal;
+  // (undocumented)
+  complete(result: TaskCompletionState, metadata?: JsonObject): Promise<void>;
+  // (undocumented)
+  createdBy?: string;
+  // (undocumented)
+  done: boolean;
+  // (undocumented)
+  emitLog(message: string, logMetadata?: JsonObject): Promise<void>;
+  // (undocumented)
+  getWorkspaceName(): Promise<string>;
+  // (undocumented)
+  isDryRun?: boolean;
+  // (undocumented)
+  secrets?: TaskSecrets;
+  // (undocumented)
+  spec: TaskSpec;
+}
+
+// @public
+export type TaskEventType = 'completion' | 'log' | 'cancelled';
+
 // @public
 export type TaskSecrets = Record<string, string> & {
   backstageToken?: string;
 };
 
+// @public
+export type TaskStatus =
+  | 'cancelled'
+  | 'completed'
+  | 'failed'
+  | 'open'
+  | 'processing';
+
 // @public (undocumented)
 export type TemplateAction<
   TActionInput extends JsonObject = JsonObject,
@@ -157,4 +277,12 @@ export type TemplateExample = {
   description: string;
   example: string;
 };
+
+// @public (undocumented)
+export type TemplateFilter = (...args: JsonValue[]) => JsonValue | undefined;
+
+// @public (undocumented)
+export type TemplateGlobal =
+  | ((...args: JsonValue[]) => JsonValue | undefined)
+  | JsonValue;
 ```
diff --git a/plugins/scaffolder-node/catalog-info.yaml b/plugins/scaffolder-node/catalog-info.yaml
new file mode 100644
index 0000000000..726591cda5
--- /dev/null
+++ b/plugins/scaffolder-node/catalog-info.yaml
@@ -0,0 +1,10 @@
+apiVersion: backstage.io/v1alpha1
+kind: Component
+metadata:
+  name: backstage-plugin-scaffolder-node
+  title: '@backstage/plugin-scaffolder-node'
+  description: The plugin-scaffolder-node module for @backstage/plugin-scaffolder-backend
+spec:
+  lifecycle: experimental
+  type: backstage-node-library
+  owner: maintainers
diff --git a/plugins/scaffolder-node/package.json b/plugins/scaffolder-node/package.json
index 555a25417d..37bf100c40 100644
--- a/plugins/scaffolder-node/package.json
+++ b/plugins/scaffolder-node/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@backstage/plugin-scaffolder-node",
   "description": "The plugin-scaffolder-node module for @backstage/plugin-scaffolder-backend",
-  "version": "0.1.6-next.1",
+  "version": "0.2.3-next.2",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
diff --git a/plugins/scaffolder-node/src/actions/types.ts b/plugins/scaffolder-node/src/actions/types.ts
index e35f55aa67..7e8c2b4f5f 100644
--- a/plugins/scaffolder-node/src/actions/types.ts
+++ b/plugins/scaffolder-node/src/actions/types.ts
@@ -71,6 +71,11 @@ export type ActionContext<
    * Implement the signal to make your custom step abortable https://developer.mozilla.org/en-US/docs/Web/API/AbortController/signal
    */
   signal?: AbortSignal;
+
+  /**
+   * Optional value of each invocation
+   */
+  each?: JsonObject;
 };
 
 /** @public */
diff --git a/plugins/scaffolder-node/src/extensions.ts b/plugins/scaffolder-node/src/extensions.ts
index 1ae51ce2e6..b85da5b590 100644
--- a/plugins/scaffolder-node/src/extensions.ts
+++ b/plugins/scaffolder-node/src/extensions.ts
@@ -15,7 +15,12 @@
  */
 
 import { createExtensionPoint } from '@backstage/backend-plugin-api';
-import { TemplateAction } from './actions';
+import {
+  TemplateAction,
+  TemplateFilter,
+  TemplateGlobal,
+  TaskBroker,
+} from '@backstage/plugin-scaffolder-node';
 
 /**
  * Extension point for managing scaffolder actions.
@@ -35,3 +40,42 @@ export const scaffolderActionsExtensionPoint =
   createExtensionPoint<ScaffolderActionsExtensionPoint>({
     id: 'scaffolder.actions',
   });
+
+/**
+ * Extension point for replacing the scaffolder task broker.
+ *
+ * @alpha
+ */
+export interface ScaffolderTaskBrokerExtensionPoint {
+  setTaskBroker(taskBroker: TaskBroker): void;
+}
+
+/**
+ * Extension point for replacing the scaffolder task broker.
+ *
+ * @alpha
+ */
+export const scaffolderTaskBrokerExtensionPoint =
+  createExtensionPoint<ScaffolderTaskBrokerExtensionPoint>({
+    id: 'scaffolder.taskBroker',
+  });
+
+/**
+ * Extension point for adding template filters and globals.
+ *
+ * @alpha
+ */
+export interface ScaffolderTemplatingExtensionPoint {
+  addTemplateFilters(filters: Record<string, TemplateFilter>): void;
+  addTemplateGlobals(filters: Record<string, TemplateGlobal>): void;
+}
+
+/**
+ * Extension point for adding template filters and globals.
+ *
+ * @alpha
+ */
+export const scaffolderTemplatingExtensionPoint =
+  createExtensionPoint<ScaffolderTemplatingExtensionPoint>({
+    id: 'scaffolder.templating',
+  });
diff --git a/plugins/scaffolder-node/src/index.ts b/plugins/scaffolder-node/src/index.ts
index 2a7c06234e..dcce065108 100644
--- a/plugins/scaffolder-node/src/index.ts
+++ b/plugins/scaffolder-node/src/index.ts
@@ -22,7 +22,12 @@
 
 export * from './actions';
 export * from './tasks';
+export type { TemplateFilter, TemplateGlobal } from './types';
 export {
   scaffolderActionsExtensionPoint,
   type ScaffolderActionsExtensionPoint,
+  scaffolderTaskBrokerExtensionPoint,
+  type ScaffolderTaskBrokerExtensionPoint,
+  scaffolderTemplatingExtensionPoint,
+  type ScaffolderTemplatingExtensionPoint,
 } from './extensions';
diff --git a/plugins/scaffolder-node/src/tasks/index.ts b/plugins/scaffolder-node/src/tasks/index.ts
index 0c1d0d813e..930de95237 100644
--- a/plugins/scaffolder-node/src/tasks/index.ts
+++ b/plugins/scaffolder-node/src/tasks/index.ts
@@ -14,4 +14,15 @@
  * limitations under the License.
  */
 
-export { type TaskSecrets } from './types';
+export type {
+  TaskSecrets,
+  SerializedTask,
+  SerializedTaskEvent,
+  TaskBroker,
+  TaskBrokerDispatchOptions,
+  TaskBrokerDispatchResult,
+  TaskCompletionState,
+  TaskContext,
+  TaskEventType,
+  TaskStatus,
+} from './types';
diff --git a/plugins/scaffolder-node/src/tasks/types.ts b/plugins/scaffolder-node/src/tasks/types.ts
index c17b3cbde3..8c9cc29e31 100644
--- a/plugins/scaffolder-node/src/tasks/types.ts
+++ b/plugins/scaffolder-node/src/tasks/types.ts
@@ -14,6 +14,9 @@
  * limitations under the License.
  */
 
+import { TaskSpec } from '@backstage/plugin-scaffolder-common';
+import { JsonObject, Observable } from '@backstage/types';
+
 /**
  * TaskSecrets
  *
@@ -22,3 +25,124 @@
 export type TaskSecrets = Record<string, string> & {
   backstageToken?: string;
 };
+
+/**
+ * The status of each step of the Task
+ *
+ * @public
+ */
+export type TaskStatus =
+  | 'cancelled'
+  | 'completed'
+  | 'failed'
+  | 'open'
+  | 'processing';
+
+/**
+ * The state of a completed task.
+ *
+ * @public
+ */
+export type TaskCompletionState = 'failed' | 'completed';
+
+/**
+ * SerializedTask
+ *
+ * @public
+ */
+export type SerializedTask = {
+  id: string;
+  spec: TaskSpec;
+  status: TaskStatus;
+  createdAt: string;
+  lastHeartbeatAt?: string;
+  createdBy?: string;
+  secrets?: TaskSecrets;
+};
+
+/**
+ * TaskEventType
+ *
+ * @public
+ */
+export type TaskEventType = 'completion' | 'log' | 'cancelled';
+
+/**
+ * SerializedTaskEvent
+ *
+ * @public
+ */
+export type SerializedTaskEvent = {
+  id: number;
+  taskId: string;
+  body: JsonObject;
+  type: TaskEventType;
+  createdAt: string;
+};
+
+/**
+ * The result of {@link TaskBroker.dispatch}
+ *
+ * @public
+ */
+export type TaskBrokerDispatchResult = {
+  taskId: string;
+};
+
+/**
+ * The options passed to {@link TaskBroker.dispatch}
+ * Currently a spec and optional secrets
+ *
+ * @public
+ */
+export type TaskBrokerDispatchOptions = {
+  spec: TaskSpec;
+  secrets?: TaskSecrets;
+  createdBy?: string;
+};
+
+/**
+ * Task
+ *
+ * @public
+ */
+export interface TaskContext {
+  cancelSignal: AbortSignal;
+  spec: TaskSpec;
+  secrets?: TaskSecrets;
+  createdBy?: string;
+  done: boolean;
+  isDryRun?: boolean;
+
+  complete(result: TaskCompletionState, metadata?: JsonObject): Promise<void>;
+
+  emitLog(message: string, logMetadata?: JsonObject): Promise<void>;
+
+  getWorkspaceName(): Promise<string>;
+}
+
+/**
+ * TaskBroker
+ *
+ * @public
+ */
+export interface TaskBroker {
+  cancel?(taskId: string): Promise<void>;
+
+  claim(): Promise<TaskContext>;
+
+  dispatch(
+    options: TaskBrokerDispatchOptions,
+  ): Promise<TaskBrokerDispatchResult>;
+
+  vacuumTasks(options: { timeoutS: number }): Promise<void>;
+
+  event$(options: {
+    taskId: string;
+    after: number | undefined;
+  }): Observable<{ events: SerializedTaskEvent[] }>;
+
+  get(taskId: string): Promise<SerializedTask>;
+
+  list?(options?: { createdBy?: string }): Promise<{ tasks: SerializedTask[] }>;
+}
diff --git a/plugins/scaffolder-node/src/types.ts b/plugins/scaffolder-node/src/types.ts
new file mode 100644
index 0000000000..bae106c84e
--- /dev/null
+++ b/plugins/scaffolder-node/src/types.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.
+ */
+
+import { JsonValue } from '@backstage/types';
+
+/** @public */
+export type TemplateFilter = (...args: JsonValue[]) => JsonValue | undefined;
+
+/** @public */
+export type TemplateGlobal =
+  | ((...args: JsonValue[]) => JsonValue | undefined)
+  | JsonValue;
diff --git a/plugins/scaffolder-react/CHANGELOG.md b/plugins/scaffolder-react/CHANGELOG.md
index e4762983c7..67a50d8b03 100644
--- a/plugins/scaffolder-react/CHANGELOG.md
+++ b/plugins/scaffolder-react/CHANGELOG.md
@@ -1,5 +1,78 @@
 # @backstage/plugin-scaffolder-react
 
+## 1.5.5-next.2
+
+### Patch Changes
+
+- 27fef07f9229: Updated dependency `use-immer` to `^0.9.0`.
+- Updated dependencies
+  - @backstage/core-components@0.13.5-next.2
+  - @backstage/core-plugin-api@1.6.0-next.2
+  - @backstage/plugin-catalog-react@1.8.4-next.2
+  - @backstage/catalog-model@1.4.2-next.1
+  - @backstage/catalog-client@1.4.4-next.1
+  - @backstage/errors@1.2.1
+  - @backstage/theme@0.4.1
+  - @backstage/types@1.1.0
+  - @backstage/version-bridge@1.0.4
+  - @backstage/plugin-scaffolder-common@1.4.1-next.1
+
+## 1.5.5-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.8.4-next.1
+  - @backstage/core-components@0.13.5-next.1
+  - @backstage/catalog-model@1.4.2-next.0
+  - @backstage/core-plugin-api@1.6.0-next.1
+  - @backstage/catalog-client@1.4.4-next.0
+  - @backstage/plugin-scaffolder-common@1.4.1-next.0
+  - @backstage/errors@1.2.1
+  - @backstage/theme@0.4.1
+  - @backstage/types@1.1.0
+  - @backstage/version-bridge@1.0.4
+
+## 1.5.4-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-plugin-api@1.6.0-next.0
+  - @backstage/core-components@0.13.5-next.0
+  - @backstage/catalog-client@1.4.3
+  - @backstage/catalog-model@1.4.1
+  - @backstage/errors@1.2.1
+  - @backstage/theme@0.4.1
+  - @backstage/types@1.1.0
+  - @backstage/version-bridge@1.0.4
+  - @backstage/plugin-catalog-react@1.8.3-next.0
+  - @backstage/plugin-scaffolder-common@1.4.0
+
+## 1.5.2
+
+### Patch Changes
+
+- ba9ee98a37bd: Fixed bug in Workflow component by passing a prop `templateName` down to Stepper component.
+- Updated dependencies
+  - @backstage/core-components@0.13.4
+  - @backstage/plugin-catalog-react@1.8.1
+  - @backstage/plugin-scaffolder-common@1.4.0
+  - @backstage/core-plugin-api@1.5.3
+  - @backstage/catalog-client@1.4.3
+  - @backstage/catalog-model@1.4.1
+  - @backstage/errors@1.2.1
+  - @backstage/theme@0.4.1
+  - @backstage/types@1.1.0
+  - @backstage/version-bridge@1.0.4
+
+## 1.5.2-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.8.1-next.1
+
 ## 1.5.2-next.0
 
 ### Patch Changes
diff --git a/plugins/scaffolder-react/alpha-api-report.md b/plugins/scaffolder-react/alpha-api-report.md
index 58a3c8e208..11bb2c10c4 100644
--- a/plugins/scaffolder-react/alpha-api-report.md
+++ b/plugins/scaffolder-react/alpha-api-report.md
@@ -44,10 +44,10 @@ export function createNextScaffolderFieldExtension<
 // @alpha
 export const DefaultTemplateOutputs: (props: {
   output?: ScaffolderTaskOutput;
-}) => JSX.Element | null;
+}) => React_2.JSX.Element | null;
 
 // @alpha (undocumented)
-export const EmbeddableWorkflow: (props: WorkflowProps) => JSX.Element;
+export const EmbeddableWorkflow: (props: WorkflowProps) => React_2.JSX.Element;
 
 // @alpha
 export const extractSchemaFromStep: (inputStep: JsonObject) => {
@@ -56,7 +56,9 @@ export const extractSchemaFromStep: (inputStep: JsonObject) => {
 };
 
 // @alpha
-export const Form: (props: PropsWithChildren<FormProps_2>) => JSX.Element;
+export const Form: (
+  props: PropsWithChildren<FormProps_2>,
+) => React_2.JSX.Element;
 
 // @alpha
 export type FormProps = Pick<
@@ -123,7 +125,7 @@ export interface ParsedTemplateSchema {
 }
 
 // @alpha
-export const ReviewState: (props: ReviewStateProps) => JSX.Element;
+export const ReviewState: (props: ReviewStateProps) => React_2.JSX.Element;
 
 // @alpha
 export type ReviewStateProps = {
@@ -134,7 +136,7 @@ export type ReviewStateProps = {
 // @alpha
 export const ScaffolderField: (
   props: PropsWithChildren<ScaffolderFieldProps>,
-) => JSX.Element;
+) => React_2.JSX.Element;
 
 // @alpha
 export interface ScaffolderFieldProps {
@@ -159,7 +161,7 @@ export interface ScaffolderFieldProps {
 // @alpha (undocumented)
 export function ScaffolderPageContextMenu(
   props: ScaffolderPageContextMenuProps,
-): JSX.Element | null;
+): React_2.JSX.Element | null;
 
 // @alpha (undocumented)
 export type ScaffolderPageContextMenuProps = {
@@ -169,7 +171,7 @@ export type ScaffolderPageContextMenuProps = {
 };
 
 // @alpha
-export const Stepper: (stepperProps: StepperProps) => JSX.Element;
+export const Stepper: (stepperProps: StepperProps) => React_2.JSX.Element;
 
 // @alpha
 export type StepperProps = {
@@ -192,10 +194,10 @@ export const TaskLogStream: (props: {
   logs: {
     [k: string]: string[];
   };
-}) => JSX.Element;
+}) => React_2.JSX.Element;
 
 // @alpha
-export const TaskSteps: (props: TaskStepsProps) => JSX.Element;
+export const TaskSteps: (props: TaskStepsProps) => React_2.JSX.Element;
 
 // @alpha
 export interface TaskStepsProps {
@@ -210,7 +212,7 @@ export interface TaskStepsProps {
 }
 
 // @alpha
-export const TemplateCard: (props: TemplateCardProps) => JSX.Element;
+export const TemplateCard: (props: TemplateCardProps) => React_2.JSX.Element;
 
 // @alpha
 export interface TemplateCardProps {
@@ -227,10 +229,12 @@ export interface TemplateCardProps {
 }
 
 // @alpha
-export const TemplateCategoryPicker: () => JSX.Element | null;
+export const TemplateCategoryPicker: () => React_2.JSX.Element | null;
 
 // @alpha
-export const TemplateGroup: (props: TemplateGroupProps) => JSX.Element | null;
+export const TemplateGroup: (
+  props: TemplateGroupProps,
+) => React_2.JSX.Element | null;
 
 // @alpha (undocumented)
 export type TemplateGroupFilter = {
@@ -260,7 +264,9 @@ export interface TemplateGroupProps {
 }
 
 // @alpha (undocumented)
-export const TemplateGroups: (props: TemplateGroupsProps) => JSX.Element | null;
+export const TemplateGroups: (
+  props: TemplateGroupsProps,
+) => React_2.JSX.Element | null;
 
 // @alpha (undocumented)
 export interface TemplateGroupsProps {
diff --git a/plugins/scaffolder-react/api-report.md b/plugins/scaffolder-react/api-report.md
index c618050810..23204695a4 100644
--- a/plugins/scaffolder-react/api-report.md
+++ b/plugins/scaffolder-react/api-report.md
@@ -295,7 +295,7 @@ export interface ScaffolderUseTemplateSecrets {
 // @public
 export const SecretsContextProvider: (
   props: PropsWithChildren<{}>,
-) => JSX.Element;
+) => React_2.JSX.Element;
 
 // @public
 export type TaskStream = {
diff --git a/plugins/scaffolder-react/catalog-info.yaml b/plugins/scaffolder-react/catalog-info.yaml
new file mode 100644
index 0000000000..6294c39147
--- /dev/null
+++ b/plugins/scaffolder-react/catalog-info.yaml
@@ -0,0 +1,12 @@
+apiVersion: backstage.io/v1alpha1
+kind: Component
+metadata:
+  name: backstage-plugin-scaffolder-react
+  title: '@backstage/plugin-scaffolder-react'
+  description: >-
+    A frontend library that helps other Backstage plugins interact with the
+    Scaffolder
+spec:
+  lifecycle: production
+  type: backstage-web-library
+  owner: maintainers
diff --git a/plugins/scaffolder-react/package.json b/plugins/scaffolder-react/package.json
index ddf27cc83d..15261f64fe 100644
--- a/plugins/scaffolder-react/package.json
+++ b/plugins/scaffolder-react/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@backstage/plugin-scaffolder-react",
   "description": "A frontend library that helps other Backstage plugins interact with the Scaffolder",
-  "version": "1.5.2-next.0",
+  "version": "1.5.5-next.2",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
@@ -35,6 +35,7 @@
   "keywords": [
     "backstage"
   ],
+  "sideEffects": false,
   "scripts": {
     "build": "backstage-cli package build",
     "lint": "backstage-cli package lint",
@@ -76,7 +77,7 @@
     "luxon": "^3.0.0",
     "qs": "^6.9.4",
     "react-use": "^17.2.4",
-    "use-immer": "^0.8.0",
+    "use-immer": "^0.9.0",
     "zen-observable": "^0.10.0",
     "zod": "^3.21.4",
     "zod-to-json-schema": "^3.20.4"
diff --git a/plugins/scaffolder/CHANGELOG.md b/plugins/scaffolder/CHANGELOG.md
index 414e7acf53..98f7829279 100644
--- a/plugins/scaffolder/CHANGELOG.md
+++ b/plugins/scaffolder/CHANGELOG.md
@@ -1,5 +1,100 @@
 # @backstage/plugin-scaffolder
 
+## 1.14.5-next.2
+
+### Patch Changes
+
+- 8cec7664e146: Removed `@types/node` dependency
+- Updated dependencies
+  - @backstage/integration-react@1.1.19-next.2
+  - @backstage/core-components@0.13.5-next.2
+  - @backstage/core-plugin-api@1.6.0-next.2
+  - @backstage/config@1.1.0-next.1
+  - @backstage/plugin-scaffolder-react@1.5.5-next.2
+  - @backstage/plugin-catalog-react@1.8.4-next.2
+  - @backstage/plugin-permission-react@0.4.15-next.2
+  - @backstage/integration@1.7.0-next.2
+  - @backstage/catalog-model@1.4.2-next.1
+  - @backstage/catalog-client@1.4.4-next.1
+  - @backstage/errors@1.2.1
+  - @backstage/theme@0.4.1
+  - @backstage/types@1.1.0
+  - @backstage/plugin-catalog-common@1.0.16-next.1
+  - @backstage/plugin-scaffolder-common@1.4.1-next.1
+
+## 1.14.5-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.8.4-next.1
+  - @backstage/core-components@0.13.5-next.1
+  - @backstage/config@1.1.0-next.0
+  - @backstage/integration@1.7.0-next.1
+  - @backstage/plugin-scaffolder-react@1.5.5-next.1
+  - @backstage/integration-react@1.1.19-next.1
+  - @backstage/catalog-model@1.4.2-next.0
+  - @backstage/core-plugin-api@1.6.0-next.1
+  - @backstage/plugin-permission-react@0.4.15-next.1
+  - @backstage/catalog-client@1.4.4-next.0
+  - @backstage/plugin-catalog-common@1.0.16-next.0
+  - @backstage/plugin-scaffolder-common@1.4.1-next.0
+  - @backstage/errors@1.2.1
+  - @backstage/theme@0.4.1
+  - @backstage/types@1.1.0
+
+## 1.14.4-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/integration-react@1.1.18-next.0
+  - @backstage/integration@1.7.0-next.0
+  - @backstage/core-plugin-api@1.6.0-next.0
+  - @backstage/core-components@0.13.5-next.0
+  - @backstage/plugin-scaffolder-react@1.5.4-next.0
+  - @backstage/catalog-client@1.4.3
+  - @backstage/catalog-model@1.4.1
+  - @backstage/config@1.0.8
+  - @backstage/errors@1.2.1
+  - @backstage/theme@0.4.1
+  - @backstage/types@1.1.0
+  - @backstage/plugin-catalog-common@1.0.15
+  - @backstage/plugin-catalog-react@1.8.3-next.0
+  - @backstage/plugin-permission-react@0.4.15-next.0
+  - @backstage/plugin-scaffolder-common@1.4.0
+
+## 1.14.2
+
+### Patch Changes
+
+- 8a0490fb669e: Fix the get entities query in the `MyGroupsPicker` to query the `kind=Group` entities.
+- Updated dependencies
+  - @backstage/integration-react@1.1.16
+  - @backstage/integration@1.6.0
+  - @backstage/core-components@0.13.4
+  - @backstage/plugin-catalog-react@1.8.1
+  - @backstage/plugin-scaffolder-common@1.4.0
+  - @backstage/plugin-scaffolder-react@1.5.2
+  - @backstage/core-plugin-api@1.5.3
+  - @backstage/catalog-client@1.4.3
+  - @backstage/catalog-model@1.4.1
+  - @backstage/config@1.0.8
+  - @backstage/errors@1.2.1
+  - @backstage/theme@0.4.1
+  - @backstage/types@1.1.0
+  - @backstage/plugin-catalog-common@1.0.15
+  - @backstage/plugin-permission-react@0.4.14
+
+## 1.14.2-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.8.1-next.1
+  - @backstage/plugin-scaffolder-react@1.5.2-next.1
+  - @backstage/integration-react@1.1.16-next.1
+
 ## 1.14.2-next.1
 
 ### Patch Changes
diff --git a/plugins/scaffolder/alpha-api-report.md b/plugins/scaffolder/alpha-api-report.md
index de657c2138..8cacf6105e 100644
--- a/plugins/scaffolder/alpha-api-report.md
+++ b/plugins/scaffolder/alpha-api-report.md
@@ -7,6 +7,7 @@
 
 import { FormProps as FormProps_2 } from '@backstage/plugin-scaffolder-react/alpha';
 import type { FormProps as FormProps_3 } from '@rjsf/core-v5';
+import { JSX as JSX_2 } from 'react';
 import { LayoutOptions } from '@backstage/plugin-scaffolder-react';
 import { NextFieldExtensionOptions } from '@backstage/plugin-scaffolder-react/alpha';
 import { PropsWithChildren } from 'react';
@@ -47,7 +48,7 @@ export type NextRouterProps = {
 // @alpha
 export const NextScaffolderPage: (
   props: PropsWithChildren<NextRouterProps>,
-) => JSX.Element;
+) => JSX_2.Element;
 
 // @alpha (undocumented)
 export type TemplateListPageProps = {
diff --git a/plugins/scaffolder/api-report.md b/plugins/scaffolder/api-report.md
index 48f24868de..59d2d54fcc 100644
--- a/plugins/scaffolder/api-report.md
+++ b/plugins/scaffolder/api-report.md
@@ -23,6 +23,7 @@ import { FieldExtensionOptions as FieldExtensionOptions_2 } from '@backstage/plu
 import { FieldValidation } from '@rjsf/core';
 import { IdentityApi } from '@backstage/core-plugin-api';
 import { JsonObject } from '@backstage/types';
+import { JSX as JSX_2 } from 'react';
 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';
@@ -500,7 +501,7 @@ export const ScaffolderLayouts: ComponentType<{
 export type ScaffolderOutputlink = ScaffolderOutputLink;
 
 // @public
-export const ScaffolderPage: (props: RouterProps) => JSX.Element;
+export const ScaffolderPage: (props: RouterProps) => JSX_2.Element;
 
 // @public
 export const scaffolderPlugin: BackstagePlugin<
@@ -550,7 +551,7 @@ export type ScaffolderTaskStatus = ScaffolderTaskStatus_2;
 export type ScaffolderUseTemplateSecrets = ScaffolderUseTemplateSecrets_2;
 
 // @public
-export const TaskPage: (props: TaskPageProps) => JSX.Element;
+export const TaskPage: (props: TaskPageProps) => React_2.JSX.Element;
 
 // @public
 export type TaskPageProps = {
@@ -561,7 +562,7 @@ export type TaskPageProps = {
 export type TemplateParameterSchema = TemplateParameterSchema_2;
 
 // @public
-export const TemplateTypePicker: () => JSX.Element | null;
+export const TemplateTypePicker: () => React_2.JSX.Element | null;
 
 // @public @deprecated (undocumented)
 export const useTemplateSecrets: () => ScaffolderUseTemplateSecrets_2;
diff --git a/plugins/scaffolder/catalog-info.yaml b/plugins/scaffolder/catalog-info.yaml
new file mode 100644
index 0000000000..ab4321be3e
--- /dev/null
+++ b/plugins/scaffolder/catalog-info.yaml
@@ -0,0 +1,10 @@
+apiVersion: backstage.io/v1alpha1
+kind: Component
+metadata:
+  name: backstage-plugin-scaffolder
+  title: '@backstage/plugin-scaffolder'
+  description: The Backstage plugin that helps you create new things
+spec:
+  lifecycle: production
+  type: backstage-frontend-plugin
+  owner: maintainers
diff --git a/plugins/scaffolder/package.json b/plugins/scaffolder/package.json
index f010329b14..9f7b8aa553 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.14.2-next.1",
+  "version": "1.14.5-next.2",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
@@ -35,6 +35,7 @@
   "keywords": [
     "backstage"
   ],
+  "sideEffects": false,
   "scripts": {
     "build": "backstage-cli package build",
     "start": "backstage-cli package start",
@@ -107,7 +108,6 @@
     "@testing-library/user-event": "^14.0.0",
     "@types/humanize-duration": "^3.18.1",
     "@types/json-schema": "^7.0.9",
-    "@types/node": "^16.11.26",
     "msw": "^1.0.0"
   },
   "files": [
diff --git a/plugins/scaffolder/src/components/ListTasksPage/columns/CreatedAtColumn.test.tsx b/plugins/scaffolder/src/components/ListTasksPage/columns/CreatedAtColumn.test.tsx
index a30c1d370b..9cd1353ae1 100644
--- a/plugins/scaffolder/src/components/ListTasksPage/columns/CreatedAtColumn.test.tsx
+++ b/plugins/scaffolder/src/components/ListTasksPage/columns/CreatedAtColumn.test.tsx
@@ -23,7 +23,7 @@ import { DateTime } from 'luxon';
 describe('<CreatedAtColumn />', () => {
   it('should render the column with the time', async () => {
     const props = {
-      createdAt: DateTime.now().toISO(),
+      createdAt: DateTime.now().toISO()!,
     };
 
     const { getByText } = await renderInTestApp(<CreatedAtColumn {...props} />);
diff --git a/plugins/search-backend-module-catalog/CHANGELOG.md b/plugins/search-backend-module-catalog/CHANGELOG.md
index b2a9d07118..55feee5462 100644
--- a/plugins/search-backend-module-catalog/CHANGELOG.md
+++ b/plugins/search-backend-module-catalog/CHANGELOG.md
@@ -1,5 +1,94 @@
 # @backstage/plugin-search-backend-module-catalog
 
+## 0.1.7-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config@1.1.0-next.1
+  - @backstage/backend-tasks@0.5.8-next.2
+  - @backstage/backend-common@0.19.5-next.2
+  - @backstage/plugin-catalog-node@1.4.4-next.2
+  - @backstage/backend-plugin-api@0.6.3-next.2
+  - @backstage/catalog-model@1.4.2-next.1
+  - @backstage/plugin-permission-common@0.7.8-next.1
+  - @backstage/plugin-search-backend-node@1.2.7-next.2
+  - @backstage/catalog-client@1.4.4-next.1
+  - @backstage/errors@1.2.1
+  - @backstage/plugin-catalog-common@1.0.16-next.1
+  - @backstage/plugin-search-common@1.2.6-next.1
+
+## 0.1.7-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config@1.1.0-next.0
+  - @backstage/backend-tasks@0.5.8-next.1
+  - @backstage/backend-common@0.19.5-next.1
+  - @backstage/backend-plugin-api@0.6.3-next.1
+  - @backstage/catalog-model@1.4.2-next.0
+  - @backstage/plugin-permission-common@0.7.8-next.0
+  - @backstage/plugin-search-backend-node@1.2.7-next.1
+  - @backstage/plugin-catalog-node@1.4.4-next.1
+  - @backstage/catalog-client@1.4.4-next.0
+  - @backstage/plugin-catalog-common@1.0.16-next.0
+  - @backstage/errors@1.2.1
+  - @backstage/plugin-search-common@1.2.6-next.0
+
+## 0.1.6-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.19.4-next.0
+  - @backstage/backend-tasks@0.5.7-next.0
+  - @backstage/backend-plugin-api@0.6.2-next.0
+  - @backstage/catalog-client@1.4.3
+  - @backstage/catalog-model@1.4.1
+  - @backstage/config@1.0.8
+  - @backstage/errors@1.2.1
+  - @backstage/plugin-catalog-common@1.0.15
+  - @backstage/plugin-catalog-node@1.4.3-next.0
+  - @backstage/plugin-permission-common@0.7.7
+  - @backstage/plugin-search-backend-node@1.2.6-next.0
+  - @backstage/plugin-search-common@1.2.5
+
+## 0.1.4
+
+### Patch Changes
+
+- 629cbd194a87: Use `coreServices.rootConfig` instead of `coreService.config`
+- 29f77f923c71: Ensure that all services are dependency injected into the module instead of taken from options
+- 12a8c94eda8d: Add package repository and homepage metadata
+- ec1032129e47: Breaking change in the alpha export `searchModuleCatalogCollator`: Moved collator settings from module options into app-config. You are now expected to set up the catalog collator under the `search.collators.catalog` configuration key. There is also a new `catalogCollatorExtensionPoint` extension point for the module, wherein you can set custom transformers.
+- d4f19a16bd52: Add User Entity email to the search index so that users can be found by their email.
+- Updated dependencies
+  - @backstage/backend-common@0.19.2
+  - @backstage/backend-plugin-api@0.6.0
+  - @backstage/plugin-search-backend-node@1.2.4
+  - @backstage/plugin-catalog-node@1.4.1
+  - @backstage/backend-tasks@0.5.5
+  - @backstage/catalog-client@1.4.3
+  - @backstage/catalog-model@1.4.1
+  - @backstage/config@1.0.8
+  - @backstage/errors@1.2.1
+  - @backstage/plugin-catalog-common@1.0.15
+  - @backstage/plugin-permission-common@0.7.7
+  - @backstage/plugin-search-common@1.2.5
+
+## 0.1.4-next.2
+
+### Patch Changes
+
+- 29f77f923c71: Ensure that all services are dependency injected into the module instead of taken from options
+- Updated dependencies
+  - @backstage/backend-plugin-api@0.6.0-next.2
+  - @backstage/backend-tasks@0.5.5-next.2
+  - @backstage/backend-common@0.19.2-next.2
+  - @backstage/plugin-catalog-node@1.4.1-next.2
+  - @backstage/plugin-search-backend-node@1.2.4-next.2
+
 ## 0.1.4-next.1
 
 ### Patch Changes
diff --git a/plugins/search-backend-module-catalog/README.md b/plugins/search-backend-module-catalog/README.md
index b5960e2789..9deeccb910 100644
--- a/plugins/search-backend-module-catalog/README.md
+++ b/plugins/search-backend-module-catalog/README.md
@@ -2,11 +2,18 @@
 
 > DISCLAIMER: The new backend system is in alpha, and so are the search backend module support for the new backend system. We don't recommend you to migrate your backend installations to the new system yet. But if you want to experiment, you can find getting started guides below.
 
-This package exports catalog backend modules responsible for extending search.
+This package exports a module that extends the search backend to also indexing the entities of your catalog.
 
-## Example
+## Installation
 
-### Use default schedule
+Add the module package as a dependency:
+
+```bash
+# From your Backstage root directory
+yarn add --cwd packages/backend @backstage/plugin-search-backend-module-catalog
+```
+
+Add the collator to your backend instance, along with the search plugin itself:
 
 ```tsx
 // packages/backend-next/src/index.ts
@@ -20,22 +27,50 @@ backend.add(searchModuleCatalogCollator());
 backend.start();
 ```
 
-### Use custom schedule
+You may also want to add configuration parameters to your app-config, for example for controlling the scheduled indexing interval. These parameters should be placed under the `search.collators.catalog` key. See [the config definition file](https://github.com/backstage/backstage/blob/master/plugins/search-backend-module-catalog/config.d.ts) for more details.
+
+## Advanced Customizations
+
+This module also has an extension point, which lets you inject advanced customizations. Here's an example of how to leverage that extension point to tweak the transformer used for building the search indexer documents:
 
 ```tsx
 // packages/backend-next/src/index.ts
 import { createBackend } from '@backstage/backend-defaults';
+import { createBackendModule } from '@backstage/backend-plugin-api';
 import { searchPlugin } from '@backstage/plugin-search-backend/alpha';
-import { searchModuleCatalogCollator } from '@backstage/plugin-search-backend-module-catalog/alpha';
+import { CatalogCollatorEntityTransformer } from '@backstage/plugin-search-backend-module-catalog';
+import {
+  searchModuleCatalogCollator,
+  catalogCollatorExtensionPoint,
+} from '@backstage/plugin-search-backend-module-catalog/alpha';
 
-const schedule = {
-  frequency: { minutes: 10 },
-  timeout: { minutes: 15 },
-  initialDelay: { seconds: 3 },
-};
+const customTransformer: CatalogCollatorEntityTransformer = entity => ({
+  title: entity.metadata.title || entity.metadata.name,
+  text: entity.metadata.description || '',
+  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) || '',
+});
 
 const backend = createBackend();
 backend.add(searchPlugin());
-backend.add(searchModuleCatalogCollator({ schedule }));
+backend.add(searchModuleCatalogCollator());
+backend.add(
+  createBackendModule({
+    pluginId: 'search',
+    moduleId: 'myCatalogCollatorOptions',
+    register(reg) {
+      reg.registerInit({
+        deps: { collator: catalogCollatorExtensionPoint },
+        init({ collator }) {
+          collator.setEntityTransformer(customTransformer);
+        },
+      });
+    },
+  })(),
+);
 backend.start();
 ```
diff --git a/plugins/search-backend-module-catalog/alpha-api-report.md b/plugins/search-backend-module-catalog/alpha-api-report.md
index 7c6e91b6a1..f840884f68 100644
--- a/plugins/search-backend-module-catalog/alpha-api-report.md
+++ b/plugins/search-backend-module-catalog/alpha-api-report.md
@@ -4,21 +4,20 @@
 
 ```ts
 import { BackendFeature } from '@backstage/backend-plugin-api';
-import { DefaultCatalogCollatorFactoryOptions } from '@backstage/plugin-search-backend-module-catalog';
-import { TaskScheduleDefinition } from '@backstage/backend-tasks';
+import { CatalogCollatorEntityTransformer } from '@backstage/plugin-search-backend-module-catalog';
+import { ExtensionPoint } from '@backstage/backend-plugin-api';
 
 // @alpha
-export const searchModuleCatalogCollator: (
-  options?: SearchModuleCatalogCollatorOptions | undefined,
-) => BackendFeature;
-
-// @alpha
-export type SearchModuleCatalogCollatorOptions = Omit<
-  DefaultCatalogCollatorFactoryOptions,
-  'discovery' | 'tokenManager' | 'catalogClient'
-> & {
-  schedule?: TaskScheduleDefinition;
+export type CatalogCollatorExtensionPoint = {
+  setEntityTransformer(transformer: CatalogCollatorEntityTransformer): void;
 };
 
+// @alpha
+export const catalogCollatorExtensionPoint: ExtensionPoint<CatalogCollatorExtensionPoint>;
+
+// @alpha
+const _default: () => BackendFeature;
+export default _default;
+
 // (No @packageDocumentation comment for this package)
 ```
diff --git a/plugins/search-backend-module-catalog/api-report.md b/plugins/search-backend-module-catalog/api-report.md
index b773860fe8..6f5813ca9e 100644
--- a/plugins/search-backend-module-catalog/api-report.md
+++ b/plugins/search-backend-module-catalog/api-report.md
@@ -24,11 +24,11 @@ export type CatalogCollatorEntityTransformer = (
 // @public (undocumented)
 export const defaultCatalogCollatorEntityTransformer: CatalogCollatorEntityTransformer;
 
-// @public (undocumented)
+// @public
 export class DefaultCatalogCollatorFactory implements DocumentCollatorFactory {
   // (undocumented)
   static fromConfig(
-    _config: Config,
+    configRoot: Config,
     options: DefaultCatalogCollatorFactoryOptions,
   ): DefaultCatalogCollatorFactory;
   // (undocumented)
diff --git a/plugins/search-backend-module-catalog/catalog-info.yaml b/plugins/search-backend-module-catalog/catalog-info.yaml
new file mode 100644
index 0000000000..d36627848e
--- /dev/null
+++ b/plugins/search-backend-module-catalog/catalog-info.yaml
@@ -0,0 +1,10 @@
+apiVersion: backstage.io/v1alpha1
+kind: Component
+metadata:
+  name: backstage-plugin-search-backend-module-catalog
+  title: '@backstage/plugin-search-backend-module-catalog'
+  description: A module for the search backend that exports catalog modules
+spec:
+  lifecycle: experimental
+  type: backstage-backend-plugin-module
+  owner: discoverability-maintainers
diff --git a/plugins/search-backend-module-catalog/config.d.ts b/plugins/search-backend-module-catalog/config.d.ts
new file mode 100644
index 0000000000..0105764afb
--- /dev/null
+++ b/plugins/search-backend-module-catalog/config.d.ts
@@ -0,0 +1,55 @@
+/*
+ * 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 { TaskScheduleDefinitionConfig } from '@backstage/backend-tasks';
+
+export interface Config {
+  search?: {
+    collators?: {
+      /**
+       * Configuration options for `@backstage/plugin-search-backend-module-catalog`
+       */
+      catalog?: {
+        /**
+         * A templating string with placeholders, to form the final location of
+         * the entity.
+         *
+         * Defaults to '/catalog/:namespace/:kind/:name'
+         */
+        locationTemplate?: string;
+        /**
+         * A filter expression passed to the catalog client, to select what
+         * entities to collate.
+         *
+         * Defaults to no filter, ie indexing all entities.
+         */
+        filter?: object;
+        /**
+         * The number of entities to process at a time. Keep this at a
+         * reasonable number to avoid overloading either the catalog or the
+         * search backend.
+         *
+         * Defaults to 500
+         */
+        batchSize?: number;
+        /**
+         * The schedule for how often to run the collation job.
+         */
+        schedule?: TaskScheduleDefinitionConfig;
+      };
+    };
+  };
+}
diff --git a/plugins/search-backend-module-catalog/package.json b/plugins/search-backend-module-catalog/package.json
index 37473ef04b..85fc0dd645 100644
--- a/plugins/search-backend-module-catalog/package.json
+++ b/plugins/search-backend-module-catalog/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@backstage/plugin-search-backend-module-catalog",
   "description": "A module for the search backend that exports catalog modules",
-  "version": "0.1.4-next.1",
+  "version": "0.1.7-next.2",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
@@ -48,6 +48,7 @@
     "@backstage/catalog-client": "workspace:^",
     "@backstage/catalog-model": "workspace:^",
     "@backstage/config": "workspace:^",
+    "@backstage/errors": "workspace:^",
     "@backstage/plugin-catalog-common": "workspace:^",
     "@backstage/plugin-catalog-node": "workspace:^",
     "@backstage/plugin-permission-common": "workspace:^",
@@ -61,6 +62,8 @@
     "msw": "^1.0.0"
   },
   "files": [
-    "dist"
-  ]
+    "dist",
+    "config.d.ts"
+  ],
+  "configSchema": "config.d.ts"
 }
diff --git a/plugins/search-backend-module-catalog/src/alpha.test.ts b/plugins/search-backend-module-catalog/src/alpha.test.ts
index 8a3082c6aa..eb2a795ecc 100644
--- a/plugins/search-backend-module-catalog/src/alpha.test.ts
+++ b/plugins/search-backend-module-catalog/src/alpha.test.ts
@@ -14,17 +14,11 @@
  * limitations under the License.
  */
 
-import { startTestBackend } from '@backstage/backend-test-utils';
+import { mockServices, startTestBackend } from '@backstage/backend-test-utils';
 import { searchIndexRegistryExtensionPoint } from '@backstage/plugin-search-backend-node/alpha';
-import { searchModuleCatalogCollator } from './alpha';
+import searchModuleCatalogCollator from './alpha';
 
 describe('searchModuleCatalogCollator', () => {
-  const schedule = {
-    frequency: { minutes: 10 },
-    timeout: { minutes: 15 },
-    initialDelay: { seconds: 3 },
-  };
-
   it('should register the catalog collator to the search index registry extension point with factory and schedule', async () => {
     const extensionPointMock = {
       addCollator: jest.fn(),
@@ -34,7 +28,7 @@ describe('searchModuleCatalogCollator', () => {
       extensionPoints: [
         [searchIndexRegistryExtensionPoint, extensionPointMock],
       ],
-      features: [searchModuleCatalogCollator({ schedule })],
+      features: [searchModuleCatalogCollator()],
     });
 
     expect(extensionPointMock.addCollator).toHaveBeenCalledTimes(1);
@@ -43,4 +37,37 @@ describe('searchModuleCatalogCollator', () => {
       schedule: expect.objectContaining({ run: expect.any(Function) }),
     });
   });
+
+  it('refuses to start up with a broken schedule', async () => {
+    await expect(
+      startTestBackend({
+        extensionPoints: [
+          [
+            searchIndexRegistryExtensionPoint,
+            {
+              addCollator: jest.fn(),
+            },
+          ],
+        ],
+        features: [
+          searchModuleCatalogCollator(),
+          mockServices.rootConfig.factory({
+            data: {
+              search: {
+                collators: {
+                  catalog: {
+                    schedule: {
+                      frequency: { minutes: 10 },
+                      timeout: { minutes: 'boo' },
+                      initialDelay: { seconds: 3 },
+                    },
+                  },
+                },
+              },
+            },
+          }),
+        ],
+      }),
+    ).rejects.toThrow(/Invalid schedule/);
+  });
 });
diff --git a/plugins/search-backend-module-catalog/src/alpha.ts b/plugins/search-backend-module-catalog/src/alpha.ts
index cfd8c13539..5813bb235e 100644
--- a/plugins/search-backend-module-catalog/src/alpha.ts
+++ b/plugins/search-backend-module-catalog/src/alpha.ts
@@ -22,73 +22,88 @@
 import {
   coreServices,
   createBackendModule,
+  createExtensionPoint,
 } from '@backstage/backend-plugin-api';
-import { TaskScheduleDefinition } from '@backstage/backend-tasks';
-import { searchIndexRegistryExtensionPoint } from '@backstage/plugin-search-backend-node/alpha';
-
-import {
-  DefaultCatalogCollatorFactory,
-  DefaultCatalogCollatorFactoryOptions,
-} from '@backstage/plugin-search-backend-module-catalog';
 import { catalogServiceRef } from '@backstage/plugin-catalog-node/alpha';
+import {
+  CatalogCollatorEntityTransformer,
+  DefaultCatalogCollatorFactory,
+} from '@backstage/plugin-search-backend-module-catalog';
+import { searchIndexRegistryExtensionPoint } from '@backstage/plugin-search-backend-node/alpha';
+import { readScheduleConfigOptions } from './collators/config';
 
 /**
+ * Options for {@link catalogCollatorExtensionPoint}.
+ *
  * @alpha
- * Options for {@link searchModuleCatalogCollator}.
  */
-export type SearchModuleCatalogCollatorOptions = Omit<
-  DefaultCatalogCollatorFactoryOptions,
-  'discovery' | 'tokenManager' | 'catalogClient'
-> & {
-  schedule?: TaskScheduleDefinition;
+export type CatalogCollatorExtensionPoint = {
+  /**
+   * Allows you to customize how entities are shaped into documents.
+   */
+  setEntityTransformer(transformer: CatalogCollatorEntityTransformer): void;
 };
 
+/**
+ * Extension point for customizing how catalog entities are shaped into
+ * documents for the search backend.
+ *
+ * @alpha
+ */
+export const catalogCollatorExtensionPoint =
+  createExtensionPoint<CatalogCollatorExtensionPoint>({
+    id: 'search.catalogCollator.extension',
+  });
+
 /**
  * Search backend module for the Catalog index.
  *
  * @alpha
  */
-export const searchModuleCatalogCollator = createBackendModule(
-  (options?: SearchModuleCatalogCollatorOptions) => ({
-    moduleId: 'catalogCollator',
-    pluginId: 'search',
-    register(env) {
-      env.registerInit({
-        deps: {
-          config: coreServices.rootConfig,
-          discovery: coreServices.discovery,
-          tokenManager: coreServices.tokenManager,
-          scheduler: coreServices.scheduler,
-          indexRegistry: searchIndexRegistryExtensionPoint,
-          catalog: catalogServiceRef,
-        },
-        async init({
-          config,
-          discovery,
-          tokenManager,
-          scheduler,
-          indexRegistry,
-          catalog,
-        }) {
-          const defaultSchedule = {
-            frequency: { minutes: 10 },
-            timeout: { minutes: 15 },
-            initialDelay: { seconds: 3 },
-          };
+export default createBackendModule({
+  moduleId: 'catalogCollator',
+  pluginId: 'search',
+  register(env) {
+    let entityTransformer: CatalogCollatorEntityTransformer | undefined;
 
-          indexRegistry.addCollator({
-            schedule: scheduler.createScheduledTaskRunner(
-              options?.schedule ?? defaultSchedule,
-            ),
-            factory: DefaultCatalogCollatorFactory.fromConfig(config, {
-              ...options,
-              discovery,
-              tokenManager,
-              catalogClient: catalog,
-            }),
-          });
-        },
-      });
-    },
-  }),
-);
+    env.registerExtensionPoint(catalogCollatorExtensionPoint, {
+      setEntityTransformer(transformer) {
+        if (entityTransformer) {
+          throw new Error('setEntityTransformer can only be called once');
+        }
+        entityTransformer = transformer;
+      },
+    });
+
+    env.registerInit({
+      deps: {
+        config: coreServices.rootConfig,
+        discovery: coreServices.discovery,
+        tokenManager: coreServices.tokenManager,
+        scheduler: coreServices.scheduler,
+        indexRegistry: searchIndexRegistryExtensionPoint,
+        catalog: catalogServiceRef,
+      },
+      async init({
+        config,
+        discovery,
+        tokenManager,
+        scheduler,
+        indexRegistry,
+        catalog,
+      }) {
+        indexRegistry.addCollator({
+          schedule: scheduler.createScheduledTaskRunner(
+            readScheduleConfigOptions(config),
+          ),
+          factory: DefaultCatalogCollatorFactory.fromConfig(config, {
+            entityTransformer,
+            discovery,
+            tokenManager,
+            catalogClient: catalog,
+          }),
+        });
+      },
+    });
+  },
+});
diff --git a/plugins/search-backend-module-catalog/src/collators/DefaultCatalogCollatorFactory.test.ts b/plugins/search-backend-module-catalog/src/collators/DefaultCatalogCollatorFactory.test.ts
index 462e777dff..7af3a8e9a2 100644
--- a/plugins/search-backend-module-catalog/src/collators/DefaultCatalogCollatorFactory.test.ts
+++ b/plugins/search-backend-module-catalog/src/collators/DefaultCatalogCollatorFactory.test.ts
@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 import {
   PluginEndpointDiscovery,
   TokenManager,
diff --git a/plugins/search-backend-module-catalog/src/collators/DefaultCatalogCollatorFactory.ts b/plugins/search-backend-module-catalog/src/collators/DefaultCatalogCollatorFactory.ts
index ed81d39bbb..586346c385 100644
--- a/plugins/search-backend-module-catalog/src/collators/DefaultCatalogCollatorFactory.ts
+++ b/plugins/search-backend-module-catalog/src/collators/DefaultCatalogCollatorFactory.ts
@@ -14,7 +14,6 @@
  * limitations under the License.
  */
 
-import { Config } from '@backstage/config';
 import {
   PluginEndpointDiscovery,
   TokenManager,
@@ -24,27 +23,45 @@ import {
   CatalogClient,
   GetEntitiesRequest,
 } from '@backstage/catalog-client';
-import { DocumentCollatorFactory } from '@backstage/plugin-search-common';
-import { catalogEntityReadPermission } from '@backstage/plugin-catalog-common/alpha';
+import { stringifyEntityRef } from '@backstage/catalog-model';
+import { Config } from '@backstage/config';
 import { CatalogEntityDocument } from '@backstage/plugin-catalog-common';
+import { catalogEntityReadPermission } from '@backstage/plugin-catalog-common/alpha';
 import { Permission } from '@backstage/plugin-permission-common';
+import { DocumentCollatorFactory } from '@backstage/plugin-search-common';
 import { Readable } from 'stream';
 import { CatalogCollatorEntityTransformer } from './CatalogCollatorEntityTransformer';
+import { readCollatorConfigOptions } from './config';
 import { defaultCatalogCollatorEntityTransformer } from './defaultCatalogCollatorEntityTransformer';
-import { stringifyEntityRef } from '@backstage/catalog-model';
 
 /** @public */
 export type DefaultCatalogCollatorFactoryOptions = {
   discovery: PluginEndpointDiscovery;
   tokenManager: TokenManager;
+  /**
+   * @deprecated Use the config key `search.collators.catalog.locationTemplate` instead.
+   */
   locationTemplate?: string;
+  /**
+   * @deprecated Use the config key `search.collators.catalog.filter` instead.
+   */
   filter?: GetEntitiesRequest['filter'];
+  /**
+   * @deprecated Use the config key `search.collators.catalog.batchSize` instead.
+   */
   batchSize?: number;
   catalogClient?: CatalogApi;
+  /**
+   * Allows you to customize how entities are shaped into documents.
+   */
   entityTransformer?: CatalogCollatorEntityTransformer;
 };
 
-/** @public */
+/**
+ * Collates entities from the Catalog into documents for the search backend.
+ *
+ * @public
+ */
 export class DefaultCatalogCollatorFactory implements DocumentCollatorFactory {
   public readonly type = 'software-catalog';
   public readonly visibilityPermission: Permission =
@@ -58,13 +75,31 @@ export class DefaultCatalogCollatorFactory implements DocumentCollatorFactory {
   private entityTransformer: CatalogCollatorEntityTransformer;
 
   static fromConfig(
-    _config: Config,
+    configRoot: Config,
     options: DefaultCatalogCollatorFactoryOptions,
   ) {
-    return new DefaultCatalogCollatorFactory(options);
+    const configOptions = readCollatorConfigOptions(configRoot);
+    return new DefaultCatalogCollatorFactory({
+      locationTemplate:
+        options.locationTemplate ?? configOptions.locationTemplate,
+      filter: options.filter ?? configOptions.filter,
+      batchSize: options.batchSize ?? configOptions.batchSize,
+      entityTransformer: options.entityTransformer,
+      discovery: options.discovery,
+      tokenManager: options.tokenManager,
+      catalogClient: options.catalogClient,
+    });
   }
 
-  private constructor(options: DefaultCatalogCollatorFactoryOptions) {
+  private constructor(options: {
+    locationTemplate: string;
+    filter: GetEntitiesRequest['filter'];
+    batchSize: number;
+    entityTransformer?: CatalogCollatorEntityTransformer;
+    discovery: PluginEndpointDiscovery;
+    tokenManager: TokenManager;
+    catalogClient?: CatalogApi;
+  }) {
     const {
       batchSize,
       discovery,
@@ -75,10 +110,9 @@ export class DefaultCatalogCollatorFactory implements DocumentCollatorFactory {
       entityTransformer,
     } = options;
 
-    this.locationTemplate =
-      locationTemplate || '/catalog/:namespace/:kind/:name';
+    this.locationTemplate = locationTemplate;
     this.filter = filter;
-    this.batchSize = batchSize || 500;
+    this.batchSize = batchSize;
     this.catalogClient =
       catalogClient || new CatalogClient({ discoveryApi: discovery });
     this.tokenManager = tokenManager;
diff --git a/plugins/search-backend-module-catalog/src/collators/config.test.ts b/plugins/search-backend-module-catalog/src/collators/config.test.ts
new file mode 100644
index 0000000000..dc330f6df2
--- /dev/null
+++ b/plugins/search-backend-module-catalog/src/collators/config.test.ts
@@ -0,0 +1,82 @@
+/*
+ * 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 { ConfigReader } from '@backstage/config';
+import {
+  defaults,
+  readCollatorConfigOptions,
+  readScheduleConfigOptions,
+} from './config';
+
+describe('config', () => {
+  describe('readScheduleConfigOptions', () => {
+    it('reads config', () => {
+      const result = readScheduleConfigOptions(
+        new ConfigReader({
+          search: {
+            collators: {
+              catalog: {
+                schedule: {
+                  frequency: { minutes: 1 },
+                  timeout: { seconds: 2 },
+                  initialDelay: { hours: 3 },
+                },
+              },
+            },
+          },
+        }),
+      );
+      expect(result).toEqual({
+        frequency: { minutes: 1 },
+        timeout: { seconds: 2 },
+        initialDelay: { hours: 3 },
+      });
+    });
+
+    it('returns defaults', () => {
+      const result = readScheduleConfigOptions(new ConfigReader({}));
+      expect(result).toEqual(defaults.schedule);
+    });
+  });
+
+  describe('readCollatorConfigOptions', () => {
+    it('reads config', () => {
+      const result = readCollatorConfigOptions(
+        new ConfigReader({
+          search: {
+            collators: {
+              catalog: {
+                batchSize: 1,
+                locationTemplate: '/mock/:namespace/:kind/:name',
+                filter: { a: 1 },
+              },
+            },
+          },
+        }),
+      );
+      expect(result).toEqual({
+        batchSize: 1,
+        locationTemplate: '/mock/:namespace/:kind/:name',
+        filter: { a: 1 },
+      });
+    });
+
+    it('returns defaults', () => {
+      const result = readCollatorConfigOptions(new ConfigReader({}));
+      expect(result).toEqual(defaults.collatorOptions);
+    });
+  });
+});
diff --git a/plugins/search-backend-module-catalog/src/collators/config.ts b/plugins/search-backend-module-catalog/src/collators/config.ts
new file mode 100644
index 0000000000..d4ae9b5934
--- /dev/null
+++ b/plugins/search-backend-module-catalog/src/collators/config.ts
@@ -0,0 +1,81 @@
+/*
+ * 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 {
+  readTaskScheduleDefinitionFromConfig,
+  TaskScheduleDefinition,
+} from '@backstage/backend-tasks';
+import { EntityFilterQuery } from '@backstage/catalog-client';
+import { Config } from '@backstage/config';
+import { InputError } from '@backstage/errors';
+
+const configKey = 'search.collators.catalog';
+
+export const defaults = {
+  schedule: {
+    frequency: { minutes: 10 },
+    timeout: { minutes: 15 },
+    initialDelay: { seconds: 3 },
+  },
+  collatorOptions: {
+    locationTemplate: '/catalog/:namespace/:kind/:name',
+    filter: undefined,
+    batchSize: 500,
+  },
+};
+
+export function readScheduleConfigOptions(
+  configRoot: Config,
+): TaskScheduleDefinition {
+  let schedule: TaskScheduleDefinition | undefined = undefined;
+
+  const config = configRoot.getOptionalConfig(configKey);
+  if (config) {
+    const scheduleConfig = config.getOptionalConfig('schedule');
+    if (scheduleConfig) {
+      try {
+        schedule = readTaskScheduleDefinitionFromConfig(scheduleConfig);
+      } catch (error) {
+        throw new InputError(`Invalid schedule at ${configKey}, ${error}`);
+      }
+    }
+  }
+
+  return schedule ?? defaults.schedule;
+}
+
+export function readCollatorConfigOptions(configRoot: Config): {
+  locationTemplate: string;
+  filter: EntityFilterQuery | undefined;
+  batchSize: number;
+} {
+  const config = configRoot.getOptionalConfig(configKey);
+  if (!config) {
+    return defaults.collatorOptions;
+  }
+
+  return {
+    locationTemplate:
+      config.getOptionalString('locationTemplate') ??
+      defaults.collatorOptions.locationTemplate,
+    filter:
+      config.getOptionalConfig('filter')?.get<EntityFilterQuery>() ??
+      defaults.collatorOptions.filter,
+    batchSize:
+      config.getOptionalNumber('batchSize') ??
+      defaults.collatorOptions.batchSize,
+  };
+}
diff --git a/plugins/search-backend-module-catalog/src/collators/defaultCatalogCollatorEntityTransformer.test.ts b/plugins/search-backend-module-catalog/src/collators/defaultCatalogCollatorEntityTransformer.test.ts
index 8206a58599..3fe6a9c3e5 100644
--- a/plugins/search-backend-module-catalog/src/collators/defaultCatalogCollatorEntityTransformer.test.ts
+++ b/plugins/search-backend-module-catalog/src/collators/defaultCatalogCollatorEntityTransformer.test.ts
@@ -42,6 +42,7 @@ const userEntity = {
   spec: {
     profile: {
       displayName: 'User 1',
+      email: 'test@test.com',
     },
   },
 };
@@ -94,7 +95,7 @@ describe('DefaultCatalogCollatorEntityTransformer', () => {
 
       expect(document).toMatchObject({
         title: userEntity.metadata.name,
-        text: `${userEntity.metadata.description} : ${userEntity.spec.profile.displayName}`,
+        text: `${userEntity.metadata.description} : ${userEntity.spec.profile.displayName} : ${userEntity.spec.profile.email}`,
         namespace: 'default',
         componentType: 'other',
         lifecycle: '',
diff --git a/plugins/search-backend-module-catalog/src/collators/defaultCatalogCollatorEntityTransformer.ts b/plugins/search-backend-module-catalog/src/collators/defaultCatalogCollatorEntityTransformer.ts
index 2fc0c5d50d..db239b8669 100644
--- a/plugins/search-backend-module-catalog/src/collators/defaultCatalogCollatorEntityTransformer.ts
+++ b/plugins/search-backend-module-catalog/src/collators/defaultCatalogCollatorEntityTransformer.ts
@@ -27,6 +27,12 @@ const getDocumentText = (entity: Entity): string => {
     }
   }
 
+  if (isUserEntity(entity)) {
+    if (entity.spec?.profile?.email) {
+      documentTexts.push(entity.spec.profile.email);
+    }
+  }
+
   return documentTexts.join(' : ');
 };
 
diff --git a/plugins/search-backend-module-elasticsearch/CHANGELOG.md b/plugins/search-backend-module-elasticsearch/CHANGELOG.md
index 2191fa05ff..3e2af01514 100644
--- a/plugins/search-backend-module-elasticsearch/CHANGELOG.md
+++ b/plugins/search-backend-module-elasticsearch/CHANGELOG.md
@@ -1,5 +1,68 @@
 # @backstage/plugin-search-backend-module-elasticsearch
 
+## 1.3.6-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config@1.1.0-next.1
+  - @backstage/backend-common@0.19.5-next.2
+  - @backstage/integration-aws-node@0.1.6-next.1
+  - @backstage/backend-plugin-api@0.6.3-next.2
+  - @backstage/plugin-search-backend-node@1.2.7-next.2
+  - @backstage/plugin-search-common@1.2.6-next.1
+
+## 1.3.6-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config@1.1.0-next.0
+  - @backstage/backend-common@0.19.5-next.1
+  - @backstage/backend-plugin-api@0.6.3-next.1
+  - @backstage/integration-aws-node@0.1.6-next.0
+  - @backstage/plugin-search-backend-node@1.2.7-next.1
+  - @backstage/plugin-search-common@1.2.6-next.0
+
+## 1.3.5-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.19.4-next.0
+  - @backstage/backend-plugin-api@0.6.2-next.0
+  - @backstage/config@1.0.8
+  - @backstage/integration-aws-node@0.1.5
+  - @backstage/plugin-search-backend-node@1.2.6-next.0
+  - @backstage/plugin-search-common@1.2.5
+
+## 1.3.3
+
+### Patch Changes
+
+- 629cbd194a87: Use `coreServices.rootConfig` instead of `coreService.config`
+- 12a8c94eda8d: Add package repository and homepage metadata
+- 631eb3816b48: Index templates can now be configured through configuration under the `search.elasticsearch.indexTemplates`. In addition, the `ElasticSearchSearchEngine.fromConfig` now also accepts a `LoggerService` as the `logger` option as well as a new `translator` option.
+
+  The alpha `searchModuleElasticsearchEngine` export no longer accepts options and a new alpha `elasticsearchTranslatorExtensionPoint` export has been added which lets you customize the query translator.
+
+- Updated dependencies
+  - @backstage/backend-common@0.19.2
+  - @backstage/backend-plugin-api@0.6.0
+  - @backstage/plugin-search-backend-node@1.2.4
+  - @backstage/integration-aws-node@0.1.5
+  - @backstage/config@1.0.8
+  - @backstage/plugin-search-common@1.2.5
+
+## 1.3.3-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@0.6.0-next.2
+  - @backstage/backend-common@0.19.2-next.2
+  - @backstage/plugin-search-backend-node@1.2.4-next.2
+
 ## 1.3.3-next.1
 
 ### Patch Changes
diff --git a/plugins/search-backend-module-elasticsearch/alpha-api-report.md b/plugins/search-backend-module-elasticsearch/alpha-api-report.md
index 91007c20de..c0c30f7f2b 100644
--- a/plugins/search-backend-module-elasticsearch/alpha-api-report.md
+++ b/plugins/search-backend-module-elasticsearch/alpha-api-report.md
@@ -4,19 +4,21 @@
 
 ```ts
 import { BackendFeature } from '@backstage/backend-plugin-api';
-import { ElasticSearchCustomIndexTemplate } from '@backstage/plugin-search-backend-module-elasticsearch';
 import { ElasticSearchQueryTranslator } from '@backstage/plugin-search-backend-module-elasticsearch';
+import { ExtensionPoint } from '@backstage/backend-plugin-api';
 
 // @alpha
-export const searchModuleElasticsearchEngine: (
-  options?: SearchModuleElasticsearchEngineOptions | undefined,
-) => BackendFeature;
+const _default: () => BackendFeature;
+export default _default;
+
+// @alpha (undocumented)
+export interface ElasticSearchQueryTranslatorExtensionPoint {
+  // (undocumented)
+  setTranslator(translator: ElasticSearchQueryTranslator): void;
+}
 
 // @alpha
-export type SearchModuleElasticsearchEngineOptions = {
-  translator?: ElasticSearchQueryTranslator;
-  indexTemplate?: ElasticSearchCustomIndexTemplate;
-};
+export const elasticsearchTranslatorExtensionPoint: ExtensionPoint<ElasticSearchQueryTranslatorExtensionPoint>;
 
 // (No @packageDocumentation comment for this package)
 ```
diff --git a/plugins/search-backend-module-elasticsearch/api-report.md b/plugins/search-backend-module-elasticsearch/api-report.md
index b567414b22..408ec288d0 100644
--- a/plugins/search-backend-module-elasticsearch/api-report.md
+++ b/plugins/search-backend-module-elasticsearch/api-report.md
@@ -15,6 +15,7 @@ import type { ConnectionOptions } from 'tls';
 import { IndexableDocument } from '@backstage/plugin-search-common';
 import { IndexableResultSet } from '@backstage/plugin-search-common';
 import { Logger } from 'winston';
+import { LoggerService } from '@backstage/backend-plugin-api';
 import { Readable } from 'stream';
 import { SearchEngine } from '@backstage/plugin-search-common';
 import { SearchQuery } from '@backstage/plugin-search-common';
@@ -299,10 +300,11 @@ export interface ElasticSearchNodeOptions {
 
 // @public
 export type ElasticSearchOptions = {
-  logger: Logger;
+  logger: Logger | LoggerService;
   config: Config;
   aliasPostfix?: string;
   indexPrefix?: string;
+  translator?: ElasticSearchQueryTranslator;
 };
 
 // @public
@@ -322,7 +324,7 @@ export class ElasticSearchSearchEngine implements SearchEngine {
     elasticSearchClientOptions: ElasticSearchClientOptions,
     aliasPostfix: string,
     indexPrefix: string,
-    logger: Logger,
+    logger: Logger | LoggerService,
     batchSize: number,
     highlightOptions?: ElasticSearchHighlightOptions,
   );
@@ -365,7 +367,7 @@ export type ElasticSearchSearchEngineIndexerOptions = {
   indexPrefix: string;
   indexSeparator: string;
   alias: string;
-  logger: Logger;
+  logger: Logger | LoggerService;
   elasticSearchClientWrapper: ElasticSearchClientWrapper;
   batchSize: number;
 };
diff --git a/plugins/search-backend-module-elasticsearch/catalog-info.yaml b/plugins/search-backend-module-elasticsearch/catalog-info.yaml
new file mode 100644
index 0000000000..300d1034c9
--- /dev/null
+++ b/plugins/search-backend-module-elasticsearch/catalog-info.yaml
@@ -0,0 +1,10 @@
+apiVersion: backstage.io/v1alpha1
+kind: Component
+metadata:
+  name: backstage-plugin-search-backend-module-elasticsearch
+  title: '@backstage/plugin-search-backend-module-elasticsearch'
+  description: A module for the search backend that implements search using ElasticSearch
+spec:
+  lifecycle: production
+  type: backstage-backend-plugin-module
+  owner: discoverability-maintainers
diff --git a/plugins/search-backend-module-elasticsearch/config.d.ts b/plugins/search-backend-module-elasticsearch/config.d.ts
index 16190e7ed0..d7fdd0cd1b 100644
--- a/plugins/search-backend-module-elasticsearch/config.d.ts
+++ b/plugins/search-backend-module-elasticsearch/config.d.ts
@@ -43,6 +43,33 @@ export interface Config {
          */
         fragmentDelimiter?: string;
       };
+
+      /** Elasticsearch specific index template bodies */
+      indexTemplates?: Array<{
+        name: string;
+        body: {
+          /**
+           * Array of wildcard (*) expressions used to match the names of data streams and indices during creation.
+           */
+          index_patterns: string[];
+
+          /**
+           * An ordered list of component template names.
+           * Component templates are merged in the order specified,
+           * meaning that the last component template specified has the highest precedence.
+           */
+          composed_of?: string[];
+
+          /**
+           * See available properties of template
+           * https://www.elastic.co/guide/en/elasticsearch/reference/7.15/indices-put-template.html#put-index-template-api-request-body
+           */
+          template?: {
+            [key: string]: unknown;
+          };
+        };
+      }>;
+
       /** Miscellaneous options for the client */
       clientOptions?: {
         ssl?: {
@@ -128,7 +155,7 @@ export interface Config {
                 };
             /* TODO(kuangp): unsupported until @elastic/elasticsearch@7.14 is released
     | {
- 
+
       /**
        * Bearer authentication token to connect to the cluster.
        * See: https://www.elastic.co/guide/en/elasticsearch/reference/current/security-api-create-service-token.html
diff --git a/plugins/search-backend-module-elasticsearch/package.json b/plugins/search-backend-module-elasticsearch/package.json
index f119b1b28a..6b8bb114b2 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.3.3-next.1",
+  "version": "1.3.6-next.2",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
diff --git a/plugins/search-backend-module-elasticsearch/src/alpha.ts b/plugins/search-backend-module-elasticsearch/src/alpha.ts
index 7e1b95279a..f289847865 100644
--- a/plugins/search-backend-module-elasticsearch/src/alpha.ts
+++ b/plugins/search-backend-module-elasticsearch/src/alpha.ts
@@ -16,59 +16,66 @@
 import {
   coreServices,
   createBackendModule,
+  createExtensionPoint,
 } from '@backstage/backend-plugin-api';
-import { loggerToWinstonLogger } from '@backstage/backend-common';
 import { searchEngineRegistryExtensionPoint } from '@backstage/plugin-search-backend-node/alpha';
-
 import {
-  ElasticSearchCustomIndexTemplate,
   ElasticSearchQueryTranslator,
   ElasticSearchSearchEngine,
 } from '@backstage/plugin-search-backend-module-elasticsearch';
 
-/**
- * @alpha
- * Options for {@link searchModuleElasticsearchEngine}.
- */
-export type SearchModuleElasticsearchEngineOptions = {
-  translator?: ElasticSearchQueryTranslator;
-  indexTemplate?: ElasticSearchCustomIndexTemplate;
-};
+/** @alpha */
+export interface ElasticSearchQueryTranslatorExtensionPoint {
+  setTranslator(translator: ElasticSearchQueryTranslator): void;
+}
 
 /**
+ * Extension point used to customize the ElasticSearch query translator.
+ *
  * @alpha
+ */
+export const elasticsearchTranslatorExtensionPoint =
+  createExtensionPoint<ElasticSearchQueryTranslatorExtensionPoint>({
+    id: 'search.elasticsearchEngine.translator',
+  });
+
+/**
  * Search backend module for the Elasticsearch engine.
+ *
+ * @alpha
  */
-export const searchModuleElasticsearchEngine = createBackendModule(
-  (options?: SearchModuleElasticsearchEngineOptions) => ({
-    moduleId: 'elasticsearchEngine',
-    pluginId: 'search',
-    register(env) {
-      env.registerInit({
-        deps: {
-          searchEngineRegistry: searchEngineRegistryExtensionPoint,
-          logger: coreServices.logger,
-          config: coreServices.rootConfig,
-        },
-        async init({ searchEngineRegistry, logger, config }) {
-          const searchEngine = await ElasticSearchSearchEngine.fromConfig({
-            logger: loggerToWinstonLogger(logger),
-            config: config,
-          });
+export default createBackendModule({
+  moduleId: 'elasticsearchEngine',
+  pluginId: 'search',
+  register(env) {
+    let translator: ElasticSearchQueryTranslator | undefined;
 
-          // set custom translator if available
-          if (options?.translator) {
-            searchEngine.setTranslator(options.translator);
-          }
+    env.registerExtensionPoint(elasticsearchTranslatorExtensionPoint, {
+      setTranslator(newTranslator) {
+        if (translator) {
+          throw new Error(
+            'ElasticSearch query translator may only be set once',
+          );
+        }
+        translator = newTranslator;
+      },
+    });
 
-          // set custom index template if available
-          if (options?.indexTemplate) {
-            searchEngine.setIndexTemplate(options.indexTemplate);
-          }
-
-          searchEngineRegistry.setSearchEngine(searchEngine);
-        },
-      });
-    },
-  }),
-);
+    env.registerInit({
+      deps: {
+        searchEngineRegistry: searchEngineRegistryExtensionPoint,
+        logger: coreServices.logger,
+        config: coreServices.rootConfig,
+      },
+      async init({ searchEngineRegistry, logger, config }) {
+        searchEngineRegistry.setSearchEngine(
+          await ElasticSearchSearchEngine.fromConfig({
+            logger,
+            config,
+            translator,
+          }),
+        );
+      },
+    });
+  },
+});
diff --git a/plugins/search-backend-module-elasticsearch/src/engines/ElasticSearchSearchEngine.ts b/plugins/search-backend-module-elasticsearch/src/engines/ElasticSearchSearchEngine.ts
index 90f6f407d9..9b085b52b0 100644
--- a/plugins/search-backend-module-elasticsearch/src/engines/ElasticSearchSearchEngine.ts
+++ b/plugins/search-backend-module-elasticsearch/src/engines/ElasticSearchSearchEngine.ts
@@ -38,6 +38,7 @@ import {
   AwsCredentialProvider,
   DefaultAwsCredentialsManager,
 } from '@backstage/integration-aws-node';
+import { LoggerService } from '@backstage/backend-plugin-api';
 
 export type { ElasticSearchClientOptions };
 
@@ -73,10 +74,11 @@ export type ElasticSearchQueryTranslator = (
  * @public
  */
 export type ElasticSearchOptions = {
-  logger: Logger;
+  logger: Logger | LoggerService;
   config: Config;
   aliasPostfix?: string;
   indexPrefix?: string;
+  translator?: ElasticSearchQueryTranslator;
 };
 
 /**
@@ -126,7 +128,7 @@ export class ElasticSearchSearchEngine implements SearchEngine {
     private readonly elasticSearchClientOptions: ElasticSearchClientOptions,
     private readonly aliasPostfix: string,
     private readonly indexPrefix: string,
-    private readonly logger: Logger,
+    private readonly logger: Logger | LoggerService,
     private readonly batchSize: number,
     highlightOptions?: ElasticSearchHighlightOptions,
   ) {
@@ -149,6 +151,7 @@ export class ElasticSearchSearchEngine implements SearchEngine {
       config,
       aliasPostfix = `search`,
       indexPrefix = ``,
+      translator,
     } = options;
     const credentialProvider = DefaultAwsCredentialsManager.fromConfig(config);
     const clientOptions = await this.createElasticSearchClientOptions(
@@ -165,7 +168,7 @@ export class ElasticSearchSearchEngine implements SearchEngine {
       logger.info('Initializing ElasticSearch search engine.');
     }
 
-    return new ElasticSearchSearchEngine(
+    const engine = new ElasticSearchSearchEngine(
       clientOptions,
       aliasPostfix,
       indexPrefix,
@@ -176,6 +179,18 @@ export class ElasticSearchSearchEngine implements SearchEngine {
         'search.elasticsearch.highlightOptions',
       ),
     );
+
+    for (const indexTemplate of this.readIndexTemplateConfig(
+      config.getConfig('search.elasticsearch'),
+    )) {
+      await engine.setIndexTemplate(indexTemplate);
+    }
+
+    if (translator) {
+      await engine.setTranslator(translator);
+    }
+
+    return engine;
   }
 
   /**
@@ -221,11 +236,10 @@ export class ElasticSearchSearchEngine implements SearchEngine {
             .boolQuery()
             .should(value.map(it => esb.matchQuery(key, it.toString())));
         }
-        this.logger.error(
-          'Failed to query, unrecognized filter type',
+        this.logger.error('Failed to query, unrecognized filter type', {
           key,
           value,
-        );
+        });
         throw new Error(
           'Failed to add filters to query. Unrecognized filter type',
         );
@@ -518,6 +532,24 @@ export class ElasticSearchSearchEngine implements SearchEngine {
         : {}),
     };
   }
+
+  private static readIndexTemplateConfig(
+    config: Config,
+  ): ElasticSearchCustomIndexTemplate[] {
+    return (
+      config.getOptionalConfigArray('indexTemplates')?.map(templateConfig => {
+        const bodyConfig = templateConfig.getConfig('body');
+        return {
+          name: templateConfig.getString('name'),
+          body: {
+            index_patterns: bodyConfig.getStringArray('index_patterns'),
+            composed_of: bodyConfig.getOptionalStringArray('composed_of'),
+            template: bodyConfig.getOptionalConfig('template')?.get(),
+          },
+        };
+      }) ?? []
+    );
+  }
 }
 
 /**
diff --git a/plugins/search-backend-module-elasticsearch/src/engines/ElasticSearchSearchEngineIndexer.ts b/plugins/search-backend-module-elasticsearch/src/engines/ElasticSearchSearchEngineIndexer.ts
index a9d15c421e..b742216d52 100644
--- a/plugins/search-backend-module-elasticsearch/src/engines/ElasticSearchSearchEngineIndexer.ts
+++ b/plugins/search-backend-module-elasticsearch/src/engines/ElasticSearchSearchEngineIndexer.ts
@@ -19,6 +19,7 @@ import { ElasticSearchClientWrapper } from './ElasticSearchClientWrapper';
 import { IndexableDocument } from '@backstage/plugin-search-common';
 import { Logger } from 'winston';
 import { Readable } from 'stream';
+import { LoggerService } from '@backstage/backend-plugin-api';
 
 /**
  * Options for instantiate ElasticSearchSearchEngineIndexer
@@ -29,7 +30,7 @@ export type ElasticSearchSearchEngineIndexerOptions = {
   indexPrefix: string;
   indexSeparator: string;
   alias: string;
-  logger: Logger;
+  logger: Logger | LoggerService;
   elasticSearchClientWrapper: ElasticSearchClientWrapper;
   batchSize: number;
 };
@@ -55,7 +56,7 @@ export class ElasticSearchSearchEngineIndexer extends BatchSearchEngineIndexer {
   private readonly indexSeparator: string;
   private readonly alias: string;
   private readonly removableAlias: string;
-  private readonly logger: Logger;
+  private readonly logger: Logger | LoggerService;
   private readonly sourceStream: Readable;
   private readonly elasticSearchClientWrapper: ElasticSearchClientWrapper;
   private configuredBatchSize: number;
@@ -186,7 +187,9 @@ export class ElasticSearchSearchEngineIndexer extends BatchSearchEngineIndexer {
     // If any indices are removable, remove them. Do not bubble up this error,
     // as doing so would delete the now aliased index. Log instead.
     if (this.removableIndices.length) {
-      this.logger.info('Removing stale search indices', this.removableIndices);
+      this.logger.info('Removing stale search indices', {
+        removableIndices: this.removableIndices,
+      });
       try {
         await this.elasticSearchClientWrapper.deleteIndex({
           index: this.removableIndices,
diff --git a/plugins/search-backend-module-explore/CHANGELOG.md b/plugins/search-backend-module-explore/CHANGELOG.md
index fc9fedf290..c1de962a4e 100644
--- a/plugins/search-backend-module-explore/CHANGELOG.md
+++ b/plugins/search-backend-module-explore/CHANGELOG.md
@@ -1,5 +1,72 @@
 # @backstage/plugin-search-backend-module-explore
 
+## 0.1.7-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config@1.1.0-next.1
+  - @backstage/backend-tasks@0.5.8-next.2
+  - @backstage/backend-common@0.19.5-next.2
+  - @backstage/backend-plugin-api@0.6.3-next.2
+  - @backstage/plugin-search-backend-node@1.2.7-next.2
+  - @backstage/plugin-explore-common@0.0.1
+  - @backstage/plugin-search-common@1.2.6-next.1
+
+## 0.1.7-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config@1.1.0-next.0
+  - @backstage/backend-tasks@0.5.8-next.1
+  - @backstage/backend-common@0.19.5-next.1
+  - @backstage/backend-plugin-api@0.6.3-next.1
+  - @backstage/plugin-search-backend-node@1.2.7-next.1
+  - @backstage/plugin-explore-common@0.0.1
+  - @backstage/plugin-search-common@1.2.6-next.0
+
+## 0.1.6-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.19.4-next.0
+  - @backstage/backend-tasks@0.5.7-next.0
+  - @backstage/backend-plugin-api@0.6.2-next.0
+  - @backstage/config@1.0.8
+  - @backstage/plugin-explore-common@0.0.1
+  - @backstage/plugin-search-backend-node@1.2.6-next.0
+  - @backstage/plugin-search-common@1.2.5
+
+## 0.1.4
+
+### Patch Changes
+
+- 629cbd194a87: Use `coreServices.rootConfig` instead of `coreService.config`
+- 29f77f923c71: Ensure that all services are dependency injected into the module instead of taken from options
+- 12a8c94eda8d: Add package repository and homepage metadata
+- 6694e79ab396: Breaking change for the alpha export moved `schedule` from module options into app-config for the new backend system. You can now pass in a `TaskScheduleDefinitionConfig` through the `search.collators.explore.schedule` configuration key.
+- Updated dependencies
+  - @backstage/backend-common@0.19.2
+  - @backstage/backend-plugin-api@0.6.0
+  - @backstage/plugin-search-backend-node@1.2.4
+  - @backstage/backend-tasks@0.5.5
+  - @backstage/config@1.0.8
+  - @backstage/plugin-explore-common@0.0.1
+  - @backstage/plugin-search-common@1.2.5
+
+## 0.1.4-next.2
+
+### Patch Changes
+
+- 29f77f923c71: Ensure that all services are dependency injected into the module instead of taken from options
+- Updated dependencies
+  - @backstage/backend-plugin-api@0.6.0-next.2
+  - @backstage/backend-tasks@0.5.5-next.2
+  - @backstage/backend-common@0.19.2-next.2
+  - @backstage/plugin-search-backend-node@1.2.4-next.2
+
 ## 0.1.4-next.1
 
 ### Patch Changes
diff --git a/plugins/search-backend-module-explore/README.md b/plugins/search-backend-module-explore/README.md
index e775cf42b6..cf2a01b9f0 100644
--- a/plugins/search-backend-module-explore/README.md
+++ b/plugins/search-backend-module-explore/README.md
@@ -2,14 +2,21 @@
 
 > DISCLAIMER: The new backend system is in alpha, and so are the search backend module support for the new backend system. We don't recommend you to migrate your backend installations to the new system yet. But if you want to experiment, you can find getting started guides below.
 
-This package exports explore backend modules responsible for extending search.
+This package exports a module that extends the search backend to also indexing the tools exposed by the [`explore` service](https://github.com/backstage/backstage/tree/master/plugins/explore-backend).
 
-## Example
+## Installation
 
-### Use default schedule
+Add the module package as a dependency:
+
+```bash
+# From your Backstage root directory
+yarn add --cwd packages/backend @backstage/plugin-search-backend-module-explore
+```
+
+Add the collator to your backend instance, along with the search plugin itself:
 
 ```tsx
-// packages/backend-next/src/index.ts
+// packages/backend/src/index.ts
 import { createBackend } from '@backstage/backend-defaults';
 import { searchPlugin } from '@backstage/plugin-search-backend/alpha';
 import { searchModuleExploreCollator } from '@backstage/plugin-search-backend-module-explore/alpha';
@@ -20,29 +27,11 @@ backend.add(searchModuleExploreCollator());
 backend.start();
 ```
 
-### Use custom schedule
+You may also want to add configuration parameters to your app-config, for example for controlling the scheduled indexing interval. These parameters should be placed under the `search.collators.explore` key. See [the config definition file](https://github.com/backstage/backstage/blob/master/plugins/search-backend-module-explore/config.d.ts) for more details.
 
-```tsx
-// packages/backend-next/src/index.ts
-import { createBackend } from '@backstage/backend-defaults';
-import { searchPlugin } from '@backstage/plugin-search-backend/alpha';
-import { searchModuleExploreCollator } from '@backstage/plugin-search-backend-module-explore/alpha';
+## Using Auth Middleware
 
-const schedule = {
-  frequency: { minutes: 10 },
-  timeout: { minutes: 15 },
-  initialDelay: { seconds: 3 },
-};
-
-const backend = createBackend();
-backend.add(searchPlugin());
-backend.add(searchModuleExploreCollator({ schedule }));
-backend.start();
-```
-
-### Using Auth Middleware
-
-If your Backstage instance uses service-to-service authentication you can pass an optional `tokenManager` to the collator factory. This will ensure that the collator makes authenticated requests to the explore backend.
+If your Backstage instance uses service-to-service authentication, the collator will need to have access to a `tokenManager`. This is automatically injected by the collator module when using the new backend system. But if you are using the old backend system, you will want to add it manually to ensure that the collator makes authenticated requests to the explore backend.
 
 ```tsx
 indexBuilder.addCollator({
diff --git a/plugins/search-backend-module-explore/alpha-api-report.md b/plugins/search-backend-module-explore/alpha-api-report.md
index 7b0f2658d6..e1ecb85886 100644
--- a/plugins/search-backend-module-explore/alpha-api-report.md
+++ b/plugins/search-backend-module-explore/alpha-api-report.md
@@ -4,17 +4,10 @@
 
 ```ts
 import { BackendFeature } from '@backstage/backend-plugin-api';
-import { TaskScheduleDefinition } from '@backstage/backend-tasks';
 
 // @alpha
-export const searchModuleExploreCollator: (
-  options?: SearchModuleExploreCollatorOptions | undefined,
-) => BackendFeature;
-
-// @alpha
-export type SearchModuleExploreCollatorOptions = {
-  schedule?: TaskScheduleDefinition;
-};
+const _default: () => BackendFeature;
+export default _default;
 
 // (No @packageDocumentation comment for this package)
 ```
diff --git a/plugins/search-backend-module-explore/catalog-info.yaml b/plugins/search-backend-module-explore/catalog-info.yaml
new file mode 100644
index 0000000000..237e7a0f98
--- /dev/null
+++ b/plugins/search-backend-module-explore/catalog-info.yaml
@@ -0,0 +1,10 @@
+apiVersion: backstage.io/v1alpha1
+kind: Component
+metadata:
+  name: backstage-plugin-search-backend-module-explore
+  title: '@backstage/plugin-search-backend-module-explore'
+  description: A module for the search backend that exports explore modules
+spec:
+  lifecycle: experimental
+  type: backstage-backend-plugin-module
+  owner: discoverability-maintainers
diff --git a/plugins/search-backend-module-explore/config.d.ts b/plugins/search-backend-module-explore/config.d.ts
new file mode 100644
index 0000000000..73ff015f20
--- /dev/null
+++ b/plugins/search-backend-module-explore/config.d.ts
@@ -0,0 +1,33 @@
+/*
+ * 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 { TaskScheduleDefinitionConfig } from '@backstage/backend-tasks';
+
+export interface Config {
+  search?: {
+    collators?: {
+      /**
+       * Configuration options for `@backstage/plugin-search-backend-module-explore`
+       */
+      explore?: {
+        /**
+         * The schedule for how often to run the collation job.
+         */
+        schedule?: TaskScheduleDefinitionConfig;
+      };
+    };
+  };
+}
diff --git a/plugins/search-backend-module-explore/package.json b/plugins/search-backend-module-explore/package.json
index 13c6ce474c..ec11f60795 100644
--- a/plugins/search-backend-module-explore/package.json
+++ b/plugins/search-backend-module-explore/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@backstage/plugin-search-backend-module-explore",
   "description": "A module for the search backend that exports explore modules",
-  "version": "0.1.4-next.1",
+  "version": "0.1.7-next.2",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
@@ -58,6 +58,8 @@
     "msw": "^1.2.1"
   },
   "files": [
-    "dist"
-  ]
+    "dist",
+    "config.d.ts"
+  ],
+  "configSchema": "config.d.ts"
 }
diff --git a/plugins/search-backend-module-explore/src/alpha.test.ts b/plugins/search-backend-module-explore/src/alpha.test.ts
index 9b133f0fd5..fa6ab8a909 100644
--- a/plugins/search-backend-module-explore/src/alpha.test.ts
+++ b/plugins/search-backend-module-explore/src/alpha.test.ts
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-import { startTestBackend } from '@backstage/backend-test-utils';
+import { mockServices, startTestBackend } from '@backstage/backend-test-utils';
 import { searchIndexRegistryExtensionPoint } from '@backstage/plugin-search-backend-node/alpha';
-import { searchModuleExploreCollator } from './alpha';
+import searchModuleExploreCollator from './alpha';
 
 describe('searchModuleExploreCollator', () => {
   const schedule = {
@@ -34,7 +34,18 @@ describe('searchModuleExploreCollator', () => {
       extensionPoints: [
         [searchIndexRegistryExtensionPoint, extensionPointMock],
       ],
-      features: [searchModuleExploreCollator({ schedule })],
+      features: [
+        searchModuleExploreCollator(),
+        mockServices.rootConfig.factory({
+          data: {
+            search: {
+              explore: {
+                schedule,
+              },
+            },
+          },
+        }),
+      ],
     });
 
     expect(extensionPointMock.addCollator).toHaveBeenCalledTimes(1);
diff --git a/plugins/search-backend-module-explore/src/alpha.ts b/plugins/search-backend-module-explore/src/alpha.ts
index fadbcda3a5..e8e3361e1b 100644
--- a/plugins/search-backend-module-explore/src/alpha.ts
+++ b/plugins/search-backend-module-explore/src/alpha.ts
@@ -23,66 +23,59 @@ import {
   coreServices,
   createBackendModule,
 } from '@backstage/backend-plugin-api';
-import { TaskScheduleDefinition } from '@backstage/backend-tasks';
 import { loggerToWinstonLogger } from '@backstage/backend-common';
 import { searchIndexRegistryExtensionPoint } from '@backstage/plugin-search-backend-node/alpha';
 
 import { ToolDocumentCollatorFactory } from '@backstage/plugin-search-backend-module-explore';
-
-/**
- * Options for {@link searchModuleExploreCollator}.
- *
- * @alpha
- */
-export type SearchModuleExploreCollatorOptions = {
-  schedule?: TaskScheduleDefinition;
-};
+import { readTaskScheduleDefinitionFromConfig } from '@backstage/backend-tasks';
 
 /**
  * Search backend module for the Explore index.
  *
  * @alpha
  */
-export const searchModuleExploreCollator = createBackendModule(
-  (options?: SearchModuleExploreCollatorOptions) => ({
-    moduleId: 'exploreCollator',
-    pluginId: 'search',
-    register(env) {
-      env.registerInit({
-        deps: {
-          config: coreServices.rootConfig,
-          logger: coreServices.logger,
-          discovery: coreServices.discovery,
-          scheduler: coreServices.scheduler,
-          tokenManager: coreServices.tokenManager,
-          indexRegistry: searchIndexRegistryExtensionPoint,
-        },
-        async init({
-          config,
-          logger,
-          discovery,
-          scheduler,
-          indexRegistry,
-          tokenManager,
-        }) {
-          const defaultSchedule = {
-            frequency: { minutes: 10 },
-            timeout: { minutes: 15 },
-            initialDelay: { seconds: 3 },
-          };
+export default createBackendModule({
+  moduleId: 'exploreCollator',
+  pluginId: 'search',
+  register(env) {
+    env.registerInit({
+      deps: {
+        config: coreServices.rootConfig,
+        logger: coreServices.logger,
+        discovery: coreServices.discovery,
+        scheduler: coreServices.scheduler,
+        tokenManager: coreServices.tokenManager,
+        indexRegistry: searchIndexRegistryExtensionPoint,
+      },
+      async init({
+        config,
+        logger,
+        discovery,
+        scheduler,
+        indexRegistry,
+        tokenManager,
+      }) {
+        const defaultSchedule = {
+          frequency: { minutes: 10 },
+          timeout: { minutes: 15 },
+          initialDelay: { seconds: 3 },
+        };
 
-          indexRegistry.addCollator({
-            schedule: scheduler.createScheduledTaskRunner(
-              options?.schedule ?? defaultSchedule,
-            ),
-            factory: ToolDocumentCollatorFactory.fromConfig(config, {
-              discovery,
-              logger: loggerToWinstonLogger(logger),
-              tokenManager,
-            }),
-          });
-        },
-      });
-    },
-  }),
-);
+        const schedule = config.has('search.collators.explore.schedule')
+          ? readTaskScheduleDefinitionFromConfig(
+              config.getConfig('search.collators.explore.schedule'),
+            )
+          : defaultSchedule;
+
+        indexRegistry.addCollator({
+          schedule: scheduler.createScheduledTaskRunner(schedule),
+          factory: ToolDocumentCollatorFactory.fromConfig(config, {
+            discovery,
+            logger: loggerToWinstonLogger(logger),
+            tokenManager,
+          }),
+        });
+      },
+    });
+  },
+});
diff --git a/plugins/search-backend-module-pg/CHANGELOG.md b/plugins/search-backend-module-pg/CHANGELOG.md
index 3bc95aaa2d..ea6c62d47c 100644
--- a/plugins/search-backend-module-pg/CHANGELOG.md
+++ b/plugins/search-backend-module-pg/CHANGELOG.md
@@ -1,5 +1,61 @@
 # @backstage/plugin-search-backend-module-pg
 
+## 0.5.12-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config@1.1.0-next.1
+  - @backstage/backend-common@0.19.5-next.2
+  - @backstage/backend-plugin-api@0.6.3-next.2
+  - @backstage/plugin-search-backend-node@1.2.7-next.2
+  - @backstage/plugin-search-common@1.2.6-next.1
+
+## 0.5.12-next.1
+
+### Patch Changes
+
+- 4ccf9204bc95: Added `indexerBatchSize` option to be able to control the size of the batches being indexed. Also added a debug log entry to list out all the entities in the batch
+- Updated dependencies
+  - @backstage/config@1.1.0-next.0
+  - @backstage/backend-common@0.19.5-next.1
+  - @backstage/backend-plugin-api@0.6.3-next.1
+  - @backstage/plugin-search-backend-node@1.2.7-next.1
+  - @backstage/plugin-search-common@1.2.6-next.0
+
+## 0.5.11-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.19.4-next.0
+  - @backstage/backend-plugin-api@0.6.2-next.0
+  - @backstage/config@1.0.8
+  - @backstage/plugin-search-backend-node@1.2.6-next.0
+  - @backstage/plugin-search-common@1.2.5
+
+## 0.5.9
+
+### Patch Changes
+
+- 629cbd194a87: Use `coreServices.rootConfig` instead of `coreService.config`
+- 12a8c94eda8d: Add package repository and homepage metadata
+- Updated dependencies
+  - @backstage/backend-common@0.19.2
+  - @backstage/backend-plugin-api@0.6.0
+  - @backstage/plugin-search-backend-node@1.2.4
+  - @backstage/config@1.0.8
+  - @backstage/plugin-search-common@1.2.5
+
+## 0.5.9-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@0.6.0-next.2
+  - @backstage/backend-common@0.19.2-next.2
+  - @backstage/plugin-search-backend-node@1.2.4-next.2
+
 ## 0.5.9-next.1
 
 ### Patch Changes
diff --git a/plugins/search-backend-module-pg/alpha-api-report.md b/plugins/search-backend-module-pg/alpha-api-report.md
index eaee78e944..b021f6884f 100644
--- a/plugins/search-backend-module-pg/alpha-api-report.md
+++ b/plugins/search-backend-module-pg/alpha-api-report.md
@@ -6,7 +6,8 @@
 import { BackendFeature } from '@backstage/backend-plugin-api';
 
 // @alpha
-export const searchModulePostgresEngine: () => BackendFeature;
+const _default: () => BackendFeature;
+export default _default;
 
 // (No @packageDocumentation comment for this package)
 ```
diff --git a/plugins/search-backend-module-pg/catalog-info.yaml b/plugins/search-backend-module-pg/catalog-info.yaml
new file mode 100644
index 0000000000..47b9717882
--- /dev/null
+++ b/plugins/search-backend-module-pg/catalog-info.yaml
@@ -0,0 +1,10 @@
+apiVersion: backstage.io/v1alpha1
+kind: Component
+metadata:
+  name: backstage-plugin-search-backend-module-pg
+  title: '@backstage/plugin-search-backend-module-pg'
+  description: A module for the search backend that implements search using PostgreSQL
+spec:
+  lifecycle: experimental
+  type: backstage-backend-plugin-module
+  owner: discoverability-maintainers
diff --git a/plugins/search-backend-module-pg/config.d.ts b/plugins/search-backend-module-pg/config.d.ts
index 7367b770bc..3039cd1d28 100644
--- a/plugins/search-backend-module-pg/config.d.ts
+++ b/plugins/search-backend-module-pg/config.d.ts
@@ -57,6 +57,10 @@ export interface Config {
          */
         fragmentDelimiter?: string;
       };
+      /**
+       * Batch size to use when indexing
+       */
+      indexerBatchSize?: number;
     };
   };
 }
diff --git a/plugins/search-backend-module-pg/package.json b/plugins/search-backend-module-pg/package.json
index 63c8061fea..5d0137a60f 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.9-next.1",
+  "version": "0.5.12-next.2",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
diff --git a/plugins/search-backend-module-pg/src/PgSearchEngine/PgSearchEngine.ts b/plugins/search-backend-module-pg/src/PgSearchEngine/PgSearchEngine.ts
index d2cf80e0ca..1a27b9f981 100644
--- a/plugins/search-backend-module-pg/src/PgSearchEngine/PgSearchEngine.ts
+++ b/plugins/search-backend-module-pg/src/PgSearchEngine/PgSearchEngine.ts
@@ -86,6 +86,7 @@ export type PgSearchHighlightOptions = {
 export class PgSearchEngine implements SearchEngine {
   private readonly logger?: Logger;
   private readonly highlightOptions: PgSearchHighlightOptions;
+  private readonly indexerBatchSize: number;
 
   /**
    * @deprecated This will be marked as private in a future release, please us fromConfig instead
@@ -114,6 +115,8 @@ export class PgSearchEngine implements SearchEngine {
         highlightConfig?.getOptionalString('fragmentDelimiter') ?? ' ... ',
     };
     this.highlightOptions = highlightOptions;
+    this.indexerBatchSize =
+      config.getOptionalNumber('search.pg.indexerBatchSize') ?? 1000;
     this.logger = logger;
   }
 
@@ -178,7 +181,7 @@ export class PgSearchEngine implements SearchEngine {
 
   async getIndexer(type: string) {
     return new PgSearchEngineIndexer({
-      batchSize: 1000,
+      batchSize: this.indexerBatchSize,
       type,
       databaseStore: this.databaseStore,
       logger: this.logger?.child({ documentType: type }),
diff --git a/plugins/search-backend-module-pg/src/PgSearchEngine/PgSearchEngineIndexer.ts b/plugins/search-backend-module-pg/src/PgSearchEngine/PgSearchEngineIndexer.ts
index 47ea812a92..9fe0e7091c 100644
--- a/plugins/search-backend-module-pg/src/PgSearchEngine/PgSearchEngineIndexer.ts
+++ b/plugins/search-backend-module-pg/src/PgSearchEngine/PgSearchEngineIndexer.ts
@@ -59,6 +59,11 @@ export class PgSearchEngineIndexer extends BatchSearchEngineIndexer {
   async index(documents: IndexableDocument[]): Promise<void> {
     this.numRecords += documents.length;
 
+    const refs = [...new Set(documents.map(d => d.authorization?.resourceRef))];
+    this.logger.debug(
+      `Attempting to index the following entities: ${refs.toString()}`,
+    );
+
     try {
       await this.store.insertDocuments(this.tx!, this.type, documents);
     } catch (e) {
diff --git a/plugins/search-backend-module-pg/src/alpha.ts b/plugins/search-backend-module-pg/src/alpha.ts
index 71d62e7927..4052b56cb3 100644
--- a/plugins/search-backend-module-pg/src/alpha.ts
+++ b/plugins/search-backend-module-pg/src/alpha.ts
@@ -24,7 +24,7 @@ import { PgSearchEngine } from './PgSearchEngine';
  * @alpha
  * Search backend module for the Postgres engine.
  */
-export const searchModulePostgresEngine = createBackendModule({
+export default createBackendModule({
   moduleId: 'postgresEngine',
   pluginId: 'search',
   register(env) {
diff --git a/plugins/search-backend-module-techdocs/CHANGELOG.md b/plugins/search-backend-module-techdocs/CHANGELOG.md
index 6fc2307106..8ee45e6bbf 100644
--- a/plugins/search-backend-module-techdocs/CHANGELOG.md
+++ b/plugins/search-backend-module-techdocs/CHANGELOG.md
@@ -1,5 +1,94 @@
 # @backstage/plugin-search-backend-module-techdocs
 
+## 0.1.7-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config@1.1.0-next.1
+  - @backstage/backend-tasks@0.5.8-next.2
+  - @backstage/backend-common@0.19.5-next.2
+  - @backstage/plugin-catalog-node@1.4.4-next.2
+  - @backstage/backend-plugin-api@0.6.3-next.2
+  - @backstage/catalog-model@1.4.2-next.1
+  - @backstage/plugin-permission-common@0.7.8-next.1
+  - @backstage/plugin-search-backend-node@1.2.7-next.2
+  - @backstage/plugin-techdocs-node@1.8.0-next.2
+  - @backstage/catalog-client@1.4.4-next.1
+  - @backstage/plugin-catalog-common@1.0.16-next.1
+  - @backstage/plugin-search-common@1.2.6-next.1
+
+## 0.1.7-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config@1.1.0-next.0
+  - @backstage/backend-tasks@0.5.8-next.1
+  - @backstage/plugin-techdocs-node@1.8.0-next.1
+  - @backstage/backend-common@0.19.5-next.1
+  - @backstage/backend-plugin-api@0.6.3-next.1
+  - @backstage/catalog-model@1.4.2-next.0
+  - @backstage/plugin-permission-common@0.7.8-next.0
+  - @backstage/plugin-search-backend-node@1.2.7-next.1
+  - @backstage/plugin-catalog-node@1.4.4-next.1
+  - @backstage/catalog-client@1.4.4-next.0
+  - @backstage/plugin-catalog-common@1.0.16-next.0
+  - @backstage/plugin-search-common@1.2.6-next.0
+
+## 0.1.6-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.19.4-next.0
+  - @backstage/backend-tasks@0.5.7-next.0
+  - @backstage/backend-plugin-api@0.6.2-next.0
+  - @backstage/catalog-client@1.4.3
+  - @backstage/catalog-model@1.4.1
+  - @backstage/config@1.0.8
+  - @backstage/plugin-catalog-common@1.0.15
+  - @backstage/plugin-catalog-node@1.4.3-next.0
+  - @backstage/plugin-permission-common@0.7.7
+  - @backstage/plugin-search-backend-node@1.2.6-next.0
+  - @backstage/plugin-search-common@1.2.5
+  - @backstage/plugin-techdocs-node@1.7.6-next.0
+
+## 0.1.4
+
+### Patch Changes
+
+- 629cbd194a87: Use `coreServices.rootConfig` instead of `coreService.config`
+- 29f77f923c71: Ensure that all services are dependency injected into the module instead of taken from options
+- 12a8c94eda8d: Add package repository and homepage metadata
+- 6694e79ab396: **BREAKING:** Moved `schedule` & `collators` settings from module options into app-config for the new backend system. You can now pass in a `TaskScheduleDefinitionConfig` through the `search.collators.techdocs.schedule` configuration key & configure the `TechDocsCollatorFactory` with the key `search.collators.techdocs`.
+- Updated dependencies
+  - @backstage/backend-common@0.19.2
+  - @backstage/backend-plugin-api@0.6.0
+  - @backstage/plugin-search-backend-node@1.2.4
+  - @backstage/plugin-catalog-node@1.4.1
+  - @backstage/backend-tasks@0.5.5
+  - @backstage/plugin-techdocs-node@1.7.4
+  - @backstage/catalog-client@1.4.3
+  - @backstage/catalog-model@1.4.1
+  - @backstage/config@1.0.8
+  - @backstage/plugin-catalog-common@1.0.15
+  - @backstage/plugin-permission-common@0.7.7
+  - @backstage/plugin-search-common@1.2.5
+
+## 0.1.4-next.2
+
+### Patch Changes
+
+- 29f77f923c71: Ensure that all services are dependency injected into the module instead of taken from options
+- Updated dependencies
+  - @backstage/backend-plugin-api@0.6.0-next.2
+  - @backstage/backend-tasks@0.5.5-next.2
+  - @backstage/backend-common@0.19.2-next.2
+  - @backstage/plugin-catalog-node@1.4.1-next.2
+  - @backstage/plugin-search-backend-node@1.2.4-next.2
+  - @backstage/plugin-techdocs-node@1.7.4-next.2
+
 ## 0.1.4-next.1
 
 ### Patch Changes
diff --git a/plugins/search-backend-module-techdocs/README.md b/plugins/search-backend-module-techdocs/README.md
index 5de310466b..9ffdcb7f55 100644
--- a/plugins/search-backend-module-techdocs/README.md
+++ b/plugins/search-backend-module-techdocs/README.md
@@ -2,14 +2,21 @@
 
 > DISCLAIMER: The new backend system is in alpha, and so are the search backend module support for the new backend system. We don't recommend you to migrate your backend installations to the new system yet. But if you want to experiment, you can find getting started guides below.
 
-This package exports techdocs backend modules responsible for extending search.
+This package exports a module that extends the search backend to also index techdocs.
 
-## Example
+## Installation
 
-### Use default schedule
+Add the module package as a dependency:
+
+```bash
+# From your Backstage root directory
+yarn add --cwd packages/backend @backstage/plugin-search-backend-module-techdocs
+```
+
+Add the collator to your backend instance, along with the search plugin itself:
 
 ```tsx
-// packages/backend-next/src/index.ts
+// packages/backend/src/index.ts
 import { createBackend } from '@backstage/backend-defaults';
 import { searchPlugin } from '@backstage/plugin-search-backend/alpha';
 import { searchModuleTechDocsCollator } from '@backstage/plugin-search-backend-module-techdocs/alpha';
@@ -20,22 +27,4 @@ backend.add(searchModuleTechDocsCollator());
 backend.start();
 ```
 
-### Use custom schedule
-
-```tsx
-// packages/backend-next/src/index.ts
-import { createBackend } from '@backstage/backend-defaults';
-import { searchPlugin } from '@backstage/plugin-search-backend/alpha';
-import { searchModuleTechDocsCollator } from '@backstage/plugin-search-backend-module-techdocs/alpha';
-
-const schedule = {
-  frequency: { minutes: 10 },
-  timeout: { minutes: 15 },
-  initialDelay: { seconds: 3 },
-};
-
-const backend = createBackend();
-backend.add(searchPlugin());
-backend.add(searchModuleTechDocsCollator({ schedule }));
-backend.start();
-```
+You may also want to add configuration parameters to your app-config, for example for controlling the scheduled indexing interval. These parameters should be placed under the `search.collators.techdocs` key. See [the config definition file](https://github.com/backstage/backstage/blob/master/plugins/search-backend-module-techdocs/config.d.ts) for more details.
diff --git a/plugins/search-backend-module-techdocs/alpha-api-report.md b/plugins/search-backend-module-techdocs/alpha-api-report.md
index 0eac010b4c..997d4a68db 100644
--- a/plugins/search-backend-module-techdocs/alpha-api-report.md
+++ b/plugins/search-backend-module-techdocs/alpha-api-report.md
@@ -4,21 +4,10 @@
 
 ```ts
 import { BackendFeature } from '@backstage/backend-plugin-api';
-import { TaskScheduleDefinition } from '@backstage/backend-tasks';
-import { TechDocsCollatorFactoryOptions } from '@backstage/plugin-search-backend-module-techdocs';
 
 // @alpha
-export const searchModuleTechDocsCollator: (
-  options?: SearchModuleTechDocsCollatorOptions | undefined,
-) => BackendFeature;
-
-// @alpha
-export type SearchModuleTechDocsCollatorOptions = Omit<
-  TechDocsCollatorFactoryOptions,
-  'logger' | 'discovery' | 'tokenManager' | 'catalogClient'
-> & {
-  schedule?: TaskScheduleDefinition;
-};
+const _default: () => BackendFeature;
+export default _default;
 
 // (No @packageDocumentation comment for this package)
 ```
diff --git a/plugins/search-backend-module-techdocs/catalog-info.yaml b/plugins/search-backend-module-techdocs/catalog-info.yaml
new file mode 100644
index 0000000000..a0bbfc5bb7
--- /dev/null
+++ b/plugins/search-backend-module-techdocs/catalog-info.yaml
@@ -0,0 +1,10 @@
+apiVersion: backstage.io/v1alpha1
+kind: Component
+metadata:
+  name: backstage-plugin-search-backend-module-techdocs
+  title: '@backstage/plugin-search-backend-module-techdocs'
+  description: A module for the search backend that exports techdocs modules
+spec:
+  lifecycle: experimental
+  type: backstage-backend-plugin-module
+  owner: discoverability-maintainers
diff --git a/plugins/search-backend-module-techdocs/config.d.ts b/plugins/search-backend-module-techdocs/config.d.ts
new file mode 100644
index 0000000000..630bfc3692
--- /dev/null
+++ b/plugins/search-backend-module-techdocs/config.d.ts
@@ -0,0 +1,53 @@
+/*
+ * 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 { TaskScheduleDefinitionConfig } from '@backstage/backend-tasks';
+
+export interface Config {
+  search?: {
+    collators?: {
+      /**
+       * Configuration options for `@backstage/plugin-search-backend-module-techdocs`
+       */
+      techdocs?: {
+        /**
+         * The schedule for how often to run the collation job.
+         */
+        schedule?: TaskScheduleDefinitionConfig;
+        /**
+         * A templating string with placeholders, to form the final location of
+         * the entity.
+         *
+         * Defaults to `'/docs/:namespace/:kind/:name/:path'`.
+         */
+        locationTemplate?: string;
+        /**
+         * An abstract value that controls the concurrency level of the
+         * collation process. Increasing this value will both increase the
+         * number of entities fetched at a time from the catalog, as well as how
+         * many things are being processed concurrently.
+         *
+         * Defaults to `10`.
+         */
+        parallelismLimit?: number;
+        /**
+         * Defaults to `false`.
+         */
+        legacyPathCasing?: boolean;
+      };
+    };
+  };
+}
diff --git a/plugins/search-backend-module-techdocs/package.json b/plugins/search-backend-module-techdocs/package.json
index ffc9d0ff4f..3af9ae2f70 100644
--- a/plugins/search-backend-module-techdocs/package.json
+++ b/plugins/search-backend-module-techdocs/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@backstage/plugin-search-backend-module-techdocs",
   "description": "A module for the search backend that exports techdocs modules",
-  "version": "0.1.4-next.1",
+  "version": "0.1.7-next.2",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
@@ -65,6 +65,8 @@
     "msw": "^1.0.0"
   },
   "files": [
-    "dist"
-  ]
+    "dist",
+    "config.d.ts"
+  ],
+  "configSchema": "config.d.ts"
 }
diff --git a/plugins/search-backend-module-techdocs/src/alpha.test.ts b/plugins/search-backend-module-techdocs/src/alpha.test.ts
index 011b00b12c..a278614b75 100644
--- a/plugins/search-backend-module-techdocs/src/alpha.test.ts
+++ b/plugins/search-backend-module-techdocs/src/alpha.test.ts
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-import { startTestBackend } from '@backstage/backend-test-utils';
+import { mockServices, startTestBackend } from '@backstage/backend-test-utils';
 import { searchIndexRegistryExtensionPoint } from '@backstage/plugin-search-backend-node/alpha';
-import { searchModuleTechDocsCollator } from './alpha';
+import searchModuleTechDocsCollator from './alpha';
 
 describe('searchModuleTechDocsCollator', () => {
   const schedule = {
@@ -34,7 +34,18 @@ describe('searchModuleTechDocsCollator', () => {
       extensionPoints: [
         [searchIndexRegistryExtensionPoint, extensionPointMock],
       ],
-      features: [searchModuleTechDocsCollator({ schedule })],
+      features: [
+        searchModuleTechDocsCollator(),
+        mockServices.rootConfig.factory({
+          data: {
+            search: {
+              techdocs: {
+                schedule,
+              },
+            },
+          },
+        }),
+      ],
     });
 
     expect(extensionPointMock.addCollator).toHaveBeenCalledTimes(1);
diff --git a/plugins/search-backend-module-techdocs/src/alpha.ts b/plugins/search-backend-module-techdocs/src/alpha.ts
index 5d82b6804f..1c4988cc21 100644
--- a/plugins/search-backend-module-techdocs/src/alpha.ts
+++ b/plugins/search-backend-module-techdocs/src/alpha.ts
@@ -19,79 +19,65 @@
  * A module for the search backend that exports TechDocs modules.
  */
 
+import { loggerToWinstonLogger } from '@backstage/backend-common';
 import {
   coreServices,
   createBackendModule,
 } from '@backstage/backend-plugin-api';
-import { TaskScheduleDefinition } from '@backstage/backend-tasks';
-import { loggerToWinstonLogger } from '@backstage/backend-common';
-import { searchIndexRegistryExtensionPoint } from '@backstage/plugin-search-backend-node/alpha';
+import { readTaskScheduleDefinitionFromConfig } from '@backstage/backend-tasks';
 import { catalogServiceRef } from '@backstage/plugin-catalog-node/alpha';
-
-import {
-  DefaultTechDocsCollatorFactory,
-  TechDocsCollatorFactoryOptions,
-} from '@backstage/plugin-search-backend-module-techdocs';
-
-/**
- * @alpha
- * Options for {@link searchModuleTechDocsCollator}.
- */
-export type SearchModuleTechDocsCollatorOptions = Omit<
-  TechDocsCollatorFactoryOptions,
-  'logger' | 'discovery' | 'tokenManager' | 'catalogClient'
-> & {
-  schedule?: TaskScheduleDefinition;
-};
+import { DefaultTechDocsCollatorFactory } from '@backstage/plugin-search-backend-module-techdocs';
+import { searchIndexRegistryExtensionPoint } from '@backstage/plugin-search-backend-node/alpha';
 
 /**
  * @alpha
  * Search backend module for the TechDocs index.
  */
-export const searchModuleTechDocsCollator = createBackendModule(
-  (options?: SearchModuleTechDocsCollatorOptions) => ({
-    moduleId: 'techDocsCollator',
-    pluginId: 'search',
-    register(env) {
-      env.registerInit({
-        deps: {
-          config: coreServices.rootConfig,
-          logger: coreServices.logger,
-          discovery: coreServices.discovery,
-          tokenManager: coreServices.tokenManager,
-          scheduler: coreServices.scheduler,
-          catalog: catalogServiceRef,
-          indexRegistry: searchIndexRegistryExtensionPoint,
-        },
-        async init({
-          config,
-          logger,
-          discovery,
-          tokenManager,
-          scheduler,
-          catalog,
-          indexRegistry,
-        }) {
-          const defaultSchedule = {
-            frequency: { minutes: 10 },
-            timeout: { minutes: 15 },
-            initialDelay: { seconds: 3 },
-          };
+export default createBackendModule({
+  moduleId: 'techDocsCollator',
+  pluginId: 'search',
+  register(env) {
+    env.registerInit({
+      deps: {
+        config: coreServices.rootConfig,
+        logger: coreServices.logger,
+        discovery: coreServices.discovery,
+        tokenManager: coreServices.tokenManager,
+        scheduler: coreServices.scheduler,
+        catalog: catalogServiceRef,
+        indexRegistry: searchIndexRegistryExtensionPoint,
+      },
+      async init({
+        config,
+        logger,
+        discovery,
+        tokenManager,
+        scheduler,
+        catalog,
+        indexRegistry,
+      }) {
+        const defaultSchedule = {
+          frequency: { minutes: 10 },
+          timeout: { minutes: 15 },
+          initialDelay: { seconds: 3 },
+        };
 
-          indexRegistry.addCollator({
-            schedule: scheduler.createScheduledTaskRunner(
-              options?.schedule ?? defaultSchedule,
-            ),
-            factory: DefaultTechDocsCollatorFactory.fromConfig(config, {
-              ...options,
-              discovery,
-              tokenManager,
-              logger: loggerToWinstonLogger(logger),
-              catalogClient: catalog,
-            }),
-          });
-        },
-      });
-    },
-  }),
-);
+        const schedule = config.has('search.collators.techdocs.schedule')
+          ? readTaskScheduleDefinitionFromConfig(
+              config.getConfig('search.collators.techdocs.schedule'),
+            )
+          : defaultSchedule;
+
+        indexRegistry.addCollator({
+          schedule: scheduler.createScheduledTaskRunner(schedule),
+          factory: DefaultTechDocsCollatorFactory.fromConfig(config, {
+            discovery,
+            tokenManager,
+            logger: loggerToWinstonLogger(logger),
+            catalogClient: catalog,
+          }),
+        });
+      },
+    });
+  },
+});
diff --git a/plugins/search-backend-module-techdocs/src/collators/DefaultTechDocsCollatorFactory.test.ts b/plugins/search-backend-module-techdocs/src/collators/DefaultTechDocsCollatorFactory.test.ts
index d9329151c6..319b8fb446 100644
--- a/plugins/search-backend-module-techdocs/src/collators/DefaultTechDocsCollatorFactory.test.ts
+++ b/plugins/search-backend-module-techdocs/src/collators/DefaultTechDocsCollatorFactory.test.ts
@@ -174,10 +174,15 @@ describe('DefaultTechDocsCollatorFactory', () => {
 
     it('maps a returned entity with a custom locationTemplate', async () => {
       // Provide an alternate location template.
-      factory = DefaultTechDocsCollatorFactory.fromConfig(config, {
+      const _config = new ConfigReader({
+        ...config.get(),
+        search: {
+          collators: { techdocs: { locationTemplate: '/software/:name' } },
+        },
+      });
+      factory = DefaultTechDocsCollatorFactory.fromConfig(_config, {
         discovery: mockDiscoveryApi,
         tokenManager: mockTokenManager,
-        locationTemplate: '/software/:name',
         logger,
       });
       collator = await factory.getCollator();
@@ -194,10 +199,17 @@ describe('DefaultTechDocsCollatorFactory', () => {
       // A parallelismLimit of 1 is a catalog limit of 50 per request. Code
       // above in the /entities handler ensures valid entities are only
       // returned on the second page.
-      factory = DefaultTechDocsCollatorFactory.fromConfig(config, {
-        ...options,
-        parallelismLimit: 1,
+      const _config = new ConfigReader({
+        ...config.get(),
+        search: {
+          collators: {
+            techdocs: {
+              parallelismLimit: 1,
+            },
+          },
+        },
       });
+      factory = DefaultTechDocsCollatorFactory.fromConfig(_config, options);
       collator = await factory.getCollator();
 
       const pipeline = TestPipeline.fromCollator(collator);
@@ -205,6 +217,9 @@ describe('DefaultTechDocsCollatorFactory', () => {
 
       // Only 1 entity with TechDocs configured multiplied by 3 pages.
       expect(documents).toHaveLength(3);
+      expect(_config.get('search.collators.techdocs.parallelismLimit')).toEqual(
+        1,
+      );
     });
 
     describe('with legacyPathCasing configuration', () => {
diff --git a/plugins/search-backend-module-techdocs/src/collators/DefaultTechDocsCollatorFactory.ts b/plugins/search-backend-module-techdocs/src/collators/DefaultTechDocsCollatorFactory.ts
index e2c6f5913c..051dc93189 100644
--- a/plugins/search-backend-module-techdocs/src/collators/DefaultTechDocsCollatorFactory.ts
+++ b/plugins/search-backend-module-techdocs/src/collators/DefaultTechDocsCollatorFactory.ts
@@ -104,7 +104,18 @@ export class DefaultTechDocsCollatorFactory implements DocumentCollatorFactory {
       config.getOptionalBoolean(
         'techdocs.legacyUseCaseSensitiveTripletPaths',
       ) || false;
-    return new DefaultTechDocsCollatorFactory({ ...options, legacyPathCasing });
+    const locationTemplate = config.getOptionalString(
+      'search.collators.techdocs.locationTemplate',
+    );
+    const parallelismLimit = config.getOptionalNumber(
+      'search.collators.techdocs.parallelismLimit',
+    );
+    return new DefaultTechDocsCollatorFactory({
+      ...options,
+      locationTemplate,
+      parallelismLimit,
+      legacyPathCasing,
+    });
   }
 
   async getCollator(): Promise<Readable> {
diff --git a/plugins/search-backend-node/CHANGELOG.md b/plugins/search-backend-node/CHANGELOG.md
index a8b8b930ee..b8d902d729 100644
--- a/plugins/search-backend-node/CHANGELOG.md
+++ b/plugins/search-backend-node/CHANGELOG.md
@@ -1,5 +1,68 @@
 # @backstage/plugin-search-backend-node
 
+## 1.2.7-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config@1.1.0-next.1
+  - @backstage/backend-tasks@0.5.8-next.2
+  - @backstage/backend-common@0.19.5-next.2
+  - @backstage/backend-plugin-api@0.6.3-next.2
+  - @backstage/plugin-permission-common@0.7.8-next.1
+  - @backstage/errors@1.2.1
+  - @backstage/plugin-search-common@1.2.6-next.1
+
+## 1.2.7-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config@1.1.0-next.0
+  - @backstage/backend-tasks@0.5.8-next.1
+  - @backstage/backend-common@0.19.5-next.1
+  - @backstage/backend-plugin-api@0.6.3-next.1
+  - @backstage/plugin-permission-common@0.7.8-next.0
+  - @backstage/errors@1.2.1
+  - @backstage/plugin-search-common@1.2.6-next.0
+
+## 1.2.6-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.19.4-next.0
+  - @backstage/backend-tasks@0.5.7-next.0
+  - @backstage/backend-plugin-api@0.6.2-next.0
+  - @backstage/config@1.0.8
+  - @backstage/errors@1.2.1
+  - @backstage/plugin-permission-common@0.7.7
+  - @backstage/plugin-search-common@1.2.5
+
+## 1.2.4
+
+### Patch Changes
+
+- 12a8c94eda8d: Add package repository and homepage metadata
+- e3e9bc10298b: Fix Lunr search engine highlight by ignoring invalid metadata positions.
+- Updated dependencies
+  - @backstage/backend-common@0.19.2
+  - @backstage/backend-plugin-api@0.6.0
+  - @backstage/backend-tasks@0.5.5
+  - @backstage/config@1.0.8
+  - @backstage/errors@1.2.1
+  - @backstage/plugin-permission-common@0.7.7
+  - @backstage/plugin-search-common@1.2.5
+
+## 1.2.4-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@0.6.0-next.2
+  - @backstage/backend-tasks@0.5.5-next.2
+  - @backstage/backend-common@0.19.2-next.2
+
 ## 1.2.4-next.1
 
 ### Patch Changes
diff --git a/plugins/search-backend-node/catalog-info.yaml b/plugins/search-backend-node/catalog-info.yaml
new file mode 100644
index 0000000000..5f6b36256f
--- /dev/null
+++ b/plugins/search-backend-node/catalog-info.yaml
@@ -0,0 +1,12 @@
+apiVersion: backstage.io/v1alpha1
+kind: Component
+metadata:
+  name: backstage-plugin-search-backend-node
+  title: '@backstage/plugin-search-backend-node'
+  description: >-
+    A library for Backstage backend plugins that want to interact with the
+    search backend plugin
+spec:
+  lifecycle: production
+  type: backstage-node-library
+  owner: discoverability-maintainers
diff --git a/plugins/search-backend-node/package.json b/plugins/search-backend-node/package.json
index 842c636bba..0a6379d529 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.2.4-next.1",
+  "version": "1.2.7-next.2",
   "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 db52ff9e55..553fd3319d 100644
--- a/plugins/search-backend/CHANGELOG.md
+++ b/plugins/search-backend/CHANGELOG.md
@@ -1,5 +1,91 @@
 # @backstage/plugin-search-backend
 
+## 1.4.3-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config@1.1.0-next.1
+  - @backstage/backend-common@0.19.5-next.2
+  - @backstage/plugin-auth-node@0.3.0-next.2
+  - @backstage/plugin-permission-node@0.7.14-next.2
+  - @backstage/backend-plugin-api@0.6.3-next.2
+  - @backstage/plugin-permission-common@0.7.8-next.1
+  - @backstage/plugin-search-backend-node@1.2.7-next.2
+  - @backstage/backend-openapi-utils@0.0.3
+  - @backstage/errors@1.2.1
+  - @backstage/types@1.1.0
+  - @backstage/plugin-search-common@1.2.6-next.1
+
+## 1.4.3-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config@1.1.0-next.0
+  - @backstage/backend-common@0.19.5-next.1
+  - @backstage/backend-plugin-api@0.6.3-next.1
+  - @backstage/plugin-auth-node@0.3.0-next.1
+  - @backstage/plugin-permission-common@0.7.8-next.0
+  - @backstage/plugin-permission-node@0.7.14-next.1
+  - @backstage/plugin-search-backend-node@1.2.7-next.1
+  - @backstage/backend-openapi-utils@0.0.3
+  - @backstage/errors@1.2.1
+  - @backstage/types@1.1.0
+  - @backstage/plugin-search-common@1.2.6-next.0
+
+## 1.4.2-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-auth-node@0.3.0-next.0
+  - @backstage/backend-common@0.19.4-next.0
+  - @backstage/backend-openapi-utils@0.0.3
+  - @backstage/backend-plugin-api@0.6.2-next.0
+  - @backstage/config@1.0.8
+  - @backstage/errors@1.2.1
+  - @backstage/types@1.1.0
+  - @backstage/plugin-permission-common@0.7.7
+  - @backstage/plugin-permission-node@0.7.13-next.0
+  - @backstage/plugin-search-backend-node@1.2.6-next.0
+  - @backstage/plugin-search-common@1.2.5
+
+## 1.4.0
+
+### Minor Changes
+
+- ebeb77586975: Now performs request validation based on OpenAPI schema through `@backstage/backend-openapi-utils`. Error responses for invalid input, like `"a"` instead of a number, may have changed.
+
+### Patch Changes
+
+- 629cbd194a87: Use `coreServices.rootConfig` instead of `coreService.config`
+- 12a8c94eda8d: Add package repository and homepage metadata
+- 951ab6c9db58: Add missing `configSchema` to package.json
+- Updated dependencies
+  - @backstage/backend-common@0.19.2
+  - @backstage/backend-plugin-api@0.6.0
+  - @backstage/backend-openapi-utils@0.0.3
+  - @backstage/plugin-search-backend-node@1.2.4
+  - @backstage/plugin-auth-node@0.2.17
+  - @backstage/plugin-permission-node@0.7.11
+  - @backstage/config@1.0.8
+  - @backstage/errors@1.2.1
+  - @backstage/types@1.1.0
+  - @backstage/plugin-permission-common@0.7.7
+  - @backstage/plugin-search-common@1.2.5
+
+## 1.4.0-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@0.6.0-next.2
+  - @backstage/backend-common@0.19.2-next.2
+  - @backstage/plugin-permission-node@0.7.11-next.2
+  - @backstage/plugin-search-backend-node@1.2.4-next.2
+  - @backstage/plugin-auth-node@0.2.17-next.2
+
 ## 1.4.0-next.1
 
 ### Patch Changes
diff --git a/plugins/search-backend/alpha-api-report.md b/plugins/search-backend/alpha-api-report.md
index 6ee94a0e29..548f4c6608 100644
--- a/plugins/search-backend/alpha-api-report.md
+++ b/plugins/search-backend/alpha-api-report.md
@@ -6,7 +6,8 @@
 import { BackendFeature } from '@backstage/backend-plugin-api';
 
 // @alpha
-export const searchPlugin: () => BackendFeature;
+const _default: () => BackendFeature;
+export default _default;
 
 // (No @packageDocumentation comment for this package)
 ```
diff --git a/plugins/search-backend/catalog-info.yaml b/plugins/search-backend/catalog-info.yaml
new file mode 100644
index 0000000000..2b8c7ee346
--- /dev/null
+++ b/plugins/search-backend/catalog-info.yaml
@@ -0,0 +1,10 @@
+apiVersion: backstage.io/v1alpha1
+kind: Component
+metadata:
+  name: backstage-plugin-search-backend
+  title: '@backstage/plugin-search-backend'
+  description: The Backstage backend plugin that provides your backstage app with search
+spec:
+  lifecycle: production
+  type: backstage-backend-plugin
+  owner: discoverability-maintainers
diff --git a/plugins/search-backend/package.json b/plugins/search-backend/package.json
index 167e4d835a..85d4ae8da2 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.4.0-next.1",
+  "version": "1.4.3-next.2",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
diff --git a/plugins/search-backend/src/alpha.test.ts b/plugins/search-backend/src/alpha.test.ts
index 527f099236..a18ab7e104 100644
--- a/plugins/search-backend/src/alpha.test.ts
+++ b/plugins/search-backend/src/alpha.test.ts
@@ -16,7 +16,7 @@
 
 import { startTestBackend } from '@backstage/backend-test-utils';
 import request from 'supertest';
-import { searchPlugin } from './alpha';
+import searchPlugin from './alpha';
 
 describe('searchPlugin', () => {
   it('should serve search results on query endpoint', async () => {
diff --git a/plugins/search-backend/src/alpha.ts b/plugins/search-backend/src/alpha.ts
index 59394ab7a6..8a9d4498bc 100644
--- a/plugins/search-backend/src/alpha.ts
+++ b/plugins/search-backend/src/alpha.ts
@@ -75,7 +75,7 @@ class SearchEngineRegistry implements SearchEngineRegistryExtensionPoint {
  * The Search plugin is responsible for starting search indexing processes and return search results.
  * @alpha
  */
-export const searchPlugin = createBackendPlugin({
+export default createBackendPlugin({
   pluginId: 'search',
   register(env) {
     const searchIndexRegistry = new SearchIndexRegistry();
diff --git a/plugins/search-common/CHANGELOG.md b/plugins/search-common/CHANGELOG.md
index f4f007ca57..0f01e01dc3 100644
--- a/plugins/search-common/CHANGELOG.md
+++ b/plugins/search-common/CHANGELOG.md
@@ -1,5 +1,21 @@
 # @backstage/plugin-search-common
 
+## 1.2.6-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-permission-common@0.7.8-next.1
+  - @backstage/types@1.1.0
+
+## 1.2.6-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-permission-common@0.7.8-next.0
+  - @backstage/types@1.1.0
+
 ## 1.2.5
 
 ### Patch Changes
diff --git a/plugins/search-common/catalog-info.yaml b/plugins/search-common/catalog-info.yaml
new file mode 100644
index 0000000000..d7e77a8d10
--- /dev/null
+++ b/plugins/search-common/catalog-info.yaml
@@ -0,0 +1,12 @@
+apiVersion: backstage.io/v1alpha1
+kind: Component
+metadata:
+  name: backstage-plugin-search-common
+  title: '@backstage/plugin-search-common'
+  description: >-
+    Common functionalities for Search, to be shared between various
+    search-enabled plugins
+spec:
+  lifecycle: production
+  type: backstage-common-library
+  owner: discoverability-maintainers
diff --git a/plugins/search-common/package.json b/plugins/search-common/package.json
index d8b7e7bef9..d34549b4de 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.5",
+  "version": "1.2.6-next.1",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "publishConfig": {
@@ -26,6 +26,7 @@
   "files": [
     "dist"
   ],
+  "sideEffects": false,
   "scripts": {
     "build": "backstage-cli package build",
     "lint": "backstage-cli package lint",
diff --git a/plugins/search-react/CHANGELOG.md b/plugins/search-react/CHANGELOG.md
index 136a7ad4a4..7056b00fc6 100644
--- a/plugins/search-react/CHANGELOG.md
+++ b/plugins/search-react/CHANGELOG.md
@@ -1,5 +1,66 @@
 # @backstage/plugin-search-react
 
+## 1.7.0-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.13.5-next.2
+  - @backstage/core-plugin-api@1.6.0-next.2
+  - @backstage/theme@0.4.1
+  - @backstage/types@1.1.0
+  - @backstage/version-bridge@1.0.4
+  - @backstage/plugin-search-common@1.2.6-next.1
+
+## 1.7.0-next.1
+
+### Minor Changes
+
+- b78f570f44d3: The SearchPage component can now be configured via app-config.yaml with default query parameters to define how it behaves when it is first loaded or reset. Check out the following example:
+
+  ```yaml
+  search:
+    query:
+      pageLimit: 50
+  ```
+
+  Acceptable values for `pageLimit` are `10`, `25`, `50` or `100`.
+
+### Patch Changes
+
+- 45f8a95e1068: Optionally initializes the search context with default settings for search queries only when the config is defined, rather than always overriding it.
+- Updated dependencies
+  - @backstage/core-components@0.13.5-next.1
+  - @backstage/core-plugin-api@1.6.0-next.1
+  - @backstage/theme@0.4.1
+  - @backstage/types@1.1.0
+  - @backstage/version-bridge@1.0.4
+  - @backstage/plugin-search-common@1.2.6-next.0
+
+## 1.6.5-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-plugin-api@1.6.0-next.0
+  - @backstage/core-components@0.13.5-next.0
+  - @backstage/theme@0.4.1
+  - @backstage/types@1.1.0
+  - @backstage/version-bridge@1.0.4
+  - @backstage/plugin-search-common@1.2.5
+
+## 1.6.4
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.13.4
+  - @backstage/core-plugin-api@1.5.3
+  - @backstage/theme@0.4.1
+  - @backstage/types@1.1.0
+  - @backstage/version-bridge@1.0.4
+  - @backstage/plugin-search-common@1.2.5
+
 ## 1.6.4-next.0
 
 ### Patch Changes
diff --git a/plugins/search-react/api-report.md b/plugins/search-react/api-report.md
index 8afde8c4a5..97c8300c14 100644
--- a/plugins/search-react/api-report.md
+++ b/plugins/search-react/api-report.md
@@ -31,10 +31,12 @@ import { TypographyProps } from '@material-ui/core';
 // @public (undocumented)
 export const AutocompleteFilter: (
   props: SearchAutocompleteFilterProps,
-) => JSX.Element;
+) => React_2.JSX.Element;
 
 // @public (undocumented)
-export const CheckboxFilter: (props: SearchFilterComponentProps) => JSX.Element;
+export const CheckboxFilter: (
+  props: SearchFilterComponentProps,
+) => React_2.JSX.Element;
 
 // @public
 export const createSearchResultListItemExtension: <
@@ -46,7 +48,7 @@ export const createSearchResultListItemExtension: <
 // @public (undocumented)
 export const DefaultResultListItem: (
   props: DefaultResultListItemProps,
-) => JSX.Element;
+) => React_2.JSX.Element;
 
 // @public
 export type DefaultResultListItemProps = {
@@ -62,7 +64,7 @@ export type DefaultResultListItemProps = {
 // @public (undocumented)
 export const HighlightedSearchResultText: (
   props: HighlightedSearchResultTextProps,
-) => JSX.Element;
+) => React_2.JSX.Element;
 
 // @public
 export type HighlightedSearchResultTextProps = {
@@ -100,7 +102,7 @@ export type SearchAutocompleteComponent = <Option>(
 // @public
 export const SearchAutocompleteDefaultOption: (
   props: SearchAutocompleteDefaultOptionProps,
-) => JSX.Element;
+) => React_2.JSX.Element;
 
 // @public
 export type SearchAutocompleteDefaultOptionProps = {
@@ -151,7 +153,7 @@ export type SearchBarProps = Partial<SearchBarBaseProps>;
 // @public
 export const SearchContextProvider: (
   props: SearchContextProviderProps,
-) => JSX.Element;
+) => React_2.JSX.Element;
 
 // @public
 export type SearchContextProviderProps =
@@ -187,16 +189,16 @@ export type SearchContextValue = {
 
 // @public (undocumented)
 export const SearchFilter: {
-  (props: SearchFilterWrapperProps): JSX.Element;
+  (props: SearchFilterWrapperProps): React_2.JSX.Element;
   Checkbox(
     props: Omit<SearchFilterWrapperProps, 'component'> &
       SearchFilterComponentProps,
-  ): JSX.Element;
+  ): React_2.JSX.Element;
   Select(
     props: Omit<SearchFilterWrapperProps, 'component'> &
       SearchFilterComponentProps,
-  ): JSX.Element;
-  Autocomplete(props: SearchAutocompleteFilterProps): JSX.Element;
+  ): React_2.JSX.Element;
+  Autocomplete(props: SearchAutocompleteFilterProps): React_2.JSX.Element;
 };
 
 // @public (undocumented)
@@ -216,12 +218,14 @@ export type SearchFilterWrapperProps = SearchFilterComponentProps & {
 };
 
 // @public
-export const SearchPagination: (props: SearchPaginationProps) => JSX.Element;
+export const SearchPagination: (
+  props: SearchPaginationProps,
+) => React_2.JSX.Element;
 
 // @public
 export const SearchPaginationBase: (
   props: SearchPaginationBaseProps,
-) => JSX.Element;
+) => React_2.JSX.Element;
 
 // @public
 export type SearchPaginationBaseProps = {
@@ -267,7 +271,7 @@ export type SearchPaginationProps = Omit<
 >;
 
 // @public
-export const SearchResult: (props: SearchResultProps) => JSX.Element;
+export const SearchResult: (props: SearchResultProps) => React_2.JSX.Element;
 
 // @public
 export const SearchResultApi: (
@@ -280,7 +284,9 @@ export type SearchResultApiProps = SearchResultContextProps & {
 };
 
 // @public
-export const SearchResultComponent: (props: SearchResultProps) => JSX.Element;
+export const SearchResultComponent: (
+  props: SearchResultProps,
+) => React_2.JSX.Element;
 
 // @public
 export const SearchResultContext: (
@@ -298,12 +304,12 @@ export type SearchResultContextProps = {
 // @public
 export function SearchResultGroup<FilterOption>(
   props: SearchResultGroupProps<FilterOption>,
-): JSX.Element;
+): React_2.JSX.Element;
 
 // @public
 export const SearchResultGroupFilterFieldLayout: (
   props: SearchResultGroupFilterFieldLayoutProps,
-) => JSX.Element;
+) => React_2.JSX.Element;
 
 // @public
 export type SearchResultGroupFilterFieldLayoutProps = PropsWithChildren<{
@@ -321,7 +327,7 @@ export type SearchResultGroupFilterFieldPropsWith<T> = T &
 // @public
 export function SearchResultGroupLayout<FilterOption>(
   props: SearchResultGroupLayoutProps<FilterOption>,
-): JSX.Element;
+): React_2.JSX.Element;
 
 // @public
 export type SearchResultGroupLayoutProps<FilterOption> = ListProps & {
@@ -363,7 +369,7 @@ export type SearchResultGroupProps<FilterOption> = Pick<
 // @public
 export const SearchResultGroupSelectFilterField: (
   props: SearchResultGroupSelectFilterFieldProps,
-) => JSX.Element;
+) => React_2.JSX.Element;
 
 // @public
 export type SearchResultGroupSelectFilterFieldProps =
@@ -374,14 +380,16 @@ export type SearchResultGroupSelectFilterFieldProps =
 // @public
 export const SearchResultGroupTextFilterField: (
   props: SearchResultGroupTextFilterFieldProps,
-) => JSX.Element;
+) => React_2.JSX.Element;
 
 // @public
 export type SearchResultGroupTextFilterFieldProps =
   SearchResultGroupFilterFieldPropsWith<{}>;
 
 // @public
-export const SearchResultList: (props: SearchResultListProps) => JSX.Element;
+export const SearchResultList: (
+  props: SearchResultListProps,
+) => React_2.JSX.Element;
 
 // @public
 export type SearchResultListItemExtensionOptions<
@@ -405,7 +413,7 @@ export type SearchResultListItemExtensionProps<Props extends {} = {}> = Props &
 // @public
 export const SearchResultListItemExtensions: (
   props: SearchResultListItemExtensionsProps,
-) => JSX.Element;
+) => React_2.JSX.Element;
 
 // @public
 export type SearchResultListItemExtensionsProps = Omit<ListProps, 'results'> & {
@@ -415,7 +423,7 @@ export type SearchResultListItemExtensionsProps = Omit<ListProps, 'results'> & {
 // @public
 export const SearchResultListLayout: (
   props: SearchResultListLayoutProps,
-) => JSX.Element;
+) => React_2.JSX.Element;
 
 // @public
 export type SearchResultListLayoutProps = ListProps & {
@@ -436,7 +444,7 @@ export type SearchResultListProps = Pick<SearchResultStateProps, 'query'> &
   Omit<SearchResultListLayoutProps, 'loading' | 'error' | 'resultItems'>;
 
 // @public (undocumented)
-export const SearchResultPager: () => JSX.Element;
+export const SearchResultPager: () => React_2.JSX.Element;
 
 // @public
 export type SearchResultProps = Pick<SearchResultStateProps, 'query'> &
@@ -446,14 +454,18 @@ export type SearchResultProps = Pick<SearchResultStateProps, 'query'> &
   };
 
 // @public
-export const SearchResultState: (props: SearchResultStateProps) => JSX.Element;
+export const SearchResultState: (
+  props: SearchResultStateProps,
+) => React_2.JSX.Element;
 
 // @public
 export type SearchResultStateProps = SearchResultContextProps &
   Partial<SearchResultApiProps>;
 
 // @public (undocumented)
-export const SelectFilter: (props: SearchFilterComponentProps) => JSX.Element;
+export const SelectFilter: (
+  props: SearchFilterComponentProps,
+) => React_2.JSX.Element;
 
 // @public
 export const useSearch: () => SearchContextValue;
@@ -464,5 +476,5 @@ export const useSearchContextCheck: () => boolean;
 // @public
 export const useSearchResultListItemExtensions: (
   children: ReactNode,
-) => (result: SearchResult_2, key?: number) => JSX.Element;
+) => (result: SearchResult_2, key?: number) => React_2.JSX.Element;
 ```
diff --git a/plugins/search-react/catalog-info.yaml b/plugins/search-react/catalog-info.yaml
new file mode 100644
index 0000000000..799b3d19c3
--- /dev/null
+++ b/plugins/search-react/catalog-info.yaml
@@ -0,0 +1,9 @@
+apiVersion: backstage.io/v1alpha1
+kind: Component
+metadata:
+  name: backstage-plugin-search-react
+  title: '@backstage/plugin-search-react'
+spec:
+  lifecycle: production
+  type: backstage-web-library
+  owner: discoverability-maintainers
diff --git a/plugins/search-react/package.json b/plugins/search-react/package.json
index 787d24bc2a..4df70df020 100644
--- a/plugins/search-react/package.json
+++ b/plugins/search-react/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-search-react",
-  "version": "1.6.4-next.0",
+  "version": "1.7.0-next.2",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
@@ -21,6 +21,7 @@
   "keywords": [
     "backstage"
   ],
+  "sideEffects": false,
   "scripts": {
     "build": "backstage-cli package build",
     "lint": "backstage-cli package lint",
diff --git a/plugins/search-react/src/components/SearchBar/SearchBar.test.tsx b/plugins/search-react/src/components/SearchBar/SearchBar.test.tsx
index 9b4664aceb..ce3c285852 100644
--- a/plugins/search-react/src/components/SearchBar/SearchBar.test.tsx
+++ b/plugins/search-react/src/components/SearchBar/SearchBar.test.tsx
@@ -43,10 +43,6 @@ const createInitialState = ({
 describe('SearchBar', () => {
   const user = userEvent.setup({ delay: null });
 
-  const query = jest.fn().mockResolvedValue({ results: [] });
-
-  const searchApiMock = { query };
-
   const configApiMock = new ConfigReader({
     app: {
       title: 'Mock title',
@@ -58,6 +54,8 @@ describe('SearchBar', () => {
     },
   });
 
+  const searchApiMock = { query: jest.fn().mockResolvedValue({ results: [] }) };
+
   beforeEach(() => {
     jest.clearAllMocks();
   });
@@ -172,7 +170,7 @@ describe('SearchBar', () => {
 
     await waitFor(() => expect(textbox).toHaveValue(value));
 
-    expect(query).toHaveBeenLastCalledWith(
+    expect(searchApiMock.query).toHaveBeenLastCalledWith(
       expect.objectContaining({ term: value }),
     );
 
@@ -204,7 +202,7 @@ describe('SearchBar', () => {
 
     await waitFor(() => expect(textbox).toHaveValue(''));
 
-    expect(query).toHaveBeenLastCalledWith(
+    expect(searchApiMock.query).toHaveBeenLastCalledWith(
       expect.objectContaining({ term: '' }),
     );
   });
@@ -255,7 +253,7 @@ describe('SearchBar', () => {
     await user.type(textbox, value);
 
     await waitFor(() =>
-      expect(query).not.toHaveBeenLastCalledWith(
+      expect(searchApiMock.query).not.toHaveBeenLastCalledWith(
         expect.objectContaining({ term: value }),
       ),
     );
@@ -266,7 +264,7 @@ describe('SearchBar', () => {
 
     await waitFor(() => expect(textbox).toHaveValue(value));
 
-    expect(query).toHaveBeenLastCalledWith(
+    expect(searchApiMock.query).toHaveBeenLastCalledWith(
       expect.objectContaining({ term: value }),
     );
 
diff --git a/plugins/search-react/src/components/SearchFilter/SearchFilter.Autocomplete.test.tsx b/plugins/search-react/src/components/SearchFilter/SearchFilter.Autocomplete.test.tsx
index 14c8967b57..765d2a26d1 100644
--- a/plugins/search-react/src/components/SearchFilter/SearchFilter.Autocomplete.test.tsx
+++ b/plugins/search-react/src/components/SearchFilter/SearchFilter.Autocomplete.test.tsx
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-import { TestApiProvider } from '@backstage/test-utils';
+import { MockConfigApi, TestApiProvider } from '@backstage/test-utils';
 import { screen, render, waitFor, within } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
 import React from 'react';
@@ -22,6 +22,7 @@ import React from 'react';
 import { searchApiRef } from '../../api';
 import { SearchContextProvider, useSearch } from '../../context';
 import { SearchFilter } from './SearchFilter';
+import { configApiRef } from '@backstage/core-plugin-api';
 
 const SearchContextFilterSpy = ({ name }: { name: string }) => {
   const { filters } = useSearch();
@@ -34,7 +35,16 @@ const SearchContextFilterSpy = ({ name }: { name: string }) => {
 };
 
 describe('SearchFilter.Autocomplete', () => {
-  const query = jest.fn().mockResolvedValue({});
+  const configApiMock = new MockConfigApi({
+    search: {
+      query: {
+        pageLimit: 100,
+      },
+    },
+  });
+
+  const searchApiMock = { query: jest.fn().mockResolvedValue({ results: [] }) };
+
   const emptySearchContext = {
     term: '',
     types: [],
@@ -46,7 +56,12 @@ describe('SearchFilter.Autocomplete', () => {
 
   it('renders as expected', async () => {
     render(
-      <TestApiProvider apis={[[searchApiRef, { query }]]}>
+      <TestApiProvider
+        apis={[
+          [searchApiRef, searchApiMock],
+          [configApiRef, configApiMock],
+        ]}
+      >
         <SearchContextProvider>
           <SearchFilter.Autocomplete name={name} values={values} />
         </SearchContextProvider>
@@ -67,7 +82,12 @@ describe('SearchFilter.Autocomplete', () => {
 
   it('renders as expected with async values', async () => {
     render(
-      <TestApiProvider apis={[[searchApiRef, { query }]]}>
+      <TestApiProvider
+        apis={[
+          [searchApiRef, searchApiMock],
+          [configApiRef, configApiMock],
+        ]}
+      >
         <SearchContextProvider>
           <SearchFilter.Autocomplete name={name} values={async () => values} />
         </SearchContextProvider>
@@ -88,7 +108,12 @@ describe('SearchFilter.Autocomplete', () => {
 
   it('does not affect unrelated filter state', async () => {
     render(
-      <TestApiProvider apis={[[searchApiRef, { query }]]}>
+      <TestApiProvider
+        apis={[
+          [searchApiRef, searchApiMock],
+          [configApiRef, configApiMock],
+        ]}
+      >
         <SearchContextProvider
           initialState={{
             ...emptySearchContext,
@@ -132,7 +157,12 @@ describe('SearchFilter.Autocomplete', () => {
   describe('single', () => {
     it('renders as expected with defaultValue', async () => {
       render(
-        <TestApiProvider apis={[[searchApiRef, { query }]]}>
+        <TestApiProvider
+          apis={[
+            [searchApiRef, searchApiMock],
+            [configApiRef, configApiMock],
+          ]}
+        >
           <SearchContextProvider>
             <SearchFilter.Autocomplete
               name={name}
@@ -157,7 +187,12 @@ describe('SearchFilter.Autocomplete', () => {
 
     it('renders as expected with initial context', async () => {
       render(
-        <TestApiProvider apis={[[searchApiRef, { query }]]}>
+        <TestApiProvider
+          apis={[
+            [searchApiRef, searchApiMock],
+            [configApiRef, configApiMock],
+          ]}
+        >
           <SearchContextProvider
             initialState={{
               ...emptySearchContext,
@@ -183,7 +218,12 @@ describe('SearchFilter.Autocomplete', () => {
 
     it('sets filter state when selecting a value', async () => {
       render(
-        <TestApiProvider apis={[[searchApiRef, { query }]]}>
+        <TestApiProvider
+          apis={[
+            [searchApiRef, searchApiMock],
+            [configApiRef, configApiMock],
+          ]}
+        >
           <SearchContextProvider>
             <SearchFilter.Autocomplete name={name} values={values} />
             <SearchContextFilterSpy name={name} />
@@ -221,7 +261,12 @@ describe('SearchFilter.Autocomplete', () => {
   describe('multiple', () => {
     it('renders as expected with defaultValue', async () => {
       render(
-        <TestApiProvider apis={[[searchApiRef, { query }]]}>
+        <TestApiProvider
+          apis={[
+            [searchApiRef, searchApiMock],
+            [configApiRef, configApiMock],
+          ]}
+        >
           <SearchContextProvider>
             <SearchFilter.Autocomplete
               multiple
@@ -245,7 +290,12 @@ describe('SearchFilter.Autocomplete', () => {
 
     it('renders as expected with initial context', async () => {
       render(
-        <TestApiProvider apis={[[searchApiRef, { query }]]}>
+        <TestApiProvider
+          apis={[
+            [searchApiRef, searchApiMock],
+            [configApiRef, configApiMock],
+          ]}
+        >
           <SearchContextProvider
             initialState={{
               ...emptySearchContext,
@@ -269,7 +319,12 @@ describe('SearchFilter.Autocomplete', () => {
 
     it('respects tag limit configuration', async () => {
       render(
-        <TestApiProvider apis={[[searchApiRef, { query }]]}>
+        <TestApiProvider
+          apis={[
+            [searchApiRef, searchApiMock],
+            [configApiRef, configApiMock],
+          ]}
+        >
           <SearchContextProvider>
             <SearchFilter.Autocomplete
               multiple
@@ -318,7 +373,12 @@ describe('SearchFilter.Autocomplete', () => {
 
     it('sets filter state when selecting a value', async () => {
       render(
-        <TestApiProvider apis={[[searchApiRef, { query }]]}>
+        <TestApiProvider
+          apis={[
+            [searchApiRef, searchApiMock],
+            [configApiRef, configApiMock],
+          ]}
+        >
           <SearchContextProvider>
             <SearchFilter.Autocomplete multiple name={name} values={values} />
             <SearchContextFilterSpy name={name} />
diff --git a/plugins/search-react/src/components/SearchFilter/SearchFilter.test.tsx b/plugins/search-react/src/components/SearchFilter/SearchFilter.test.tsx
index 89a1818e8d..c51a4832e3 100644
--- a/plugins/search-react/src/components/SearchFilter/SearchFilter.test.tsx
+++ b/plugins/search-react/src/components/SearchFilter/SearchFilter.test.tsx
@@ -18,15 +18,12 @@ import React from 'react';
 import { screen, render, waitFor } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
 
-import { useApi } from '@backstage/core-plugin-api';
+import { configApiRef } from '@backstage/core-plugin-api';
 
 import { SearchContextProvider } from '../../context';
 import { SearchFilter } from './SearchFilter';
-
-jest.mock('@backstage/core-plugin-api', () => ({
-  ...jest.requireActual('@backstage/core-plugin-api'),
-  useApi: jest.fn().mockReturnValue({}),
-}));
+import { MockConfigApi, TestApiProvider } from '@backstage/test-utils';
+import { searchApiRef } from '../../api';
 
 describe('SearchFilter', () => {
   const initialState = {
@@ -40,8 +37,15 @@ describe('SearchFilter', () => {
   const values = ['value1', 'value2'];
   const filters = { unrelated: 'unrelated' };
 
-  const query = jest.fn().mockResolvedValue({});
-  (useApi as jest.Mock).mockReturnValue({ query: query });
+  const configApiMock = new MockConfigApi({
+    search: {
+      query: {
+        pagelimit: 10,
+      },
+    },
+  });
+
+  const searchApiMock = { query: jest.fn().mockResolvedValue({ results: [] }) };
 
   afterAll(() => {
     jest.resetAllMocks();
@@ -58,9 +62,16 @@ describe('SearchFilter', () => {
   describe('Checkbox', () => {
     it('Renders field name and values when provided as props', async () => {
       render(
-        <SearchContextProvider initialState={initialState}>
-          <SearchFilter.Checkbox label={label} name={name} values={values} />
-        </SearchContextProvider>,
+        <TestApiProvider
+          apis={[
+            [searchApiRef, searchApiMock],
+            [configApiRef, configApiMock],
+          ]}
+        >
+          <SearchContextProvider initialState={initialState}>
+            <SearchFilter.Checkbox label={label} name={name} values={values} />
+          </SearchContextProvider>
+        </TestApiProvider>,
       );
 
       await waitFor(() => {
@@ -77,16 +88,23 @@ describe('SearchFilter', () => {
 
     it('Renders correctly based on filter state', async () => {
       render(
-        <SearchContextProvider
-          initialState={{
-            ...initialState,
-            filters: {
-              [name]: [values[1]],
-            },
-          }}
+        <TestApiProvider
+          apis={[
+            [searchApiRef, searchApiMock],
+            [configApiRef, configApiMock],
+          ]}
         >
-          <SearchFilter.Checkbox label={label} name={name} values={values} />
-        </SearchContextProvider>,
+          <SearchContextProvider
+            initialState={{
+              ...initialState,
+              filters: {
+                [name]: [values[1]],
+              },
+            }}
+          >
+            <SearchFilter.Checkbox label={label} name={name} values={values} />
+          </SearchContextProvider>
+        </TestApiProvider>,
       );
 
       await waitFor(() => {
@@ -101,14 +119,21 @@ describe('SearchFilter', () => {
 
     it('Renders correctly based on defaultValue', async () => {
       render(
-        <SearchContextProvider initialState={initialState}>
-          <SearchFilter.Checkbox
-            label={label}
-            name={name}
-            values={values}
-            defaultValue={[values[0]]}
-          />
-        </SearchContextProvider>,
+        <TestApiProvider
+          apis={[
+            [searchApiRef, searchApiMock],
+            [configApiRef, configApiMock],
+          ]}
+        >
+          <SearchContextProvider initialState={initialState}>
+            <SearchFilter.Checkbox
+              label={label}
+              name={name}
+              values={values}
+              defaultValue={[values[0]]}
+            />
+          </SearchContextProvider>
+        </TestApiProvider>,
       );
 
       await waitFor(() => {
@@ -123,9 +148,16 @@ describe('SearchFilter', () => {
 
     it('Checking / unchecking a value sets filter state', async () => {
       render(
-        <SearchContextProvider initialState={initialState}>
-          <SearchFilter.Checkbox label={label} name={name} values={values} />
-        </SearchContextProvider>,
+        <TestApiProvider
+          apis={[
+            [searchApiRef, searchApiMock],
+            [configApiRef, configApiMock],
+          ]}
+        >
+          <SearchContextProvider initialState={initialState}>
+            <SearchFilter.Checkbox label={label} name={name} values={values} />
+          </SearchContextProvider>
+        </TestApiProvider>,
       );
 
       await waitFor(() => {
@@ -137,7 +169,7 @@ describe('SearchFilter', () => {
       // Check the box.
       await userEvent.click(checkBox);
       await waitFor(() => {
-        expect(query).toHaveBeenLastCalledWith(
+        expect(searchApiMock.query).toHaveBeenLastCalledWith(
           expect.objectContaining({ filters: { field: [values[0]] } }),
         );
       });
@@ -145,7 +177,7 @@ describe('SearchFilter', () => {
       // Uncheck the box.
       await userEvent.click(checkBox);
       await waitFor(() => {
-        expect(query).toHaveBeenLastCalledWith(
+        expect(searchApiMock.query).toHaveBeenLastCalledWith(
           expect.objectContaining({ filters: {} }),
         );
       });
@@ -153,9 +185,16 @@ describe('SearchFilter', () => {
 
     it('Checking / unchecking a value maintains unrelated filter state', async () => {
       render(
-        <SearchContextProvider initialState={{ ...initialState, filters }}>
-          <SearchFilter.Checkbox label={label} name={name} values={values} />
-        </SearchContextProvider>,
+        <TestApiProvider
+          apis={[
+            [searchApiRef, searchApiMock],
+            [configApiRef, configApiMock],
+          ]}
+        >
+          <SearchContextProvider initialState={{ ...initialState, filters }}>
+            <SearchFilter.Checkbox label={label} name={name} values={values} />
+          </SearchContextProvider>
+        </TestApiProvider>,
       );
 
       await waitFor(() => {
@@ -167,7 +206,7 @@ describe('SearchFilter', () => {
       // Check the box.
       await userEvent.click(checkBox);
       await waitFor(() => {
-        expect(query).toHaveBeenLastCalledWith(
+        expect(searchApiMock.query).toHaveBeenLastCalledWith(
           expect.objectContaining({
             filters: { ...filters, field: [values[0]] },
           }),
@@ -177,7 +216,7 @@ describe('SearchFilter', () => {
       // Uncheck the box.
       await userEvent.click(checkBox);
       await waitFor(() => {
-        expect(query).toHaveBeenLastCalledWith(
+        expect(searchApiMock.query).toHaveBeenLastCalledWith(
           expect.objectContaining({ filters }),
         );
       });
@@ -187,9 +226,16 @@ describe('SearchFilter', () => {
   describe('Select', () => {
     it('Renders field name and values when provided as props', async () => {
       render(
-        <SearchContextProvider initialState={initialState}>
-          <SearchFilter.Select label={label} name={name} values={values} />
-        </SearchContextProvider>,
+        <TestApiProvider
+          apis={[
+            [searchApiRef, searchApiMock],
+            [configApiRef, configApiMock],
+          ]}
+        >
+          <SearchContextProvider initialState={initialState}>
+            <SearchFilter.Select label={label} name={name} values={values} />
+          </SearchContextProvider>
+        </TestApiProvider>,
       );
 
       await waitFor(() => {
@@ -212,13 +258,20 @@ describe('SearchFilter', () => {
 
     it('Renders values when provided asynchronously', async () => {
       render(
-        <SearchContextProvider initialState={initialState}>
-          <SearchFilter.Select
-            label={label}
-            name={name}
-            values={async () => values}
-          />
-        </SearchContextProvider>,
+        <TestApiProvider
+          apis={[
+            [searchApiRef, searchApiMock],
+            [configApiRef, configApiMock],
+          ]}
+        >
+          <SearchContextProvider initialState={initialState}>
+            <SearchFilter.Select
+              label={label}
+              name={name}
+              values={async () => values}
+            />
+          </SearchContextProvider>
+        </TestApiProvider>,
       );
 
       await waitFor(() => {
@@ -244,16 +297,23 @@ describe('SearchFilter', () => {
 
     it('Renders correctly based on filter state', async () => {
       render(
-        <SearchContextProvider
-          initialState={{
-            ...initialState,
-            filters: {
-              [name]: values[0],
-            },
-          }}
+        <TestApiProvider
+          apis={[
+            [searchApiRef, searchApiMock],
+            [configApiRef, configApiMock],
+          ]}
         >
-          <SearchFilter.Select label={label} name={name} values={values} />
-        </SearchContextProvider>,
+          <SearchContextProvider
+            initialState={{
+              ...initialState,
+              filters: {
+                [name]: values[0],
+              },
+            }}
+          >
+            <SearchFilter.Select label={label} name={name} values={values} />
+          </SearchContextProvider>
+        </TestApiProvider>,
       );
 
       await waitFor(() => {
@@ -280,14 +340,21 @@ describe('SearchFilter', () => {
 
     it('Renders correctly based on defaultValue', async () => {
       render(
-        <SearchContextProvider initialState={initialState}>
-          <SearchFilter.Select
-            name={name}
-            label={label}
-            values={values}
-            defaultValue={values[0]}
-          />
-        </SearchContextProvider>,
+        <TestApiProvider
+          apis={[
+            [searchApiRef, searchApiMock],
+            [configApiRef, configApiMock],
+          ]}
+        >
+          <SearchContextProvider initialState={initialState}>
+            <SearchFilter.Select
+              name={name}
+              label={label}
+              values={values}
+              defaultValue={values[0]}
+            />
+          </SearchContextProvider>
+        </TestApiProvider>,
       );
 
       await waitFor(() => {
@@ -314,9 +381,16 @@ describe('SearchFilter', () => {
 
     it('Selecting a value sets filter state', async () => {
       render(
-        <SearchContextProvider initialState={initialState}>
-          <SearchFilter.Select label={label} name={name} values={values} />
-        </SearchContextProvider>,
+        <TestApiProvider
+          apis={[
+            [searchApiRef, searchApiMock],
+            [configApiRef, configApiMock],
+          ]}
+        >
+          <SearchContextProvider initialState={initialState}>
+            <SearchFilter.Select label={label} name={name} values={values} />
+          </SearchContextProvider>
+        </TestApiProvider>,
       );
 
       await waitFor(() => {
@@ -334,7 +408,7 @@ describe('SearchFilter', () => {
       await userEvent.click(screen.getByRole('option', { name: values[0] }));
 
       await waitFor(() => {
-        expect(query).toHaveBeenLastCalledWith(
+        expect(searchApiMock.query).toHaveBeenLastCalledWith(
           expect.objectContaining({
             filters: { [name]: values[0] },
           }),
@@ -350,7 +424,7 @@ describe('SearchFilter', () => {
       await userEvent.click(screen.getByRole('option', { name: 'All' }));
 
       await waitFor(() => {
-        expect(query).toHaveBeenLastCalledWith(
+        expect(searchApiMock.query).toHaveBeenLastCalledWith(
           expect.objectContaining({
             filters: {},
           }),
@@ -360,14 +434,21 @@ describe('SearchFilter', () => {
 
     it('Selecting a value maintains unrelated filter state', async () => {
       render(
-        <SearchContextProvider
-          initialState={{
-            ...initialState,
-            filters,
-          }}
+        <TestApiProvider
+          apis={[
+            [searchApiRef, searchApiMock],
+            [configApiRef, configApiMock],
+          ]}
         >
-          <SearchFilter.Select label={label} name={name} values={values} />
-        </SearchContextProvider>,
+          <SearchContextProvider
+            initialState={{
+              ...initialState,
+              filters,
+            }}
+          >
+            <SearchFilter.Select label={label} name={name} values={values} />
+          </SearchContextProvider>
+        </TestApiProvider>,
       );
 
       await waitFor(() => {
@@ -385,7 +466,7 @@ describe('SearchFilter', () => {
       await userEvent.click(screen.getByRole('option', { name: values[0] }));
 
       await waitFor(() => {
-        expect(query).toHaveBeenLastCalledWith(
+        expect(searchApiMock.query).toHaveBeenLastCalledWith(
           expect.objectContaining({
             filters: { ...filters, [name]: values[0] },
           }),
@@ -401,7 +482,7 @@ describe('SearchFilter', () => {
       await userEvent.click(screen.getByRole('option', { name: 'All' }));
 
       await waitFor(() => {
-        expect(query).toHaveBeenLastCalledWith(
+        expect(searchApiMock.query).toHaveBeenLastCalledWith(
           expect.objectContaining({ filters }),
         );
       });
diff --git a/plugins/search-react/src/components/SearchFilter/hooks.test.tsx b/plugins/search-react/src/components/SearchFilter/hooks.test.tsx
index 80c4a3a3a2..5135cd4ae6 100644
--- a/plugins/search-react/src/components/SearchFilter/hooks.test.tsx
+++ b/plugins/search-react/src/components/SearchFilter/hooks.test.tsx
@@ -15,19 +15,32 @@
  */
 import React from 'react';
 import { ApiProvider } from '@backstage/core-app-api';
-import { TestApiRegistry } from '@backstage/test-utils';
+import { MockConfigApi, TestApiRegistry } from '@backstage/test-utils';
 import { renderHook } from '@testing-library/react-hooks';
 
 import { searchApiRef } from '../../api';
 import { SearchContextProvider, useSearch } from '../../context';
 import { useDefaultFilterValue, useAsyncFilterValues } from './hooks';
+import { configApiRef } from '@backstage/core-plugin-api';
 
 jest.useFakeTimers();
 
 describe('SearchFilter.hooks', () => {
   describe('useDefaultFilterValue', () => {
-    const query = jest.fn().mockResolvedValue({});
-    const mockApis = TestApiRegistry.from([searchApiRef, { query }]);
+    const configApiMock = new MockConfigApi({
+      search: {
+        query: {
+          pageLimit: 100,
+        },
+      },
+    });
+    const searchApiMock = {
+      query: jest.fn().mockResolvedValue({ results: [] }),
+    };
+    const mockApis = TestApiRegistry.from(
+      [searchApiRef, searchApiMock],
+      [configApiRef, configApiMock],
+    );
     const wrapper = ({
       children,
       overrides = {},
diff --git a/plugins/search-react/src/components/SearchPagination/SearchPagination.test.tsx b/plugins/search-react/src/components/SearchPagination/SearchPagination.test.tsx
index 65e65d9436..7c86e16e95 100644
--- a/plugins/search-react/src/components/SearchPagination/SearchPagination.test.tsx
+++ b/plugins/search-react/src/components/SearchPagination/SearchPagination.test.tsx
@@ -18,27 +18,47 @@ import React from 'react';
 import { screen } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
 
-import { renderWithEffects, TestApiProvider } from '@backstage/test-utils';
+import {
+  MockConfigApi,
+  renderWithEffects,
+  TestApiProvider,
+} from '@backstage/test-utils';
 
 import { searchApiRef } from '../../api';
 import { SearchContextProvider } from '../../context';
 
 import { SearchPagination } from './SearchPagination';
-
-const query = jest.fn().mockResolvedValue({
-  results: [],
-  nextPageCursor: 'Mg==',
-  previousPageCursor: 'MA==',
-});
+import { configApiRef } from '@backstage/core-plugin-api';
 
 describe('SearchPagination', () => {
+  const configApiMock = new MockConfigApi({
+    search: {
+      query: {
+        pagelimit: 10,
+      },
+    },
+  });
+
+  const searchApiMock = {
+    query: jest.fn().mockResolvedValue({
+      results: [],
+      nextPageCursor: 'Mg==',
+      previousPageCursor: 'MA==',
+    }),
+  };
+
   beforeEach(() => {
     jest.clearAllMocks();
   });
 
   it('Renders without exploding', async () => {
     await renderWithEffects(
-      <TestApiProvider apis={[[searchApiRef, { query }]]}>
+      <TestApiProvider
+        apis={[
+          [searchApiRef, searchApiMock],
+          [configApiRef, configApiMock],
+        ]}
+      >
         <SearchContextProvider>
           <SearchPagination />
         </SearchContextProvider>
@@ -54,7 +74,12 @@ describe('SearchPagination', () => {
 
   it('Define default page limit options', async () => {
     await renderWithEffects(
-      <TestApiProvider apis={[[searchApiRef, { query }]]}>
+      <TestApiProvider
+        apis={[
+          [searchApiRef, searchApiMock],
+          [configApiRef, configApiMock],
+        ]}
+      >
         <SearchContextProvider>
           <SearchPagination />
         </SearchContextProvider>
@@ -74,7 +99,12 @@ describe('SearchPagination', () => {
   it('Accept custom page limit label', async () => {
     const label = 'Page limit:';
     await renderWithEffects(
-      <TestApiProvider apis={[[searchApiRef, { query }]]}>
+      <TestApiProvider
+        apis={[
+          [searchApiRef, searchApiMock],
+          [configApiRef, configApiMock],
+        ]}
+      >
         <SearchContextProvider>
           <SearchPagination limitLabel={label} />
         </SearchContextProvider>
@@ -86,7 +116,12 @@ describe('SearchPagination', () => {
 
   it('Show the total in text', async () => {
     await renderWithEffects(
-      <TestApiProvider apis={[[searchApiRef, { query }]]}>
+      <TestApiProvider
+        apis={[
+          [searchApiRef, searchApiMock],
+          [configApiRef, configApiMock],
+        ]}
+      >
         <SearchContextProvider>
           <SearchPagination total={100} />
         </SearchContextProvider>
@@ -98,7 +133,12 @@ describe('SearchPagination', () => {
 
   it('Accept custom page limit text', async () => {
     await renderWithEffects(
-      <TestApiProvider apis={[[searchApiRef, { query }]]}>
+      <TestApiProvider
+        apis={[
+          [searchApiRef, searchApiMock],
+          [configApiRef, configApiMock],
+        ]}
+      >
         <SearchContextProvider>
           <SearchPagination
             limitText={({ from, to }) => `${from}-${to} of more than ${to}`}
@@ -112,7 +152,12 @@ describe('SearchPagination', () => {
 
   it('Accept custom page limit options', async () => {
     await renderWithEffects(
-      <TestApiProvider apis={[[searchApiRef, { query }]]}>
+      <TestApiProvider
+        apis={[
+          [searchApiRef, searchApiMock],
+          [configApiRef, configApiMock],
+        ]}
+      >
         <SearchContextProvider>
           <SearchPagination limitOptions={[5, 10, 20, 25]} />
         </SearchContextProvider>
@@ -131,7 +176,12 @@ describe('SearchPagination', () => {
 
   it('Set page limit in the context', async () => {
     await renderWithEffects(
-      <TestApiProvider apis={[[searchApiRef, { query }]]}>
+      <TestApiProvider
+        apis={[
+          [searchApiRef, searchApiMock],
+          [configApiRef, configApiMock],
+        ]}
+      >
         <SearchContextProvider>
           <SearchPagination />
         </SearchContextProvider>
@@ -142,7 +192,7 @@ describe('SearchPagination', () => {
 
     await userEvent.click(screen.getByText('10'));
 
-    expect(query).toHaveBeenCalledWith(
+    expect(searchApiMock.query).toHaveBeenCalledWith(
       expect.objectContaining({
         pageLimit: 10,
       }),
@@ -158,7 +208,12 @@ describe('SearchPagination', () => {
     };
 
     await renderWithEffects(
-      <TestApiProvider apis={[[searchApiRef, { query }]]}>
+      <TestApiProvider
+        apis={[
+          [searchApiRef, searchApiMock],
+          [configApiRef, configApiMock],
+        ]}
+      >
         <SearchContextProvider initialState={initialState}>
           <SearchPagination />
         </SearchContextProvider>
@@ -169,7 +224,7 @@ describe('SearchPagination', () => {
 
     expect(screen.getByText('51-75')).toBeInTheDocument();
 
-    expect(query).toHaveBeenLastCalledWith(
+    expect(searchApiMock.query).toHaveBeenLastCalledWith(
       expect.objectContaining({
         pageCursor: 'Mg==', // page: 2
       }),
@@ -179,7 +234,7 @@ describe('SearchPagination', () => {
 
     expect(screen.getByText('26-50')).toBeInTheDocument();
 
-    expect(query).toHaveBeenLastCalledWith(
+    expect(searchApiMock.query).toHaveBeenLastCalledWith(
       expect.objectContaining({
         pageCursor: 'MQ==', // page: 1
       }),
@@ -195,7 +250,12 @@ describe('SearchPagination', () => {
     };
 
     await renderWithEffects(
-      <TestApiProvider apis={[[searchApiRef, { query }]]}>
+      <TestApiProvider
+        apis={[
+          [searchApiRef, searchApiMock],
+          [configApiRef, configApiMock],
+        ]}
+      >
         <SearchContextProvider initialState={initialState}>
           <SearchPagination />
         </SearchContextProvider>
@@ -205,7 +265,7 @@ describe('SearchPagination', () => {
     await userEvent.click(screen.getByText('25')); // first click to open the options
     await userEvent.click(screen.getByText('10')); // second click to select the option
 
-    expect(query).toHaveBeenLastCalledWith(
+    expect(searchApiMock.query).toHaveBeenLastCalledWith(
       expect.objectContaining({
         pageCursor: undefined,
         pageLimit: 10,
diff --git a/plugins/search-react/src/context/SearchContext.test.tsx b/plugins/search-react/src/context/SearchContext.test.tsx
index edee2f153f..df71a848b0 100644
--- a/plugins/search-react/src/context/SearchContext.test.tsx
+++ b/plugins/search-react/src/context/SearchContext.test.tsx
@@ -14,29 +14,36 @@
  * limitations under the License.
  */
 
-import { useApi } from '@backstage/core-plugin-api';
+import { configApiRef } from '@backstage/core-plugin-api';
 import { render, screen, waitFor } from '@testing-library/react';
 import { act, renderHook } from '@testing-library/react-hooks';
+import { MockConfigApi, TestApiProvider } from '@backstage/test-utils';
 import React from 'react';
 import {
   SearchContextProvider,
   useSearch,
   useSearchContextCheck,
 } from './SearchContext';
-
-jest.mock('@backstage/core-plugin-api', () => ({
-  ...jest.requireActual('@backstage/core-plugin-api'),
-  useApi: jest.fn(),
-}));
+import { searchApiRef } from '../api';
 
 describe('SearchContext', () => {
-  const query = jest.fn();
+  const searchApiMock = { query: jest.fn() };
 
-  const wrapper = ({ children, initialState }: any) => (
-    <SearchContextProvider initialState={initialState}>
-      {children}
-    </SearchContextProvider>
-  );
+  const wrapper = ({ children, initialState, config = {} }: any) => {
+    const configApiMock = new MockConfigApi(config);
+    return (
+      <TestApiProvider
+        apis={[
+          [configApiRef, configApiMock],
+          [searchApiRef, searchApiMock],
+        ]}
+      >
+        <SearchContextProvider initialState={initialState}>
+          {children}
+        </SearchContextProvider>
+      </TestApiProvider>
+    );
+  };
 
   const initialState = {
     term: '',
@@ -45,8 +52,7 @@ describe('SearchContext', () => {
   };
 
   beforeEach(() => {
-    query.mockResolvedValue({});
-    (useApi as jest.Mock).mockReturnValue({ query: query });
+    searchApiMock.query.mockResolvedValue({});
   });
 
   afterAll(() => {
@@ -56,11 +62,7 @@ describe('SearchContext', () => {
   it('Passes children', async () => {
     const text = 'text';
 
-    render(
-      <SearchContextProvider initialState={initialState}>
-        {text}
-      </SearchContextProvider>,
-    );
+    render(wrapper({ children: text, initialState }));
 
     await waitFor(() => {
       expect(screen.getByText(text)).toBeInTheDocument();
@@ -95,17 +97,59 @@ describe('SearchContext', () => {
     expect(result.current).toEqual(true);
   });
 
-  it('Uses initial state values', async () => {
-    const { result, waitForNextUpdate } = renderHook(() => useSearch(), {
-      wrapper,
-      initialProps: {
-        initialState,
-      },
+  describe('Uses initial state values', () => {
+    it('Uses default initial state values', async () => {
+      const { result, waitForNextUpdate } = renderHook(() => useSearch(), {
+        wrapper,
+      });
+
+      await waitForNextUpdate();
+
+      expect(result.current).toEqual(
+        expect.objectContaining({
+          term: '',
+          types: [],
+          filters: {},
+          pageLimit: undefined,
+          pageCursor: undefined,
+        }),
+      );
     });
 
-    await waitForNextUpdate();
+    it('Uses provided initial state values', async () => {
+      const { result, waitForNextUpdate } = renderHook(() => useSearch(), {
+        wrapper,
+        initialProps: {
+          initialState,
+        },
+      });
 
-    expect(result.current).toEqual(expect.objectContaining(initialState));
+      await waitForNextUpdate();
+
+      expect(result.current).toEqual(expect.objectContaining(initialState));
+    });
+
+    it('Uses page limit provided via config api', async () => {
+      const { result, waitForNextUpdate } = renderHook(() => useSearch(), {
+        wrapper,
+        initialProps: {
+          initialState,
+          config: {
+            search: {
+              query: {
+                pageLimit: 100,
+              },
+            },
+          },
+        },
+      });
+
+      await waitForNextUpdate();
+
+      expect(result.current).toEqual(
+        expect.objectContaining({ ...initialState, pageLimit: 100 }),
+      );
+    });
   });
 
   describe('Resets cursor', () => {
@@ -235,7 +279,7 @@ describe('SearchContext', () => {
 
       await waitForNextUpdate();
 
-      expect(query).toHaveBeenLastCalledWith({
+      expect(searchApiMock.query).toHaveBeenLastCalledWith({
         term,
         types: ['*'],
         filters: {},
@@ -260,7 +304,7 @@ describe('SearchContext', () => {
 
       await waitForNextUpdate();
 
-      expect(query).toHaveBeenLastCalledWith({
+      expect(searchApiMock.query).toHaveBeenLastCalledWith({
         types,
         term: '',
         filters: {},
@@ -285,7 +329,7 @@ describe('SearchContext', () => {
 
       await waitForNextUpdate();
 
-      expect(query).toHaveBeenLastCalledWith({
+      expect(searchApiMock.query).toHaveBeenLastCalledWith({
         filters,
         term: '',
         types: ['*'],
@@ -310,7 +354,7 @@ describe('SearchContext', () => {
 
       await waitForNextUpdate();
 
-      expect(query).toHaveBeenLastCalledWith({
+      expect(searchApiMock.query).toHaveBeenLastCalledWith({
         pageLimit,
         term: '',
         types: ['*'],
@@ -336,7 +380,7 @@ describe('SearchContext', () => {
 
       await waitForNextUpdate();
 
-      expect(query).toHaveBeenLastCalledWith({
+      expect(searchApiMock.query).toHaveBeenLastCalledWith({
         pageCursor,
         term: '',
         types: ['*'],
@@ -345,7 +389,7 @@ describe('SearchContext', () => {
     });
 
     it('provides function for fetch the next page', async () => {
-      query.mockResolvedValue({
+      searchApiMock.query.mockResolvedValue({
         results: [],
         nextPageCursor: 'NEXT',
       });
@@ -368,7 +412,7 @@ describe('SearchContext', () => {
 
       await waitForNextUpdate();
 
-      expect(query).toHaveBeenLastCalledWith({
+      expect(searchApiMock.query).toHaveBeenLastCalledWith({
         term: '',
         types: ['*'],
         filters: {},
@@ -377,7 +421,7 @@ describe('SearchContext', () => {
     });
 
     it('provides function for fetch the previous page', async () => {
-      query.mockResolvedValue({
+      searchApiMock.query.mockResolvedValue({
         results: [],
         previousPageCursor: 'PREVIOUS',
       });
@@ -400,7 +444,7 @@ describe('SearchContext', () => {
 
       await waitForNextUpdate();
 
-      expect(query).toHaveBeenLastCalledWith({
+      expect(searchApiMock.query).toHaveBeenLastCalledWith({
         term: '',
         types: ['*'],
         filters: {},
diff --git a/plugins/search-react/src/context/SearchContext.tsx b/plugins/search-react/src/context/SearchContext.tsx
index 94e51c0668..f6fe08e866 100644
--- a/plugins/search-react/src/context/SearchContext.tsx
+++ b/plugins/search-react/src/context/SearchContext.tsx
@@ -30,7 +30,11 @@ import {
   createVersionedValueMap,
 } from '@backstage/version-bridge';
 import { JsonObject } from '@backstage/types';
-import { AnalyticsContext, useApi } from '@backstage/core-plugin-api';
+import {
+  AnalyticsContext,
+  useApi,
+  configApiRef,
+} from '@backstage/core-plugin-api';
 import { SearchResultSet } from '@backstage/plugin-search-common';
 
 import { searchApiRef } from '../api';
@@ -98,7 +102,7 @@ export const useSearchContextCheck = () => {
  * The initial state of `SearchContextProvider`.
  *
  */
-const searchInitialState: SearchContextState = {
+const defaultInitialSearchState: SearchContextState = {
   term: '',
   types: [],
   filters: {},
@@ -107,7 +111,7 @@ const searchInitialState: SearchContextState = {
 };
 
 const useSearchContextValue = (
-  initialValue: SearchContextState = searchInitialState,
+  initialValue: SearchContextState = defaultInitialSearchState,
 ) => {
   const searchApi = useApi(searchApiRef);
 
@@ -239,10 +243,24 @@ export const SearchContextProvider = (props: SearchContextProviderProps) => {
   const { initialState, inheritParentContextIfAvailable, children } = props;
   const hasParentContext = useSearchContextCheck();
 
+  const configApi = useApi(configApiRef);
+
+  const propsInitialSearchState = initialState ?? {};
+
+  const configInitialSearchState = configApi.has('search.query.pageLimit')
+    ? { pageLimit: configApi.getNumber('search.query.pageLimit') }
+    : {};
+
+  const searchContextInitialState = {
+    ...defaultInitialSearchState,
+    ...propsInitialSearchState,
+    ...configInitialSearchState,
+  };
+
   return hasParentContext && inheritParentContextIfAvailable ? (
     <>{children}</>
   ) : (
-    <LocalSearchContext initialState={initialState}>
+    <LocalSearchContext initialState={searchContextInitialState}>
       {children}
     </LocalSearchContext>
   );
diff --git a/plugins/search/CHANGELOG.md b/plugins/search/CHANGELOG.md
index cbc0187d23..f0273d7ac6 100644
--- a/plugins/search/CHANGELOG.md
+++ b/plugins/search/CHANGELOG.md
@@ -1,5 +1,93 @@
 # @backstage/plugin-search
 
+## 1.4.0-next.2
+
+### Patch Changes
+
+- 8cec7664e146: Removed `@types/node` dependency
+- Updated dependencies
+  - @backstage/core-components@0.13.5-next.2
+  - @backstage/core-plugin-api@1.6.0-next.2
+  - @backstage/config@1.1.0-next.1
+  - @backstage/plugin-catalog-react@1.8.4-next.2
+  - @backstage/plugin-search-react@1.7.0-next.2
+  - @backstage/catalog-model@1.4.2-next.1
+  - @backstage/errors@1.2.1
+  - @backstage/theme@0.4.1
+  - @backstage/types@1.1.0
+  - @backstage/version-bridge@1.0.4
+  - @backstage/plugin-search-common@1.2.6-next.1
+
+## 1.4.0-next.1
+
+### Minor Changes
+
+- b78f570f44d3: The SearchPage component can now be configured via app-config.yaml with default query parameters to define how it behaves when it is first loaded or reset. Check out the following example:
+
+  ```yaml
+  search:
+    query:
+      pageLimit: 50
+  ```
+
+  Acceptable values for `pageLimit` are `10`, `25`, `50` or `100`.
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.8.4-next.1
+  - @backstage/core-components@0.13.5-next.1
+  - @backstage/config@1.1.0-next.0
+  - @backstage/plugin-search-react@1.7.0-next.1
+  - @backstage/catalog-model@1.4.2-next.0
+  - @backstage/core-plugin-api@1.6.0-next.1
+  - @backstage/errors@1.2.1
+  - @backstage/theme@0.4.1
+  - @backstage/types@1.1.0
+  - @backstage/version-bridge@1.0.4
+  - @backstage/plugin-search-common@1.2.6-next.0
+
+## 1.3.6-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-plugin-api@1.6.0-next.0
+  - @backstage/core-components@0.13.5-next.0
+  - @backstage/catalog-model@1.4.1
+  - @backstage/config@1.0.8
+  - @backstage/errors@1.2.1
+  - @backstage/theme@0.4.1
+  - @backstage/types@1.1.0
+  - @backstage/version-bridge@1.0.4
+  - @backstage/plugin-catalog-react@1.8.3-next.0
+  - @backstage/plugin-search-common@1.2.5
+  - @backstage/plugin-search-react@1.6.5-next.0
+
+## 1.3.4
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.13.4
+  - @backstage/plugin-catalog-react@1.8.1
+  - @backstage/core-plugin-api@1.5.3
+  - @backstage/plugin-search-react@1.6.4
+  - @backstage/catalog-model@1.4.1
+  - @backstage/config@1.0.8
+  - @backstage/errors@1.2.1
+  - @backstage/theme@0.4.1
+  - @backstage/types@1.1.0
+  - @backstage/version-bridge@1.0.4
+  - @backstage/plugin-search-common@1.2.5
+
+## 1.3.4-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.8.1-next.1
+
 ## 1.3.4-next.0
 
 ### Patch Changes
diff --git a/plugins/search/README.md b/plugins/search/README.md
index 3803b71e43..e6b664338d 100644
--- a/plugins/search/README.md
+++ b/plugins/search/README.md
@@ -8,6 +8,22 @@ Development is ongoing. You can follow the progress and contribute at the Backst
 
 Run `yarn dev` in the root directory, and then navigate to [/search](http://localhost:3000/search) to check out the plugin.
 
+### Optional Settings
+
+Configure the search query values via `app-config.yaml` to define how it behaves by default.
+
+```yaml
+# app-config.yaml
+search:
+  query:
+    pageLimit: 50
+```
+
+Acceptable values for `pageLimit` are `10`, `25`, `50` or `100`.
+
+**NOTE**: Currently this configuration only reflects the initial state of the Search React components. This means that
+it defines how it behaves when it is first loaded or reset.
+
 ### Areas of Responsibility
 
 This search plugin is primarily responsible for the following:
diff --git a/plugins/search/api-report.md b/plugins/search/api-report.md
index 6bf4f86d71..616b63bd31 100644
--- a/plugins/search/api-report.md
+++ b/plugins/search/api-report.md
@@ -7,6 +7,8 @@
 
 import { BackstagePlugin } from '@backstage/core-plugin-api';
 import { IconComponent } from '@backstage/core-plugin-api';
+import { JSX as JSX_2 } from 'react';
+import { default as React_2 } from 'react';
 import { ReactNode } from 'react';
 import { RouteRef } from '@backstage/core-plugin-api';
 import { SearchBarBaseProps } from '@backstage/plugin-search-react';
@@ -14,7 +16,7 @@ import { SearchBarBaseProps } from '@backstage/plugin-search-react';
 // @public (undocumented)
 export const HomePageSearchBar: (
   props: Partial<Omit<SearchBarBaseProps, 'onChange' | 'onSubmit'>>,
-) => JSX.Element;
+) => JSX_2.Element;
 
 // @public
 export type HomePageSearchBarProps = Partial<
@@ -22,10 +24,10 @@ export type HomePageSearchBarProps = Partial<
 >;
 
 // @public (undocumented)
-export const Router: () => JSX.Element;
+export const Router: () => React_2.JSX.Element;
 
 // @public (undocumented)
-export const SearchModal: (props: SearchModalProps) => JSX.Element;
+export const SearchModal: (props: SearchModalProps) => React_2.JSX.Element;
 
 // @public (undocumented)
 export interface SearchModalChildrenProps {
@@ -43,7 +45,7 @@ export interface SearchModalProps {
 // @public
 export const SearchModalProvider: (
   props: SearchModalProviderProps,
-) => JSX.Element;
+) => React_2.JSX.Element;
 
 // @public
 export type SearchModalProviderProps = {
@@ -62,7 +64,7 @@ export type SearchModalValue = {
 };
 
 // @public (undocumented)
-export const SearchPage: () => JSX.Element;
+export const SearchPage: () => JSX_2.Element;
 
 // @public (undocumented)
 const searchPlugin: BackstagePlugin<
@@ -77,9 +79,9 @@ export { searchPlugin };
 
 // @public (undocumented)
 export const SearchType: {
-  (props: SearchTypeProps): JSX.Element;
-  Accordion(props: SearchTypeAccordionProps): JSX.Element;
-  Tabs(props: SearchTypeTabsProps): JSX.Element;
+  (props: SearchTypeProps): React_2.JSX.Element;
+  Accordion(props: SearchTypeAccordionProps): React_2.JSX.Element;
+  Tabs(props: SearchTypeTabsProps): React_2.JSX.Element;
 };
 
 // @public (undocumented)
@@ -112,12 +114,12 @@ export type SearchTypeTabsProps = {
 };
 
 // @public (undocumented)
-export const SidebarSearch: (props: SidebarSearchProps) => JSX.Element;
+export const SidebarSearch: (props: SidebarSearchProps) => React_2.JSX.Element;
 
 // @public (undocumented)
 export const SidebarSearchModal: (
   props: SidebarSearchModalProps,
-) => JSX.Element;
+) => JSX_2.Element;
 
 // @public
 export type SidebarSearchModalProps = {
diff --git a/plugins/search/catalog-info.yaml b/plugins/search/catalog-info.yaml
new file mode 100644
index 0000000000..e1e4ae21da
--- /dev/null
+++ b/plugins/search/catalog-info.yaml
@@ -0,0 +1,10 @@
+apiVersion: backstage.io/v1alpha1
+kind: Component
+metadata:
+  name: backstage-plugin-search
+  title: '@backstage/plugin-search'
+  description: The Backstage plugin that provides your backstage app with search
+spec:
+  lifecycle: production
+  type: backstage-frontend-plugin
+  owner: discoverability-maintainers
diff --git a/plugins/search/config.d.ts b/plugins/search/config.d.ts
new file mode 100644
index 0000000000..d9a5ce4a1b
--- /dev/null
+++ b/plugins/search/config.d.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.
+ */
+
+export interface Config {
+  /** Configuration options for the search plugin */
+  search?: {
+    /**
+     * An object representing the default search query configuration.
+     * By configuring and modifying the values of this object,
+     * you can customize the default values of the search queries
+     * and define how it behaves by default.
+     */
+    query?: {
+      /**
+       * A number indicating the maximum number of results to be returned
+       * per page during pagination.
+       * @visibility frontend
+       */
+      pageLimit?: 10 | 25 | 50 | 100;
+    };
+  };
+}
diff --git a/plugins/search/package.json b/plugins/search/package.json
index 7a8d7dffab..5d3a75ec9a 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.3.4-next.0",
+  "version": "1.4.0-next.2",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
@@ -22,6 +22,7 @@
   "keywords": [
     "backstage"
   ],
+  "sideEffects": false,
   "scripts": {
     "build": "backstage-cli package build",
     "start": "backstage-cli package start",
@@ -65,11 +66,12 @@
     "@testing-library/react": "^12.1.3",
     "@testing-library/react-hooks": "^8.0.0",
     "@testing-library/user-event": "^14.0.0",
-    "@types/node": "^16.11.26",
     "history": "^5.0.0",
     "msw": "^1.0.0"
   },
   "files": [
-    "dist"
-  ]
+    "dist",
+    "config.d.ts"
+  ],
+  "configSchema": "config.d.ts"
 }
diff --git a/plugins/search/src/components/SearchModal/SearchModal.test.tsx b/plugins/search/src/components/SearchModal/SearchModal.test.tsx
index 33c2df9ab8..10be8ba6f8 100644
--- a/plugins/search/src/components/SearchModal/SearchModal.test.tsx
+++ b/plugins/search/src/components/SearchModal/SearchModal.test.tsx
@@ -36,16 +36,17 @@ jest.mock('react-router-dom', () => ({
 }));
 
 describe('SearchModal', () => {
-  const query = jest.fn().mockResolvedValue({ results: [] });
+  const configApiMock = new ConfigReader({ app: { title: 'Mock app' } });
+  const searchApiMock = { query: jest.fn().mockResolvedValue({ results: [] }) };
 
   const apiRegistry = TestApiRegistry.from(
-    [configApiRef, new ConfigReader({ app: { title: 'Mock app' } })],
-    [searchApiRef, { query }],
+    [configApiRef, configApiMock],
+    [searchApiRef, searchApiMock],
   );
 
   beforeEach(() => {
-    query.mockClear();
     navigate.mockClear();
+    searchApiMock.query.mockClear();
   });
 
   const toggleModal = jest.fn();
@@ -63,7 +64,7 @@ describe('SearchModal', () => {
     );
 
     expect(screen.getByRole('dialog')).toBeInTheDocument();
-    expect(query).toHaveBeenCalledTimes(1);
+    expect(searchApiMock.query).toHaveBeenCalledTimes(1);
   });
 
   it('Should use parent search context if defined', async () => {
@@ -88,7 +89,7 @@ describe('SearchModal', () => {
     );
 
     expect(screen.getByRole('dialog')).toBeInTheDocument();
-    expect(query).toHaveBeenCalledWith(initialState);
+    expect(searchApiMock.query).toHaveBeenCalledWith(initialState);
   });
 
   it('Should create a local search context if a parent is not defined', async () => {
@@ -104,7 +105,7 @@ describe('SearchModal', () => {
     );
 
     expect(screen.getByRole('dialog')).toBeInTheDocument();
-    expect(query).toHaveBeenCalledWith({
+    expect(searchApiMock.query).toHaveBeenCalledWith({
       term: '',
       filters: {},
       types: [],
@@ -141,7 +142,7 @@ describe('SearchModal', () => {
       },
     );
 
-    expect(query).toHaveBeenCalledTimes(1);
+    expect(searchApiMock.query).toHaveBeenCalledTimes(1);
     await userEvent.keyboard('{Escape}');
     expect(toggleModal).toHaveBeenCalledTimes(1);
   });
@@ -198,7 +199,7 @@ describe('SearchModal', () => {
       },
     );
 
-    expect(query).toHaveBeenCalledWith(
+    expect(searchApiMock.query).toHaveBeenCalledWith(
       expect.objectContaining({ term: 'term' }),
     );
 
@@ -230,7 +231,7 @@ describe('SearchModal', () => {
       },
     );
 
-    expect(query).toHaveBeenCalledWith(
+    expect(searchApiMock.query).toHaveBeenCalledWith(
       expect.objectContaining({ term: 'term' }),
     );
 
diff --git a/plugins/search/src/components/SearchType/SearchType.Accordion.test.tsx b/plugins/search/src/components/SearchType/SearchType.Accordion.test.tsx
index e0acee025a..556a9550a0 100644
--- a/plugins/search/src/components/SearchType/SearchType.Accordion.test.tsx
+++ b/plugins/search/src/components/SearchType/SearchType.Accordion.test.tsx
@@ -15,7 +15,7 @@
  */
 
 import React from 'react';
-import { TestApiProvider } from '@backstage/test-utils';
+import { MockConfigApi, TestApiProvider } from '@backstage/test-utils';
 import { act, render, waitFor } from '@testing-library/react';
 import user from '@testing-library/user-event';
 import {
@@ -23,6 +23,7 @@ import {
   SearchContextProvider,
 } from '@backstage/plugin-search-react';
 import { SearchType } from './SearchType';
+import { configApiRef } from '@backstage/core-plugin-api';
 
 const setTypesMock = jest.fn();
 const setPageCursorMock = jest.fn();
@@ -40,7 +41,15 @@ jest.mock('@backstage/plugin-search-react', () => ({
 }));
 
 describe('SearchType.Accordion', () => {
-  const query = jest.fn();
+  const configApiMock = new MockConfigApi({
+    search: {
+      query: {
+        pagelimit: 10,
+      },
+    },
+  });
+
+  const searchApiMock = { query: jest.fn() };
 
   const expectedLabel = 'Expected Label';
   const expectedType = {
@@ -50,12 +59,20 @@ describe('SearchType.Accordion', () => {
   };
 
   beforeEach(() => {
-    query.mockResolvedValue({ results: [], numberOfResults: 1234 });
+    searchApiMock.query.mockResolvedValue({
+      results: [],
+      numberOfResults: 1234,
+    });
   });
 
   const Wrapper = ({ children }: { children: React.ReactNode }) => {
     return (
-      <TestApiProvider apis={[[searchApiRef, { query }]]}>
+      <TestApiProvider
+        apis={[
+          [searchApiRef, searchApiMock],
+          [configApiRef, configApiMock],
+        ]}
+      >
         <SearchContextProvider>{children}</SearchContextProvider>
       </TestApiProvider>
     );
@@ -146,13 +163,13 @@ describe('SearchType.Accordion', () => {
       </Wrapper>,
     );
 
-    expect(query).toHaveBeenCalledWith({
+    expect(searchApiMock.query).toHaveBeenCalledWith({
       term: 'abc',
       types: [],
       filters: { foo: 'bar' },
       pageLimit: 0,
     });
-    expect(query).toHaveBeenCalledWith({
+    expect(searchApiMock.query).toHaveBeenCalledWith({
       term: 'abc',
       types: [expectedType.value],
       filters: {},
diff --git a/plugins/search/src/components/SearchType/SearchType.Tabs.test.tsx b/plugins/search/src/components/SearchType/SearchType.Tabs.test.tsx
index 16df3a8f65..c0d8549253 100644
--- a/plugins/search/src/components/SearchType/SearchType.Tabs.test.tsx
+++ b/plugins/search/src/components/SearchType/SearchType.Tabs.test.tsx
@@ -15,7 +15,7 @@
  */
 
 import React from 'react';
-import { TestApiProvider } from '@backstage/test-utils';
+import { MockConfigApi, TestApiProvider } from '@backstage/test-utils';
 import { act, render } from '@testing-library/react';
 import user from '@testing-library/user-event';
 import {
@@ -23,6 +23,7 @@ import {
   searchApiRef,
 } from '@backstage/plugin-search-react';
 import { SearchType } from './SearchType';
+import { configApiRef } from '@backstage/core-plugin-api';
 
 const setTypesMock = jest.fn();
 const setPageCursorMock = jest.fn();
@@ -38,7 +39,14 @@ jest.mock('@backstage/plugin-search-react', () => ({
 }));
 
 describe('SearchType.Tabs', () => {
-  const query = jest.fn().mockResolvedValue({});
+  const searchApiMock = { query: jest.fn().mockResolvedValue({ results: [] }) };
+  const configApiMock = new MockConfigApi({
+    search: {
+      query: {
+        pageLimit: 100,
+      },
+    },
+  });
 
   const expectedType = {
     value: 'expected-type',
@@ -47,7 +55,12 @@ describe('SearchType.Tabs', () => {
 
   const Wrapper = ({ children }: { children: React.ReactNode }) => {
     return (
-      <TestApiProvider apis={[[searchApiRef, { query }]]}>
+      <TestApiProvider
+        apis={[
+          [searchApiRef, searchApiMock],
+          [configApiRef, configApiMock],
+        ]}
+      >
         <SearchContextProvider>{children}</SearchContextProvider>
       </TestApiProvider>
     );
diff --git a/plugins/search/src/components/SearchType/SearchType.test.tsx b/plugins/search/src/components/SearchType/SearchType.test.tsx
index a80782921f..353b45c0fb 100644
--- a/plugins/search/src/components/SearchType/SearchType.test.tsx
+++ b/plugins/search/src/components/SearchType/SearchType.test.tsx
@@ -14,17 +14,16 @@
  * limitations under the License.
  */
 
-import { useApi } from '@backstage/core-plugin-api';
+import { configApiRef } from '@backstage/core-plugin-api';
 import { render, screen, waitFor } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
 import React from 'react';
-import { SearchContextProvider } from '@backstage/plugin-search-react';
+import {
+  SearchContextProvider,
+  searchApiRef,
+} from '@backstage/plugin-search-react';
 import { SearchType } from './SearchType';
-
-jest.mock('@backstage/core-plugin-api', () => ({
-  ...jest.requireActual('@backstage/core-plugin-api'),
-  useApi: jest.fn().mockReturnValue({}),
-}));
+import { MockConfigApi, TestApiProvider } from '@backstage/test-utils';
 
 describe('SearchType', () => {
   const initialState = {
@@ -37,8 +36,15 @@ describe('SearchType', () => {
   const values = ['value1', 'value2'];
   const typeValues = ['preselected'];
 
-  const query = jest.fn().mockResolvedValue({});
-  (useApi as jest.Mock).mockReturnValue({ query: query });
+  const configApiMock = new MockConfigApi({
+    search: {
+      query: {
+        pagelimit: 10,
+      },
+    },
+  });
+
+  const searchApiMock = { query: jest.fn().mockResolvedValue({ results: [] }) };
 
   afterAll(() => {
     jest.resetAllMocks();
@@ -47,9 +53,16 @@ describe('SearchType', () => {
   describe('Type Filter', () => {
     it('Renders field name and values when provided as props', async () => {
       render(
-        <SearchContextProvider initialState={initialState}>
-          <SearchType name={name} values={values} />
-        </SearchContextProvider>,
+        <TestApiProvider
+          apis={[
+            [configApiRef, configApiMock],
+            [searchApiRef, searchApiMock],
+          ]}
+        >
+          <SearchContextProvider initialState={initialState}>
+            <SearchType name={name} values={values} />
+          </SearchContextProvider>
+        </TestApiProvider>,
       );
 
       await waitFor(() => {
@@ -72,14 +85,21 @@ describe('SearchType', () => {
 
     it('Renders correctly based on type filter state', async () => {
       render(
-        <SearchContextProvider
-          initialState={{
-            ...initialState,
-            types: [values[0]],
-          }}
+        <TestApiProvider
+          apis={[
+            [configApiRef, configApiMock],
+            [searchApiRef, searchApiMock],
+          ]}
         >
-          <SearchType name={name} values={values} />
-        </SearchContextProvider>,
+          <SearchContextProvider
+            initialState={{
+              ...initialState,
+              types: [values[0]],
+            }}
+          >
+            <SearchType name={name} values={values} />
+          </SearchContextProvider>
+        </TestApiProvider>,
       );
 
       await waitFor(() => {
@@ -103,9 +123,16 @@ describe('SearchType', () => {
 
     it('Renders correctly based on type filter defaultValue', async () => {
       render(
-        <SearchContextProvider initialState={initialState}>
-          <SearchType name={name} values={values} defaultValue={values[0]} />
-        </SearchContextProvider>,
+        <TestApiProvider
+          apis={[
+            [configApiRef, configApiMock],
+            [searchApiRef, searchApiMock],
+          ]}
+        >
+          <SearchContextProvider initialState={initialState}>
+            <SearchType name={name} values={values} defaultValue={values[0]} />
+          </SearchContextProvider>
+        </TestApiProvider>,
       );
 
       await waitFor(() => {
@@ -129,9 +156,16 @@ describe('SearchType', () => {
 
     it('Selecting a value sets type filter state', async () => {
       render(
-        <SearchContextProvider initialState={initialState}>
-          <SearchType name={name} values={values} />
-        </SearchContextProvider>,
+        <TestApiProvider
+          apis={[
+            [configApiRef, configApiMock],
+            [searchApiRef, searchApiMock],
+          ]}
+        >
+          <SearchContextProvider initialState={initialState}>
+            <SearchType name={name} values={values} />
+          </SearchContextProvider>
+        </TestApiProvider>,
       );
 
       await waitFor(() => {
@@ -149,7 +183,7 @@ describe('SearchType', () => {
       await userEvent.click(screen.getByRole('option', { name: values[0] }));
 
       await waitFor(() => {
-        expect(query).toHaveBeenLastCalledWith(
+        expect(searchApiMock.query).toHaveBeenLastCalledWith(
           expect.objectContaining({
             types: [values[0]],
           }),
@@ -165,14 +199,21 @@ describe('SearchType', () => {
 
     it('Selecting none defaults to empty state', async () => {
       render(
-        <SearchContextProvider
-          initialState={{
-            ...initialState,
-            types: typeValues,
-          }}
+        <TestApiProvider
+          apis={[
+            [configApiRef, configApiMock],
+            [searchApiRef, searchApiMock],
+          ]}
         >
-          <SearchType name={name} values={values} />
-        </SearchContextProvider>,
+          <SearchContextProvider
+            initialState={{
+              ...initialState,
+              types: typeValues,
+            }}
+          >
+            <SearchType name={name} values={values} />
+          </SearchContextProvider>
+        </TestApiProvider>,
       );
 
       await waitFor(() => {
@@ -190,7 +231,7 @@ describe('SearchType', () => {
       await userEvent.click(screen.getByRole('option', { name: values[0] }));
 
       await waitFor(() => {
-        expect(query).toHaveBeenLastCalledWith(
+        expect(searchApiMock.query).toHaveBeenLastCalledWith(
           expect.objectContaining({
             types: [...typeValues, values[0]],
           }),
@@ -206,7 +247,9 @@ describe('SearchType', () => {
       await userEvent.click(screen.getByRole('option', { name: values[0] }));
 
       await waitFor(() => {
-        expect(query).toHaveBeenLastCalledWith(expect.objectContaining([]));
+        expect(searchApiMock.query).toHaveBeenLastCalledWith(
+          expect.objectContaining([]),
+        );
       });
     });
   });
diff --git a/plugins/sentry/CHANGELOG.md b/plugins/sentry/CHANGELOG.md
index f4bac35016..416b18da39 100644
--- a/plugins/sentry/CHANGELOG.md
+++ b/plugins/sentry/CHANGELOG.md
@@ -1,5 +1,58 @@
 # @backstage/plugin-sentry
 
+## 0.5.9-next.2
+
+### Patch Changes
+
+- 8cec7664e146: Removed `@types/node` dependency
+- Updated dependencies
+  - @backstage/core-components@0.13.5-next.2
+  - @backstage/core-plugin-api@1.6.0-next.2
+  - @backstage/plugin-catalog-react@1.8.4-next.2
+  - @backstage/catalog-model@1.4.2-next.1
+  - @backstage/theme@0.4.1
+
+## 0.5.9-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.8.4-next.1
+  - @backstage/core-components@0.13.5-next.1
+  - @backstage/catalog-model@1.4.2-next.0
+  - @backstage/core-plugin-api@1.6.0-next.1
+  - @backstage/theme@0.4.1
+
+## 0.5.8-next.0
+
+### Patch Changes
+
+- 482bb5c0bbf8: Moved `@types/react` to be a regular dependency
+- Updated dependencies
+  - @backstage/core-plugin-api@1.6.0-next.0
+  - @backstage/core-components@0.13.5-next.0
+  - @backstage/catalog-model@1.4.1
+  - @backstage/theme@0.4.1
+  - @backstage/plugin-catalog-react@1.8.3-next.0
+
+## 0.5.6
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.13.4
+  - @backstage/plugin-catalog-react@1.8.1
+  - @backstage/core-plugin-api@1.5.3
+  - @backstage/catalog-model@1.4.1
+  - @backstage/theme@0.4.1
+
+## 0.5.6-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.8.1-next.1
+
 ## 0.5.6-next.0
 
 ### Patch Changes
diff --git a/plugins/sentry/api-report.md b/plugins/sentry/api-report.md
index 2a1b041546..43a5caa0bd 100644
--- a/plugins/sentry/api-report.md
+++ b/plugins/sentry/api-report.md
@@ -3,8 +3,6 @@
 > Do not edit this file. It is a report generated by [API Extractor](https://api-extractor.com/).
 
 ```ts
-/// <reference types="react" />
-
 import { ApiRef } from '@backstage/core-plugin-api';
 import { BackstagePlugin } from '@backstage/core-plugin-api';
 import { DiscoveryApi } from '@backstage/core-plugin-api';
@@ -12,13 +10,16 @@ import { Entity } from '@backstage/catalog-model';
 import { IdentityApi } from '@backstage/core-plugin-api';
 import { InfoCardVariants } from '@backstage/core-components';
 import { Options } from '@material-table/core';
+import { default as React_2 } from 'react';
 import { RouteRef } from '@backstage/core-plugin-api';
 
 // @public (undocumented)
-export const EntitySentryCard: (props: SentryPageProps) => JSX.Element;
+export const EntitySentryCard: (props: SentryPageProps) => React_2.JSX.Element;
 
 // @public (undocumented)
-export const EntitySentryContent: (props: SentryPageProps) => JSX.Element;
+export const EntitySentryContent: (
+  props: SentryPageProps,
+) => React_2.JSX.Element;
 
 // @public (undocumented)
 export type EventPoint = number[];
@@ -50,7 +51,7 @@ export class ProductionSentryApi implements SentryApi {
 }
 
 // @public (undocumented)
-export const Router: (props: { entity: Entity }) => JSX.Element;
+export const Router: (props: { entity: Entity }) => React_2.JSX.Element;
 
 // @public (undocumented)
 export interface SentryApi {
@@ -121,7 +122,7 @@ export const SentryIssuesWidget: (props: {
   tableOptions: Options<never>;
   variant?: InfoCardVariants;
   query?: string;
-}) => JSX.Element;
+}) => React_2.JSX.Element;
 
 // @public (undocumented)
 export type SentryPageProps = {
diff --git a/plugins/sentry/catalog-info.yaml b/plugins/sentry/catalog-info.yaml
new file mode 100644
index 0000000000..863361fe4d
--- /dev/null
+++ b/plugins/sentry/catalog-info.yaml
@@ -0,0 +1,10 @@
+apiVersion: backstage.io/v1alpha1
+kind: Component
+metadata:
+  name: backstage-plugin-sentry
+  title: '@backstage/plugin-sentry'
+  description: A Backstage plugin that integrates towards Sentry
+spec:
+  lifecycle: experimental
+  type: backstage-frontend-plugin
+  owner: maintainers
diff --git a/plugins/sentry/package.json b/plugins/sentry/package.json
index c0bc4c1246..978ec6be9f 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.5.6-next.0",
+  "version": "0.5.9-next.2",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
@@ -23,6 +23,7 @@
     "backstage",
     "sentry"
   ],
+  "sideEffects": false,
   "scripts": {
     "build": "backstage-cli package build",
     "start": "backstage-cli package start",
@@ -43,6 +44,7 @@
     "@material-ui/core": "^4.12.2",
     "@material-ui/icons": "^4.9.1",
     "@material-ui/lab": "4.0.0-alpha.61",
+    "@types/react": "^16.13.1 || ^17.0.0",
     "luxon": "^3.0.0",
     "react-sparklines": "^1.7.0",
     "react-use": "^17.2.4"
@@ -62,8 +64,6 @@
     "@testing-library/react": "^12.1.3",
     "@testing-library/user-event": "^14.0.0",
     "@types/luxon": "^3.0.0",
-    "@types/node": "^16.11.26",
-    "@types/react": "^16.13.1 || ^17.0.0",
     "cross-fetch": "^3.1.5",
     "msw": "^1.0.0"
   },
diff --git a/plugins/sentry/src/components/SentryIssuesTable/SentryIssuesTable.test.tsx b/plugins/sentry/src/components/SentryIssuesTable/SentryIssuesTable.test.tsx
index 5bf6b1e92b..6e04e65ef0 100644
--- a/plugins/sentry/src/components/SentryIssuesTable/SentryIssuesTable.test.tsx
+++ b/plugins/sentry/src/components/SentryIssuesTable/SentryIssuesTable.test.tsx
@@ -63,7 +63,7 @@ describe('SentryIssuesTable', () => {
         },
         count: '101',
         userCount: 202,
-        lastSeen: DateTime.now().toISO(),
+        lastSeen: DateTime.now().toISO()!,
       },
     ];
     const table = await renderInTestApp(
diff --git a/plugins/shortcuts/CHANGELOG.md b/plugins/shortcuts/CHANGELOG.md
index af94df1ac4..79d41fd38b 100644
--- a/plugins/shortcuts/CHANGELOG.md
+++ b/plugins/shortcuts/CHANGELOG.md
@@ -1,5 +1,49 @@
 # @backstage/plugin-shortcuts
 
+## 0.3.14-next.2
+
+### Patch Changes
+
+- 8cec7664e146: Removed `@types/node` dependency
+- Updated dependencies
+  - @backstage/core-components@0.13.5-next.2
+  - @backstage/core-plugin-api@1.6.0-next.2
+  - @backstage/theme@0.4.1
+  - @backstage/types@1.1.0
+
+## 0.3.14-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.13.5-next.1
+  - @backstage/core-plugin-api@1.6.0-next.1
+  - @backstage/theme@0.4.1
+  - @backstage/types@1.1.0
+
+## 0.3.14-next.0
+
+### Patch Changes
+
+- 482bb5c0bbf8: Moved `@types/react` to be a regular dependency
+- Updated dependencies
+  - @backstage/core-plugin-api@1.6.0-next.0
+  - @backstage/core-components@0.13.5-next.0
+  - @backstage/theme@0.4.1
+  - @backstage/types@1.1.0
+
+## 0.3.13
+
+### Patch Changes
+
+- 12a8c94eda8d: Add package repository and homepage metadata
+- ee52a48b63d5: Limit the use of the duplicate shortcut name when adding a shortcut
+- Updated dependencies
+  - @backstage/core-components@0.13.4
+  - @backstage/core-plugin-api@1.5.3
+  - @backstage/theme@0.4.1
+  - @backstage/types@1.1.0
+
 ## 0.3.13-next.1
 
 ### Patch Changes
diff --git a/plugins/shortcuts/api-report.md b/plugins/shortcuts/api-report.md
index 471af42374..ae8225d5b5 100644
--- a/plugins/shortcuts/api-report.md
+++ b/plugins/shortcuts/api-report.md
@@ -8,6 +8,7 @@
 import { ApiRef } from '@backstage/core-plugin-api';
 import { BackstagePlugin } from '@backstage/core-plugin-api';
 import { IconComponent } from '@backstage/core-plugin-api';
+import { JSX as JSX_2 } from 'react';
 import { Observable } from '@backstage/types';
 import { Shortcut as Shortcut_2 } from '@backstage/plugin-shortcuts';
 import { ShortcutApi as ShortcutApi_2 } from '@backstage/plugin-shortcuts';
@@ -51,7 +52,7 @@ export interface ShortcutApi {
 }
 
 // @public (undocumented)
-export const Shortcuts: (props: ShortcutsProps) => JSX.Element;
+export const Shortcuts: (props: ShortcutsProps) => JSX_2.Element;
 
 // @public (undocumented)
 export const shortcutsApiRef: ApiRef<ShortcutApi>;
diff --git a/plugins/shortcuts/catalog-info.yaml b/plugins/shortcuts/catalog-info.yaml
new file mode 100644
index 0000000000..cd17d626e6
--- /dev/null
+++ b/plugins/shortcuts/catalog-info.yaml
@@ -0,0 +1,10 @@
+apiVersion: backstage.io/v1alpha1
+kind: Component
+metadata:
+  name: backstage-plugin-shortcuts
+  title: '@backstage/plugin-shortcuts'
+  description: A Backstage plugin that provides a shortcuts feature to the sidebar
+spec:
+  lifecycle: experimental
+  type: backstage-frontend-plugin
+  owner: maintainers
diff --git a/plugins/shortcuts/package.json b/plugins/shortcuts/package.json
index dfd05422ac..8f27dc7e06 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.13-next.1",
+  "version": "0.3.14-next.2",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
@@ -19,6 +19,7 @@
     "url": "https://github.com/backstage/backstage",
     "directory": "plugins/shortcuts"
   },
+  "sideEffects": false,
   "scripts": {
     "build": "backstage-cli package build",
     "start": "backstage-cli package start",
@@ -36,6 +37,7 @@
     "@material-ui/core": "^4.12.2",
     "@material-ui/icons": "^4.9.1",
     "@material-ui/lab": "4.0.0-alpha.61",
+    "@types/react": "^16.13.1 || ^17.0.0",
     "react-hook-form": "^7.12.2",
     "react-use": "^17.2.4",
     "uuid": "^8.3.2",
@@ -55,8 +57,6 @@
     "@testing-library/jest-dom": "^5.10.1",
     "@testing-library/react": "^12.1.3",
     "@testing-library/user-event": "^14.0.0",
-    "@types/node": "^16.11.26",
-    "@types/react": "^16.13.1 || ^17.0.0",
     "@types/zen-observable": "^0.8.2",
     "msw": "^1.0.0"
   },
diff --git a/plugins/shortcuts/src/AddShortcut.test.tsx b/plugins/shortcuts/src/AddShortcut.test.tsx
index f8786e2b24..35f37bc265 100644
--- a/plugins/shortcuts/src/AddShortcut.test.tsx
+++ b/plugins/shortcuts/src/AddShortcut.test.tsx
@@ -17,7 +17,7 @@
 import React from 'react';
 import { screen, fireEvent, waitFor } from '@testing-library/react';
 import { AddShortcut } from './AddShortcut';
-import { DefaultShortcutsApi } from './api';
+import { DefaultShortcutsApi, shortcutsApiRef } from './api';
 import {
   MockAnalyticsApi,
   MockStorageApi,
@@ -42,13 +42,29 @@ describe('AddShortcut', () => {
   });
 
   it('displays the title', async () => {
-    await renderInTestApp(<AddShortcut {...props} />);
+    await renderInTestApp(
+      <TestApiProvider
+        apis={[
+          [shortcutsApiRef, new DefaultShortcutsApi(MockStorageApi.create())],
+        ]}
+      >
+        <AddShortcut {...props} />
+      </TestApiProvider>,
+    );
 
     expect(screen.getByText('Add Shortcut')).toBeInTheDocument();
   });
 
   it('closes the popup', async () => {
-    await renderInTestApp(<AddShortcut {...props} />);
+    await renderInTestApp(
+      <TestApiProvider
+        apis={[
+          [shortcutsApiRef, new DefaultShortcutsApi(MockStorageApi.create())],
+        ]}
+      >
+        <AddShortcut {...props} />
+      </TestApiProvider>,
+    );
 
     fireEvent.click(screen.getByText('Cancel'));
     expect(props.onClose).toHaveBeenCalledTimes(1);
@@ -57,7 +73,15 @@ describe('AddShortcut', () => {
   it('saves the input', async () => {
     const spy = jest.spyOn(api, 'add');
 
-    await renderInTestApp(<AddShortcut {...props} />);
+    await renderInTestApp(
+      <TestApiProvider
+        apis={[
+          [shortcutsApiRef, new DefaultShortcutsApi(MockStorageApi.create())],
+        ]}
+      >
+        <AddShortcut {...props} />
+      </TestApiProvider>,
+    );
 
     const urlInput = screen.getByPlaceholderText('Enter a URL');
     const titleInput = screen.getByPlaceholderText('Enter a display name');
@@ -78,7 +102,12 @@ describe('AddShortcut', () => {
     const spy = jest.spyOn(api, 'add');
 
     await renderInTestApp(
-      <TestApiProvider apis={[[analyticsApiRef, analyticsSpy]]}>
+      <TestApiProvider
+        apis={[
+          [analyticsApiRef, analyticsSpy],
+          [shortcutsApiRef, new DefaultShortcutsApi(MockStorageApi.create())],
+        ]}
+      >
         <AddShortcut {...props} />
       </TestApiProvider>,
     );
@@ -106,9 +135,18 @@ describe('AddShortcut', () => {
   it('pastes the values', async () => {
     const spy = jest.spyOn(api, 'add');
 
-    await renderInTestApp(<AddShortcut {...props} />, {
-      routeEntries: ['/some-initial-url'],
-    });
+    await renderInTestApp(
+      <TestApiProvider
+        apis={[
+          [shortcutsApiRef, new DefaultShortcutsApi(MockStorageApi.create())],
+        ]}
+      >
+        <AddShortcut {...props} />,
+      </TestApiProvider>,
+      {
+        routeEntries: ['/some-initial-url'],
+      },
+    );
 
     fireEvent.click(screen.getByText('Use current page'));
     fireEvent.click(screen.getByText('Save'));
@@ -125,8 +163,14 @@ describe('AddShortcut', () => {
 
     await renderInTestApp(
       <>
-        <AlertDisplay />
-        <AddShortcut {...props} />
+        <TestApiProvider
+          apis={[
+            [shortcutsApiRef, new DefaultShortcutsApi(MockStorageApi.create())],
+          ]}
+        >
+          <AlertDisplay />
+          <AddShortcut {...props} />
+        </TestApiProvider>
       </>,
     );
 
diff --git a/plugins/shortcuts/src/EditShortcut.test.tsx b/plugins/shortcuts/src/EditShortcut.test.tsx
index 72a89c13b6..3077168193 100644
--- a/plugins/shortcuts/src/EditShortcut.test.tsx
+++ b/plugins/shortcuts/src/EditShortcut.test.tsx
@@ -18,7 +18,7 @@ import React from 'react';
 import { screen, fireEvent, waitFor } from '@testing-library/react';
 import { EditShortcut } from './EditShortcut';
 import { Shortcut } from './types';
-import { DefaultShortcutsApi } from './api';
+import { DefaultShortcutsApi, shortcutsApiRef } from './api';
 import {
   MockAnalyticsApi,
   MockStorageApi,
@@ -48,13 +48,29 @@ describe('EditShortcut', () => {
   });
 
   it('displays the title', async () => {
-    await renderInTestApp(<EditShortcut {...props} />);
+    await renderInTestApp(
+      <TestApiProvider
+        apis={[
+          [shortcutsApiRef, new DefaultShortcutsApi(MockStorageApi.create())],
+        ]}
+      >
+        <EditShortcut {...props} />
+      </TestApiProvider>,
+    );
 
     expect(screen.getByText('Edit Shortcut')).toBeInTheDocument();
   });
 
   it('closes the popup', async () => {
-    await renderInTestApp(<EditShortcut {...props} />);
+    await renderInTestApp(
+      <TestApiProvider
+        apis={[
+          [shortcutsApiRef, new DefaultShortcutsApi(MockStorageApi.create())],
+        ]}
+      >
+        <EditShortcut {...props} />
+      </TestApiProvider>,
+    );
 
     fireEvent.click(screen.getByText('Cancel'));
     expect(props.onClose).toHaveBeenCalledTimes(1);
@@ -63,7 +79,15 @@ describe('EditShortcut', () => {
   it('updates the shortcut', async () => {
     const spy = jest.spyOn(api, 'update');
 
-    await renderInTestApp(<EditShortcut {...props} />);
+    await renderInTestApp(
+      <TestApiProvider
+        apis={[
+          [shortcutsApiRef, new DefaultShortcutsApi(MockStorageApi.create())],
+        ]}
+      >
+        <EditShortcut {...props} />
+      </TestApiProvider>,
+    );
 
     const urlInput = screen.getByPlaceholderText('Enter a URL');
     const titleInput = screen.getByPlaceholderText('Enter a display name');
@@ -86,7 +110,12 @@ describe('EditShortcut', () => {
     const spy = jest.spyOn(api, 'update');
 
     await renderInTestApp(
-      <TestApiProvider apis={[[analyticsApiRef, analyticsSpy]]}>
+      <TestApiProvider
+        apis={[
+          [analyticsApiRef, analyticsSpy],
+          [shortcutsApiRef, new DefaultShortcutsApi(MockStorageApi.create())],
+        ]}
+      >
         <EditShortcut {...props} />
       </TestApiProvider>,
     );
@@ -115,7 +144,15 @@ describe('EditShortcut', () => {
   it('removes the shortcut', async () => {
     const spy = jest.spyOn(api, 'remove');
 
-    await renderInTestApp(<EditShortcut {...props} />);
+    await renderInTestApp(
+      <TestApiProvider
+        apis={[
+          [shortcutsApiRef, new DefaultShortcutsApi(MockStorageApi.create())],
+        ]}
+      >
+        <EditShortcut {...props} />
+      </TestApiProvider>,
+    );
 
     fireEvent.click(screen.getByText('Remove'));
     expect(spy).toHaveBeenCalledWith('id');
@@ -132,8 +169,14 @@ describe('EditShortcut', () => {
 
     await renderInTestApp(
       <>
-        <AlertDisplay />
-        <EditShortcut {...props} />
+        <TestApiProvider
+          apis={[
+            [shortcutsApiRef, new DefaultShortcutsApi(MockStorageApi.create())],
+          ]}
+        >
+          <AlertDisplay />
+          <EditShortcut {...props} />
+        </TestApiProvider>
       </>,
     );
 
diff --git a/plugins/shortcuts/src/ShortcutForm.test.tsx b/plugins/shortcuts/src/ShortcutForm.test.tsx
index 3a52356b5d..388c072725 100644
--- a/plugins/shortcuts/src/ShortcutForm.test.tsx
+++ b/plugins/shortcuts/src/ShortcutForm.test.tsx
@@ -16,7 +16,12 @@
 import React from 'react';
 import { screen, fireEvent, waitFor } from '@testing-library/react';
 import { ShortcutForm } from './ShortcutForm';
-import { renderInTestApp } from '@backstage/test-utils';
+import { DefaultShortcutsApi, shortcutsApiRef } from './api';
+import {
+  renderInTestApp,
+  TestApiProvider,
+  MockStorageApi,
+} from '@backstage/test-utils';
 
 describe('ShortcutForm', () => {
   const props = {
@@ -25,7 +30,15 @@ describe('ShortcutForm', () => {
   };
 
   it('displays validation messages', async () => {
-    await renderInTestApp(<ShortcutForm {...props} />);
+    await renderInTestApp(
+      <TestApiProvider
+        apis={[
+          [shortcutsApiRef, new DefaultShortcutsApi(MockStorageApi.create())],
+        ]}
+      >
+        <ShortcutForm {...props} />
+      </TestApiProvider>,
+    );
 
     const urlInput = screen.getByPlaceholderText('Enter a URL');
     const titleInput = screen.getByPlaceholderText('Enter a display name');
@@ -43,8 +56,47 @@ describe('ShortcutForm', () => {
     });
   });
 
+  it('displays duplicate validation messages for title and URL', async () => {
+    const mockShortcutApi = new DefaultShortcutsApi(MockStorageApi.create());
+    mockShortcutApi.add({ title: 'Existing Title', url: '/existing-url' });
+
+    await renderInTestApp(
+      <TestApiProvider apis={[[shortcutsApiRef, mockShortcutApi]]}>
+        <ShortcutForm {...props} />
+      </TestApiProvider>,
+    );
+
+    const urlInput = screen.getByPlaceholderText('Enter a URL');
+    const titleInput = screen.getByPlaceholderText('Enter a display name');
+
+    fireEvent.change(urlInput, { target: { value: '/existing-url' } });
+    fireEvent.change(titleInput, { target: { value: 'Existing Title' } });
+
+    fireEvent.click(screen.getByText('Save'));
+
+    await waitFor(() => {
+      expect(
+        screen.getByText('A shortcut with this title already exists'),
+      ).toBeInTheDocument();
+      expect(
+        screen.getByText('A shortcut with this url already exists'),
+      ).toBeInTheDocument();
+    });
+
+    expect(props.onSave).not.toHaveBeenCalled();
+    expect(props.onClose).not.toHaveBeenCalled();
+  });
+
   it('allows external links', async () => {
-    await renderInTestApp(<ShortcutForm allowExternalLinks {...props} />);
+    await renderInTestApp(
+      <TestApiProvider
+        apis={[
+          [shortcutsApiRef, new DefaultShortcutsApi(MockStorageApi.create())],
+        ]}
+      >
+        <ShortcutForm allowExternalLinks {...props} />
+      </TestApiProvider>,
+    );
 
     const urlInput = screen.getByPlaceholderText('Enter a URL');
     const titleInput = screen.getByPlaceholderText('Enter a display name');
@@ -66,7 +118,15 @@ describe('ShortcutForm', () => {
   });
 
   it('allows relative links when external links are enabled', async () => {
-    await renderInTestApp(<ShortcutForm allowExternalLinks {...props} />);
+    await renderInTestApp(
+      <TestApiProvider
+        apis={[
+          [shortcutsApiRef, new DefaultShortcutsApi(MockStorageApi.create())],
+        ]}
+      >
+        <ShortcutForm allowExternalLinks {...props} />
+      </TestApiProvider>,
+    );
 
     const urlInput = screen.getByPlaceholderText('Enter a URL');
     const titleInput = screen.getByPlaceholderText('Enter a display name');
@@ -89,10 +149,17 @@ describe('ShortcutForm', () => {
 
   it('calls the save handler', async () => {
     await renderInTestApp(
-      <ShortcutForm
-        {...props}
-        formValues={{ url: '/some-url', title: 'some title' }}
-      />,
+      <TestApiProvider
+        apis={[
+          [shortcutsApiRef, new DefaultShortcutsApi(MockStorageApi.create())],
+        ]}
+      >
+        <ShortcutForm
+          {...props}
+          formValues={{ url: '/some-url', title: 'some title' }}
+        />
+        ,
+      </TestApiProvider>,
     );
 
     fireEvent.click(screen.getByText('Save'));
@@ -105,7 +172,15 @@ describe('ShortcutForm', () => {
   });
 
   it('calls the close handler', async () => {
-    await renderInTestApp(<ShortcutForm {...props} />);
+    await renderInTestApp(
+      <TestApiProvider
+        apis={[
+          [shortcutsApiRef, new DefaultShortcutsApi(MockStorageApi.create())],
+        ]}
+      >
+        <ShortcutForm {...props} />
+      </TestApiProvider>,
+    );
 
     fireEvent.click(screen.getByText('Cancel'));
     await waitFor(() => {
diff --git a/plugins/shortcuts/src/ShortcutForm.tsx b/plugins/shortcuts/src/ShortcutForm.tsx
index 99aa0d29b7..e8cd8144d0 100644
--- a/plugins/shortcuts/src/ShortcutForm.tsx
+++ b/plugins/shortcuts/src/ShortcutForm.tsx
@@ -15,6 +15,7 @@
  */
 
 import React, { useEffect } from 'react';
+import useObservable from 'react-use/lib/useObservable';
 import { useForm, SubmitHandler, Controller } from 'react-hook-form';
 import {
   Button,
@@ -24,6 +25,8 @@ import {
   TextField,
 } from '@material-ui/core';
 import { FormValues } from './types';
+import { shortcutsApiRef } from './api';
+import { useApi } from '@backstage/core-plugin-api';
 
 const useStyles = makeStyles(theme => ({
   field: {
@@ -50,6 +53,11 @@ export const ShortcutForm = ({
   allowExternalLinks,
 }: Props) => {
   const classes = useStyles();
+  const shortcutApi = useApi(shortcutsApiRef);
+  const shortcutData = useObservable(
+    shortcutApi.shortcut$(),
+    shortcutApi.get(),
+  );
   const {
     handleSubmit,
     reset,
@@ -63,6 +71,18 @@ export const ShortcutForm = ({
     },
   });
 
+  const titleIsUnique = (title: string) => {
+    if (shortcutData.some(shortcutTitle => shortcutTitle.title === title))
+      return 'A shortcut with this title already exists';
+    return true;
+  };
+
+  const urlIsUnique = (url: string) => {
+    if (shortcutData.some(shortcutUrl => shortcutUrl.url === url))
+      return 'A shortcut with this url already exists';
+    return true;
+  };
+
   useEffect(() => {
     reset(formValues);
   }, [reset, formValues]);
@@ -75,6 +95,7 @@ export const ShortcutForm = ({
           control={control}
           rules={{
             required: true,
+            validate: urlIsUnique,
             ...(allowExternalLinks
               ? {
                   pattern: {
@@ -112,6 +133,7 @@ export const ShortcutForm = ({
           control={control}
           rules={{
             required: true,
+            validate: titleIsUnique,
             minLength: {
               value: 2,
               message: 'Must be at least 2 characters',
diff --git a/plugins/sonarqube-backend/CHANGELOG.md b/plugins/sonarqube-backend/CHANGELOG.md
index 3ef87ad9d1..48305bc1f0 100644
--- a/plugins/sonarqube-backend/CHANGELOG.md
+++ b/plugins/sonarqube-backend/CHANGELOG.md
@@ -1,5 +1,50 @@
 # @backstage/plugin-sonarqube-backend
 
+## 0.2.5-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config@1.1.0-next.1
+  - @backstage/backend-common@0.19.5-next.2
+  - @backstage/errors@1.2.1
+
+## 0.2.5-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config@1.1.0-next.0
+  - @backstage/backend-common@0.19.5-next.1
+  - @backstage/errors@1.2.1
+
+## 0.2.4-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.19.4-next.0
+  - @backstage/config@1.0.8
+  - @backstage/errors@1.2.1
+
+## 0.2.2
+
+### Patch Changes
+
+- 12a8c94eda8d: Add package repository and homepage metadata
+- a24d9df8757c: Added optional `externalBaseUrl` config for setting a different frontend URL
+- Updated dependencies
+  - @backstage/backend-common@0.19.2
+  - @backstage/config@1.0.8
+  - @backstage/errors@1.2.1
+
+## 0.2.2-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.19.2-next.2
+
 ## 0.2.2-next.1
 
 ### Patch Changes
diff --git a/plugins/sonarqube-backend/README.md b/plugins/sonarqube-backend/README.md
index 4d16dce025..b417fea7c4 100644
--- a/plugins/sonarqube-backend/README.md
+++ b/plugins/sonarqube-backend/README.md
@@ -138,6 +138,34 @@ sonarqube:
       apiKey: abcdef0123456789abcedf0123456789ab
 ```
 
+#### Example - Different frontend and backend URLs
+
+In some instances, you might want to use one URL for the backend and another for the frontend.
+This can be achieved by using the optional `externalBaseUrl` property in the config.
+
+##### Single instance config
+
+```yaml
+sonarqube:
+  baseUrl: https://sonarqube-internal.example.com
+  externalBaseUrl: https://sonarqube.example.com
+  apiKey: 123456789abcdef0123456789abcedf012
+```
+
+##### Multiple instance config
+
+```yaml
+sonarqube:
+  instances:
+    - name: default
+      baseUrl: https://default-sonarqube-internal.example.com
+      externalBaseUrl: https://default-sonarqube.example.com
+      apiKey: 123456789abcdef0123456789abcedf012
+    - name: specialProject
+      baseUrl: https://special-project-sonarqube.example.com
+      apiKey: abcdef0123456789abcedf0123456789ab
+```
+
 ## Links
 
 - [Sonarqube Frontend](../sonarqube/README.md)
diff --git a/plugins/sonarqube-backend/api-report.md b/plugins/sonarqube-backend/api-report.md
index 0fbd463cf3..535db37185 100644
--- a/plugins/sonarqube-backend/api-report.md
+++ b/plugins/sonarqube-backend/api-report.md
@@ -15,6 +15,7 @@ export class DefaultSonarqubeInfoProvider implements SonarqubeInfoProvider {
   static fromConfig(config: Config): DefaultSonarqubeInfoProvider;
   getBaseUrl(options?: { instanceName?: string }): {
     baseUrl: string;
+    externalBaseUrl?: string;
   };
   getFindings(options: {
     componentKey: string;
@@ -49,6 +50,7 @@ export interface SonarqubeFindings {
 export interface SonarqubeInfoProvider {
   getBaseUrl(options?: { instanceName?: string }): {
     baseUrl: string;
+    externalBaseUrl?: string;
   };
   getFindings(options: {
     componentKey: string;
@@ -60,6 +62,7 @@ export interface SonarqubeInfoProvider {
 export interface SonarqubeInstanceConfig {
   apiKey: string;
   baseUrl: string;
+  externalBaseUrl?: string;
   name: string;
 }
 
diff --git a/plugins/sonarqube-backend/catalog-info.yaml b/plugins/sonarqube-backend/catalog-info.yaml
new file mode 100644
index 0000000000..5609e72120
--- /dev/null
+++ b/plugins/sonarqube-backend/catalog-info.yaml
@@ -0,0 +1,9 @@
+apiVersion: backstage.io/v1alpha1
+kind: Component
+metadata:
+  name: backstage-plugin-sonarqube-backend
+  title: '@backstage/plugin-sonarqube-backend'
+spec:
+  lifecycle: experimental
+  type: backstage-backend-plugin
+  owner: maintainers
diff --git a/plugins/sonarqube-backend/config.d.ts b/plugins/sonarqube-backend/config.d.ts
index 7e93f61eb4..6e03a53f0c 100644
--- a/plugins/sonarqube-backend/config.d.ts
+++ b/plugins/sonarqube-backend/config.d.ts
@@ -23,6 +23,13 @@ export interface Config {
      */
     baseUrl?: string;
 
+    /**
+     * The external url of the sonarqube installation.
+     * Use this if you want to use a different url for the frontend than the backend.
+     * @visibility frontend
+     */
+    externalBaseUrl?: string;
+
     /**
      * The api key to access the sonarqube instance under baseUrl.
      * @visibility secret
@@ -46,6 +53,13 @@ export interface Config {
        */
       baseUrl: string;
 
+      /**
+       * The external url of the sonarqube instance.
+       * Use this if you want to use a different url for the frontend than the backend.
+       * @visibility frontend
+       */
+      externalBaseUrl?: string;
+
       /**
        * The api key to access the sonarqube instance.
        * @visibility secret
diff --git a/plugins/sonarqube-backend/package.json b/plugins/sonarqube-backend/package.json
index 2df0d1fd71..0b0c7f7257 100644
--- a/plugins/sonarqube-backend/package.json
+++ b/plugins/sonarqube-backend/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-sonarqube-backend",
-  "version": "0.2.2-next.1",
+  "version": "0.2.5-next.2",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
diff --git a/plugins/sonarqube-backend/src/service/router.test.ts b/plugins/sonarqube-backend/src/service/router.test.ts
index 7045cdf0d2..b40e2d1528 100644
--- a/plugins/sonarqube-backend/src/service/router.test.ts
+++ b/plugins/sonarqube-backend/src/service/router.test.ts
@@ -24,7 +24,7 @@ import { SonarqubeFindings } from './sonarqubeInfoProvider';
 describe('createRouter', () => {
   let app: express.Express;
   const getBaseUrlMock: jest.Mock<
-    { baseUrl: string },
+    { baseUrl: string; externalBaseUrl?: string },
     [{ instanceName: string }]
   > = jest.fn();
   const getFindingsMock: jest.Mock<
@@ -55,6 +55,7 @@ describe('createRouter', () => {
   describe('GET /findings', () => {
     const DUMMY_COMPONENT_KEY = 'my:component';
     const DUMMY_INSTANCE_KEY = 'myInstance';
+
     it('returns ok', async () => {
       const measures = {
         analysisDate: '2022-01-01T00:00:00Z',
@@ -77,6 +78,7 @@ describe('createRouter', () => {
       expect(response.status).toEqual(200);
       expect(response.body).toEqual(measures);
     });
+
     it('returns an error when component key is not defined', async () => {
       const response = await request(app)
         .get('/findings')
@@ -112,9 +114,12 @@ describe('createRouter', () => {
       expect(response.body).toEqual(measures);
     });
   });
+
   describe('GET /instanceUrl', () => {
     const DUMMY_INSTANCE_KEY = 'myInstance';
-    const DUMMY_INSTANCE_URL = 'http://sonarqube.example.com';
+    const DUMMY_INSTANCE_URL = 'http://sonarqube-internal.example.com';
+    const DUMMY_INSTANCE_EXTERNAL_URL = 'http://sonarqube.example.com';
+
     it('returns ok', async () => {
       getBaseUrlMock.mockReturnValue({ baseUrl: DUMMY_INSTANCE_URL });
       const response = await request(app)
@@ -141,5 +146,17 @@ describe('createRouter', () => {
       expect(response.status).toEqual(200);
       expect(response.body).toEqual({ instanceUrl: DUMMY_INSTANCE_URL });
     });
+
+    it('returns the external base url when provided', async () => {
+      getBaseUrlMock.mockReturnValue({
+        baseUrl: DUMMY_INSTANCE_URL,
+        externalBaseUrl: DUMMY_INSTANCE_EXTERNAL_URL,
+      });
+      const response = await request(app).get('/instanceUrl').send();
+      expect(response.status).toEqual(200);
+      expect(response.body).toEqual({
+        instanceUrl: DUMMY_INSTANCE_EXTERNAL_URL,
+      });
+    });
   });
 });
diff --git a/plugins/sonarqube-backend/src/service/router.ts b/plugins/sonarqube-backend/src/service/router.ts
index f244ae5ce3..5a993b5d59 100644
--- a/plugins/sonarqube-backend/src/service/router.ts
+++ b/plugins/sonarqube-backend/src/service/router.ts
@@ -81,11 +81,11 @@ export async function createRouter(
         ? `Retrieving sonarqube instance URL for key ${instanceKey}`
         : `Retrieving default sonarqube instance URL as instanceKey is not provided`,
     );
-    const { baseUrl } = sonarqubeInfoProvider.getBaseUrl({
+    const { baseUrl, externalBaseUrl } = sonarqubeInfoProvider.getBaseUrl({
       instanceName: instanceKey,
     });
     response.json({
-      instanceUrl: baseUrl,
+      instanceUrl: externalBaseUrl || baseUrl,
     });
   });
 
diff --git a/plugins/sonarqube-backend/src/service/sonarqubeInfoProvider.test.ts b/plugins/sonarqube-backend/src/service/sonarqubeInfoProvider.test.ts
index 72ab2ecee2..468020c1b3 100644
--- a/plugins/sonarqube-backend/src/service/sonarqubeInfoProvider.test.ts
+++ b/plugins/sonarqube-backend/src/service/sonarqubeInfoProvider.test.ts
@@ -27,6 +27,7 @@ describe('SonarqubeConfig', () => {
   const SONARQUBE_DEFAULT_INSTANCE_NAME = 'default';
   const DUMMY_SONAR_URL = 'https://sonarqube.example.com';
   const DUMMY_SONAR_APIKEY = '123456789abcdef0123456789abcedf012';
+
   const DUMMY_SIMPLE_OBJECT_FOR_DEFAULT_SONARQUBE_CONFIG = {
     name: SONARQUBE_DEFAULT_INSTANCE_NAME,
     baseUrl: DUMMY_SONAR_URL,
@@ -112,6 +113,7 @@ describe('SonarqubeConfig', () => {
         },
       ]);
     });
+
     it('Throw an error if both a named default config and top level config', async () => {
       expect(() =>
         SonarqubeConfig.fromConfig(
@@ -299,6 +301,46 @@ describe('DefaultSonarqubeInfoProvider', () => {
         baseUrl: 'https://sonarqube-other.example.com',
       });
     });
+
+    it('Provide external base url for simple config', async () => {
+      const provider = configureProvider({
+        sonarqube: {
+          baseUrl: 'https://sonarqube-internal.example.com',
+          externalBaseUrl: 'https://sonarqube.example.com',
+          apiKey: '123456789abcdef0123456789abcedf012',
+        },
+      });
+
+      expect(provider.getBaseUrl()).toEqual({
+        baseUrl: 'https://sonarqube-internal.example.com',
+        externalBaseUrl: 'https://sonarqube.example.com',
+      });
+    });
+
+    it('Provide external base url for named config', async () => {
+      const provider = configureProvider({
+        sonarqube: {
+          instances: [
+            {
+              name: 'default',
+              baseUrl: 'https://sonarqube.example.com',
+              apiKey: '123456789abcdef0123456789abcedf012',
+            },
+            {
+              name: 'other',
+              baseUrl: 'https://sonarqube-other-internal.example.com',
+              externalBaseUrl: 'https://sonarqube-other.example.com',
+              apiKey: '123456789abcdef0123456789abcedf012',
+            },
+          ],
+        },
+      });
+
+      expect(provider.getBaseUrl({ instanceName: 'other' })).toEqual({
+        baseUrl: 'https://sonarqube-other-internal.example.com',
+        externalBaseUrl: 'https://sonarqube-other.example.com',
+      });
+    });
   });
 
   describe('getFindings', () => {
@@ -385,6 +427,7 @@ describe('DefaultSonarqubeInfoProvider', () => {
         apiKey: DUMMY_API_KEY,
       },
     };
+
     it('Provide findings when everything is ok', async () => {
       setupHandlers();
       const provider = configureProvider(DUMMY_SIMPLE_CONFIG_FOR_PROVIDER);
diff --git a/plugins/sonarqube-backend/src/service/sonarqubeInfoProvider.ts b/plugins/sonarqube-backend/src/service/sonarqubeInfoProvider.ts
index 2b96e6764e..a5c0bf985a 100644
--- a/plugins/sonarqube-backend/src/service/sonarqubeInfoProvider.ts
+++ b/plugins/sonarqube-backend/src/service/sonarqubeInfoProvider.ts
@@ -30,7 +30,10 @@ export interface SonarqubeInfoProvider {
    * @param instanceName - Name of the sonarqube instance to get the info from
    * @returns the url of the instance
    */
-  getBaseUrl(options?: { instanceName?: string }): { baseUrl: string };
+  getBaseUrl(options?: { instanceName?: string }): {
+    baseUrl: string;
+    externalBaseUrl?: string;
+  };
 
   /**
    * Query the sonarqube instance corresponding to the instanceName to get all
@@ -96,6 +99,10 @@ export interface SonarqubeInstanceConfig {
    * Base url to access the instance
    */
   baseUrl: string;
+  /**
+   * External url to access the instance from the frontend
+   */
+  externalBaseUrl?: string;
   /**
    * Access token to access the sonarqube instance as generated in user profile.
    */
@@ -132,6 +139,7 @@ export class SonarqubeConfig {
       sonarqubeConfig.getOptionalConfigArray('instances')?.map(c => ({
         name: c.getString('name'),
         baseUrl: c.getString('baseUrl'),
+        externalBaseUrl: c.getOptionalString('externalBaseUrl'),
         apiKey: c.getString('apiKey'),
       })) || [];
 
@@ -142,9 +150,11 @@ export class SonarqubeConfig {
 
     // Get these as optional strings and check to give a better error message
     const baseUrl = sonarqubeConfig.getOptionalString('baseUrl');
+    const externalBaseUrl =
+      sonarqubeConfig.getOptionalString('externalBaseUrl');
     const apiKey = sonarqubeConfig.getOptionalString('apiKey');
 
-    if (hasNamedDefault && (baseUrl || apiKey)) {
+    if (hasNamedDefault && (baseUrl || externalBaseUrl || apiKey)) {
       throw new Error(
         `Found both a named sonarqube instance with name ${DEFAULT_SONARQUBE_NAME} and top level baseUrl or apiKey config. Use only one style of config.`,
       );
@@ -160,10 +170,11 @@ export class SonarqubeConfig {
 
     if (unnamedAllPresent) {
       const unnamedInstanceConfig = [
-        { name: DEFAULT_SONARQUBE_NAME, baseUrl, apiKey },
+        { name: DEFAULT_SONARQUBE_NAME, baseUrl, externalBaseUrl, apiKey },
       ] as {
         name: string;
         baseUrl: string;
+        externalBaseUrl?: string;
         apiKey: string;
       }[];
 
@@ -303,11 +314,15 @@ export class DefaultSonarqubeInfoProvider implements SonarqubeInfoProvider {
    */
   getBaseUrl(options: { instanceName?: string } = {}): {
     baseUrl: string;
+    externalBaseUrl?: string;
   } {
     const instanceConfig = this.config.getInstanceConfig({
       sonarqubeName: options.instanceName,
     });
-    return { baseUrl: instanceConfig.baseUrl };
+    return {
+      baseUrl: instanceConfig.baseUrl,
+      externalBaseUrl: instanceConfig.externalBaseUrl,
+    };
   }
 
   /**
diff --git a/plugins/sonarqube-react/CHANGELOG.md b/plugins/sonarqube-react/CHANGELOG.md
index 6d7feafaae..d0ac62b473 100644
--- a/plugins/sonarqube-react/CHANGELOG.md
+++ b/plugins/sonarqube-react/CHANGELOG.md
@@ -1,5 +1,29 @@
 # @backstage/plugin-sonarqube-react
 
+## 0.1.8-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-plugin-api@1.6.0-next.2
+  - @backstage/catalog-model@1.4.2-next.1
+
+## 0.1.8-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/catalog-model@1.4.2-next.0
+  - @backstage/core-plugin-api@1.6.0-next.1
+
+## 0.1.8-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-plugin-api@1.6.0-next.0
+  - @backstage/catalog-model@1.4.1
+
 ## 0.1.7
 
 ### Patch Changes
diff --git a/plugins/sonarqube-react/catalog-info.yaml b/plugins/sonarqube-react/catalog-info.yaml
new file mode 100644
index 0000000000..abcae8a465
--- /dev/null
+++ b/plugins/sonarqube-react/catalog-info.yaml
@@ -0,0 +1,9 @@
+apiVersion: backstage.io/v1alpha1
+kind: Component
+metadata:
+  name: backstage-plugin-sonarqube-react
+  title: '@backstage/plugin-sonarqube-react'
+spec:
+  lifecycle: experimental
+  type: backstage-web-library
+  owner: maintainers
diff --git a/plugins/sonarqube-react/package.json b/plugins/sonarqube-react/package.json
index 34b457d5be..904dddfd2c 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.7",
+  "version": "0.1.8-next.2",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
@@ -30,6 +30,7 @@
   "keywords": [
     "backstage"
   ],
+  "sideEffects": false,
   "scripts": {
     "build": "backstage-cli package build",
     "lint": "backstage-cli package lint",
diff --git a/plugins/sonarqube/CHANGELOG.md b/plugins/sonarqube/CHANGELOG.md
index 59b6e51883..bd9b50157f 100644
--- a/plugins/sonarqube/CHANGELOG.md
+++ b/plugins/sonarqube/CHANGELOG.md
@@ -1,5 +1,64 @@
 # @backstage/plugin-sonarqube
 
+## 0.7.5-next.2
+
+### Patch Changes
+
+- 8cec7664e146: Removed `@types/node` dependency
+- db92d1244897: Updated dependency `rc-progress` to `3.5.1`.
+- Updated dependencies
+  - @backstage/core-components@0.13.5-next.2
+  - @backstage/core-plugin-api@1.6.0-next.2
+  - @backstage/plugin-catalog-react@1.8.4-next.2
+  - @backstage/plugin-sonarqube-react@0.1.8-next.2
+  - @backstage/catalog-model@1.4.2-next.1
+  - @backstage/theme@0.4.1
+
+## 0.7.5-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.8.4-next.1
+  - @backstage/core-components@0.13.5-next.1
+  - @backstage/catalog-model@1.4.2-next.0
+  - @backstage/core-plugin-api@1.6.0-next.1
+  - @backstage/plugin-sonarqube-react@0.1.8-next.1
+  - @backstage/theme@0.4.1
+
+## 0.7.4-next.0
+
+### Patch Changes
+
+- 482bb5c0bbf8: Moved `@types/react` to be a regular dependency
+- Updated dependencies
+  - @backstage/core-plugin-api@1.6.0-next.0
+  - @backstage/core-components@0.13.5-next.0
+  - @backstage/catalog-model@1.4.1
+  - @backstage/theme@0.4.1
+  - @backstage/plugin-catalog-react@1.8.3-next.0
+  - @backstage/plugin-sonarqube-react@0.1.8-next.0
+
+## 0.7.2
+
+### Patch Changes
+
+- b2ccddefbdc6: Remove sonarQube card disable class
+- Updated dependencies
+  - @backstage/core-components@0.13.4
+  - @backstage/plugin-catalog-react@1.8.1
+  - @backstage/core-plugin-api@1.5.3
+  - @backstage/catalog-model@1.4.1
+  - @backstage/theme@0.4.1
+  - @backstage/plugin-sonarqube-react@0.1.7
+
+## 0.7.2-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.8.1-next.1
+
 ## 0.7.2-next.1
 
 ### Patch Changes
diff --git a/plugins/sonarqube/api-report.md b/plugins/sonarqube/api-report.md
index dbad00c468..72f2eb1c09 100644
--- a/plugins/sonarqube/api-report.md
+++ b/plugins/sonarqube/api-report.md
@@ -11,6 +11,8 @@ 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 { JSX as JSX_2 } from 'react';
+import { default as React_2 } from 'react';
 import { SonarQubeApi } from '@backstage/plugin-sonarqube-react';
 
 // @public (undocumented)
@@ -23,12 +25,12 @@ export type DuplicationRating = {
 export const EntitySonarQubeCard: (props: {
   variant?: InfoCardVariants | undefined;
   duplicationRatings?: DuplicationRating[] | undefined;
-}) => JSX.Element;
+}) => JSX_2.Element;
 
 // @public (undocumented)
 export const EntitySonarQubeContentPage: (
   props: SonarQubeContentPageProps,
-) => JSX.Element;
+) => JSX_2.Element;
 
 // @public @deprecated (undocumented)
 export const isSonarQubeAvailable: (entity: Entity) => boolean;
@@ -40,7 +42,7 @@ export const SONARQUBE_PROJECT_KEY_ANNOTATION = 'sonarqube.org/project-key';
 export const SonarQubeCard: (props: {
   variant?: InfoCardVariants;
   duplicationRatings?: DuplicationRating[];
-}) => JSX.Element;
+}) => React_2.JSX.Element;
 
 // @public (undocumented)
 export class SonarQubeClient implements SonarQubeApi {
diff --git a/plugins/sonarqube/catalog-info.yaml b/plugins/sonarqube/catalog-info.yaml
new file mode 100644
index 0000000000..19cc481e93
--- /dev/null
+++ b/plugins/sonarqube/catalog-info.yaml
@@ -0,0 +1,9 @@
+apiVersion: backstage.io/v1alpha1
+kind: Component
+metadata:
+  name: backstage-plugin-sonarqube
+  title: '@backstage/plugin-sonarqube'
+spec:
+  lifecycle: experimental
+  type: backstage-frontend-plugin
+  owner: sda-se-reviewers
diff --git a/plugins/sonarqube/package.json b/plugins/sonarqube/package.json
index ed3bc6142e..77a25900e5 100644
--- a/plugins/sonarqube/package.json
+++ b/plugins/sonarqube/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@backstage/plugin-sonarqube",
   "description": "",
-  "version": "0.7.2-next.1",
+  "version": "0.7.5-next.2",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
@@ -25,6 +25,7 @@
     "sonarqube",
     "sonarcloud"
   ],
+  "sideEffects": false,
   "scripts": {
     "build": "backstage-cli package build --experimental-type-build",
     "start": "backstage-cli package start",
@@ -45,9 +46,10 @@
     "@material-ui/icons": "^4.9.1",
     "@material-ui/lab": "4.0.0-alpha.61",
     "@material-ui/styles": "^4.10.0",
+    "@types/react": "^16.13.1 || ^17.0.0",
     "cross-fetch": "^3.1.5",
     "luxon": "^3.0.0",
-    "rc-progress": "3.4.2",
+    "rc-progress": "3.5.1",
     "react-use": "^17.2.4"
   },
   "peerDependencies": {
@@ -64,8 +66,6 @@
     "@testing-library/jest-dom": "^5.10.1",
     "@testing-library/react": "^12.1.3",
     "@testing-library/user-event": "^14.0.0",
-    "@types/node": "^16.11.26",
-    "@types/react": "^16.13.1 || ^17.0.0",
     "msw": "^1.0.0"
   },
   "files": [
diff --git a/plugins/splunk-on-call/CHANGELOG.md b/plugins/splunk-on-call/CHANGELOG.md
index 3d6ec3088f..2f54bb26d2 100644
--- a/plugins/splunk-on-call/CHANGELOG.md
+++ b/plugins/splunk-on-call/CHANGELOG.md
@@ -1,5 +1,59 @@
 # @backstage/plugin-splunk-on-call
 
+## 0.4.13-next.2
+
+### Patch Changes
+
+- 8cec7664e146: Removed `@types/node` dependency
+- Updated dependencies
+  - @backstage/core-components@0.13.5-next.2
+  - @backstage/core-plugin-api@1.6.0-next.2
+  - @backstage/plugin-catalog-react@1.8.4-next.2
+  - @backstage/catalog-model@1.4.2-next.1
+  - @backstage/theme@0.4.1
+
+## 0.4.13-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.8.4-next.1
+  - @backstage/core-components@0.13.5-next.1
+  - @backstage/catalog-model@1.4.2-next.0
+  - @backstage/core-plugin-api@1.6.0-next.1
+  - @backstage/theme@0.4.1
+
+## 0.4.12-next.0
+
+### Patch Changes
+
+- 482bb5c0bbf8: Moved `@types/react` to be a regular dependency
+- Updated dependencies
+  - @backstage/core-plugin-api@1.6.0-next.0
+  - @backstage/core-components@0.13.5-next.0
+  - @backstage/catalog-model@1.4.1
+  - @backstage/theme@0.4.1
+  - @backstage/plugin-catalog-react@1.8.3-next.0
+
+## 0.4.10
+
+### Patch Changes
+
+- 3d86be999fdf: Prefer simple `theme.spacing` without string interpolation
+- Updated dependencies
+  - @backstage/core-components@0.13.4
+  - @backstage/plugin-catalog-react@1.8.1
+  - @backstage/core-plugin-api@1.5.3
+  - @backstage/catalog-model@1.4.1
+  - @backstage/theme@0.4.1
+
+## 0.4.10-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.8.1-next.1
+
 ## 0.4.10-next.0
 
 ### Patch Changes
diff --git a/plugins/splunk-on-call/api-report.md b/plugins/splunk-on-call/api-report.md
index f62d7ad95a..4c054e8a1a 100644
--- a/plugins/splunk-on-call/api-report.md
+++ b/plugins/splunk-on-call/api-report.md
@@ -10,6 +10,7 @@ import { BackstagePlugin } from '@backstage/core-plugin-api';
 import { ConfigApi } from '@backstage/core-plugin-api';
 import { DiscoveryApi } from '@backstage/core-plugin-api';
 import { Entity } from '@backstage/catalog-model';
+import { JSX as JSX_2 } from 'react';
 import { RouteRef } from '@backstage/core-plugin-api';
 
 // @public (undocumented)
@@ -21,7 +22,7 @@ export type ClientApiConfig = {
 // @public (undocumented)
 export const EntitySplunkOnCallCard: (
   props: EntitySplunkOnCallCardProps,
-) => JSX.Element;
+) => JSX_2.Element;
 
 // @public (undocumented)
 export type EntitySplunkOnCallCardProps = {
diff --git a/plugins/splunk-on-call/catalog-info.yaml b/plugins/splunk-on-call/catalog-info.yaml
new file mode 100644
index 0000000000..8c41ec7165
--- /dev/null
+++ b/plugins/splunk-on-call/catalog-info.yaml
@@ -0,0 +1,10 @@
+apiVersion: backstage.io/v1alpha1
+kind: Component
+metadata:
+  name: backstage-plugin-splunk-on-call
+  title: '@backstage/plugin-splunk-on-call'
+  description: A Backstage plugin that integrates towards Splunk On-Call
+spec:
+  lifecycle: experimental
+  type: backstage-frontend-plugin
+  owner: maintainers
diff --git a/plugins/splunk-on-call/package.json b/plugins/splunk-on-call/package.json
index fb39c0da1a..7cd06f330f 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.10-next.0",
+  "version": "0.4.13-next.2",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
@@ -23,6 +23,7 @@
     "backstage",
     "splunk-on-call"
   ],
+  "sideEffects": false,
   "scripts": {
     "build": "backstage-cli package build",
     "start": "backstage-cli package start",
@@ -41,6 +42,7 @@
     "@material-ui/core": "^4.12.2",
     "@material-ui/icons": "^4.9.1",
     "@material-ui/lab": "4.0.0-alpha.61",
+    "@types/react": "^16.13.1 || ^17.0.0",
     "classnames": "^2.2.6",
     "luxon": "^3.0.0",
     "react-use": "^17.2.4"
@@ -60,8 +62,6 @@
     "@testing-library/react": "^12.1.3",
     "@testing-library/user-event": "^14.0.0",
     "@types/luxon": "^3.0.0",
-    "@types/node": "^16.11.26",
-    "@types/react": "^16.13.1 || ^17.0.0",
     "msw": "^1.0.0"
   },
   "configSchema": "config.d.ts",
diff --git a/plugins/stack-overflow-backend/CHANGELOG.md b/plugins/stack-overflow-backend/CHANGELOG.md
index aa16d5b8d4..c94ffbe6d9 100644
--- a/plugins/stack-overflow-backend/CHANGELOG.md
+++ b/plugins/stack-overflow-backend/CHANGELOG.md
@@ -1,5 +1,48 @@
 # @backstage/plugin-stack-overflow-backend
 
+## 0.2.7-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config@1.1.0-next.1
+  - @backstage/backend-common@0.19.5-next.2
+  - @backstage/plugin-search-common@1.2.6-next.1
+
+## 0.2.7-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config@1.1.0-next.0
+  - @backstage/backend-common@0.19.5-next.1
+  - @backstage/plugin-search-common@1.2.6-next.0
+
+## 0.2.6-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.19.4-next.0
+  - @backstage/config@1.0.8
+  - @backstage/plugin-search-common@1.2.5
+
+## 0.2.4
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.19.2
+  - @backstage/config@1.0.8
+  - @backstage/plugin-search-common@1.2.5
+
+## 0.2.4-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.19.2-next.2
+
 ## 0.2.4-next.1
 
 ### Patch Changes
diff --git a/plugins/stack-overflow-backend/catalog-info.yaml b/plugins/stack-overflow-backend/catalog-info.yaml
new file mode 100644
index 0000000000..797f2c857f
--- /dev/null
+++ b/plugins/stack-overflow-backend/catalog-info.yaml
@@ -0,0 +1,9 @@
+apiVersion: backstage.io/v1alpha1
+kind: Component
+metadata:
+  name: backstage-plugin-stack-overflow-backend
+  title: '@backstage/plugin-stack-overflow-backend'
+spec:
+  lifecycle: experimental
+  type: backstage-backend-plugin
+  owner: discoverability-maintainers
diff --git a/plugins/stack-overflow-backend/package.json b/plugins/stack-overflow-backend/package.json
index c2fbc85def..371a0929d5 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.2.4-next.1",
+  "version": "0.2.7-next.2",
   "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 c6fc25e2b9..9ef51f0c83 100644
--- a/plugins/stack-overflow/CHANGELOG.md
+++ b/plugins/stack-overflow/CHANGELOG.md
@@ -1,5 +1,59 @@
 # @backstage/plugin-stack-overflow
 
+## 0.1.20-next.2
+
+### Patch Changes
+
+- 8cec7664e146: Removed `@types/node` dependency
+- Updated dependencies
+  - @backstage/core-components@0.13.5-next.2
+  - @backstage/core-plugin-api@1.6.0-next.2
+  - @backstage/plugin-home-react@0.1.3-next.2
+  - @backstage/config@1.1.0-next.1
+  - @backstage/plugin-search-react@1.7.0-next.2
+  - @backstage/theme@0.4.1
+  - @backstage/plugin-search-common@1.2.6-next.1
+
+## 0.1.20-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.13.5-next.1
+  - @backstage/config@1.1.0-next.0
+  - @backstage/plugin-search-react@1.7.0-next.1
+  - @backstage/plugin-home-react@0.1.3-next.1
+  - @backstage/core-plugin-api@1.6.0-next.1
+  - @backstage/theme@0.4.1
+  - @backstage/plugin-search-common@1.2.6-next.0
+
+## 0.1.20-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-home-react@0.1.3-next.0
+  - @backstage/core-plugin-api@1.6.0-next.0
+  - @backstage/core-components@0.13.5-next.0
+  - @backstage/config@1.0.8
+  - @backstage/theme@0.4.1
+  - @backstage/plugin-search-common@1.2.5
+  - @backstage/plugin-search-react@1.6.5-next.0
+
+## 0.1.19
+
+### Patch Changes
+
+- 12a8c94eda8d: Add package repository and homepage metadata
+- Updated dependencies
+  - @backstage/plugin-home-react@0.1.2
+  - @backstage/core-components@0.13.4
+  - @backstage/core-plugin-api@1.5.3
+  - @backstage/plugin-search-react@1.6.4
+  - @backstage/config@1.0.8
+  - @backstage/theme@0.4.1
+  - @backstage/plugin-search-common@1.2.5
+
 ## 0.1.19-next.1
 
 ### Patch Changes
diff --git a/plugins/stack-overflow/api-report.md b/plugins/stack-overflow/api-report.md
index 3e27318acb..4277aaac24 100644
--- a/plugins/stack-overflow/api-report.md
+++ b/plugins/stack-overflow/api-report.md
@@ -8,6 +8,7 @@
 import { ApiRef } from '@backstage/core-plugin-api';
 import { BackstagePlugin } from '@backstage/core-plugin-api';
 import { CardExtensionProps } from '@backstage/plugin-home-react';
+import { JSX as JSX_2 } from 'react';
 import { default as React_2 } from 'react';
 import { ResultHighlight } from '@backstage/plugin-search-common';
 import { SearchResultListItemExtensionProps } from '@backstage/plugin-search-react';
@@ -15,7 +16,7 @@ import { SearchResultListItemExtensionProps } from '@backstage/plugin-search-rea
 // @public
 export const HomePageStackOverflowQuestions: (
   props: CardExtensionProps<StackOverflowQuestionsContentProps>,
-) => JSX.Element;
+) => JSX_2.Element;
 
 // @public (undocumented)
 export type StackOverflowApi = {
@@ -28,7 +29,7 @@ export type StackOverflowApi = {
 export const stackOverflowApiRef: ApiRef<StackOverflowApi>;
 
 // @public
-export const StackOverflowIcon: () => JSX.Element;
+export const StackOverflowIcon: () => React_2.JSX.Element;
 
 // @public
 export const stackOverflowPlugin: BackstagePlugin<{}, {}, {}>;
diff --git a/plugins/stack-overflow/catalog-info.yaml b/plugins/stack-overflow/catalog-info.yaml
new file mode 100644
index 0000000000..a949dbda3b
--- /dev/null
+++ b/plugins/stack-overflow/catalog-info.yaml
@@ -0,0 +1,9 @@
+apiVersion: backstage.io/v1alpha1
+kind: Component
+metadata:
+  name: backstage-plugin-stack-overflow
+  title: '@backstage/plugin-stack-overflow'
+spec:
+  lifecycle: experimental
+  type: backstage-frontend-plugin
+  owner: discoverability-maintainers
diff --git a/plugins/stack-overflow/package.json b/plugins/stack-overflow/package.json
index 3a6efe8d99..7f06dac714 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.19-next.1",
+  "version": "0.1.20-next.2",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
@@ -18,6 +18,7 @@
     "url": "https://github.com/backstage/backstage",
     "directory": "plugins/stack-overflow"
   },
+  "sideEffects": false,
   "scripts": {
     "build": "backstage-cli package build",
     "start": "backstage-cli package start",
@@ -57,7 +58,6 @@
     "@testing-library/dom": "^8.0.0",
     "@testing-library/react": "^12.1.3",
     "@testing-library/user-event": "^14.0.0",
-    "@types/node": "^16.11.26",
     "msw": "^1.0.0"
   },
   "files": [
diff --git a/plugins/stackstorm/CHANGELOG.md b/plugins/stackstorm/CHANGELOG.md
index 52e6615586..f92904b323 100644
--- a/plugins/stackstorm/CHANGELOG.md
+++ b/plugins/stackstorm/CHANGELOG.md
@@ -1,5 +1,46 @@
 # @backstage/plugin-stackstorm
 
+## 0.1.6-next.2
+
+### Patch Changes
+
+- 8cec7664e146: Removed `@types/node` dependency
+- Updated dependencies
+  - @backstage/core-components@0.13.5-next.2
+  - @backstage/core-plugin-api@1.6.0-next.2
+  - @backstage/errors@1.2.1
+  - @backstage/theme@0.4.1
+
+## 0.1.6-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.13.5-next.1
+  - @backstage/core-plugin-api@1.6.0-next.1
+  - @backstage/errors@1.2.1
+  - @backstage/theme@0.4.1
+
+## 0.1.6-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-plugin-api@1.6.0-next.0
+  - @backstage/core-components@0.13.5-next.0
+  - @backstage/errors@1.2.1
+  - @backstage/theme@0.4.1
+
+## 0.1.5
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.13.4
+  - @backstage/core-plugin-api@1.5.3
+  - @backstage/errors@1.2.1
+  - @backstage/theme@0.4.1
+
 ## 0.1.5-next.0
 
 ### Patch Changes
diff --git a/plugins/stackstorm/api-report.md b/plugins/stackstorm/api-report.md
index 7a307847cd..f6279be1bd 100644
--- a/plugins/stackstorm/api-report.md
+++ b/plugins/stackstorm/api-report.md
@@ -6,6 +6,7 @@
 /// <reference types="react" />
 
 import { BackstagePlugin } from '@backstage/core-plugin-api';
+import { JSX as JSX_2 } from 'react';
 import { default as React_2 } from 'react';
 import { RouteRef } from '@backstage/core-plugin-api';
 
@@ -17,7 +18,7 @@ export type StackstormHomeProps = {
 };
 
 // @public
-export const StackstormPage: (props: StackstormHomeProps) => JSX.Element;
+export const StackstormPage: (props: StackstormHomeProps) => JSX_2.Element;
 
 // @public
 export const stackstormPlugin: BackstagePlugin<
diff --git a/plugins/stackstorm/catalog-info.yaml b/plugins/stackstorm/catalog-info.yaml
new file mode 100644
index 0000000000..1377f8d013
--- /dev/null
+++ b/plugins/stackstorm/catalog-info.yaml
@@ -0,0 +1,10 @@
+apiVersion: backstage.io/v1alpha1
+kind: Component
+metadata:
+  name: backstage-plugin-stackstorm
+  title: '@backstage/plugin-stackstorm'
+  description: A Backstage plugin that integrates towards StackStorm
+spec:
+  lifecycle: experimental
+  type: backstage-frontend-plugin
+  owner: maintainers
diff --git a/plugins/stackstorm/package.json b/plugins/stackstorm/package.json
index 800fbc5ffe..5e93c3e5a6 100644
--- a/plugins/stackstorm/package.json
+++ b/plugins/stackstorm/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@backstage/plugin-stackstorm",
   "description": "A Backstage plugin that integrates towards StackStorm",
-  "version": "0.1.5-next.0",
+  "version": "0.1.6-next.2",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
@@ -24,6 +24,7 @@
     "stackstorm",
     "st2"
   ],
+  "sideEffects": false,
   "scripts": {
     "start": "backstage-cli package start",
     "build": "backstage-cli package build",
@@ -57,7 +58,6 @@
     "@testing-library/jest-dom": "^5.10.1",
     "@testing-library/react": "^12.1.3",
     "@testing-library/user-event": "^14.0.0",
-    "@types/node": "*",
     "msw": "^1.0.0"
   },
   "files": [
diff --git a/plugins/tech-insights-backend-module-jsonfc/CHANGELOG.md b/plugins/tech-insights-backend-module-jsonfc/CHANGELOG.md
index a678af8513..313fd66fdc 100644
--- a/plugins/tech-insights-backend-module-jsonfc/CHANGELOG.md
+++ b/plugins/tech-insights-backend-module-jsonfc/CHANGELOG.md
@@ -1,5 +1,58 @@
 # @backstage/plugin-tech-insights-backend-module-jsonfc
 
+## 0.1.35-next.2
+
+### Patch Changes
+
+- 51b801f743b2: Handle extracting facts from 'not' conditions too
+- Updated dependencies
+  - @backstage/config@1.1.0-next.1
+  - @backstage/backend-common@0.19.5-next.2
+  - @backstage/plugin-tech-insights-node@0.4.9-next.2
+  - @backstage/errors@1.2.1
+  - @backstage/plugin-tech-insights-common@0.2.11
+
+## 0.1.35-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config@1.1.0-next.0
+  - @backstage/backend-common@0.19.5-next.1
+  - @backstage/plugin-tech-insights-node@0.4.9-next.1
+  - @backstage/errors@1.2.1
+  - @backstage/plugin-tech-insights-common@0.2.11
+
+## 0.1.34-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.19.4-next.0
+  - @backstage/config@1.0.8
+  - @backstage/errors@1.2.1
+  - @backstage/plugin-tech-insights-common@0.2.11
+  - @backstage/plugin-tech-insights-node@0.4.8-next.0
+
+## 0.1.32
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.19.2
+  - @backstage/plugin-tech-insights-node@0.4.6
+  - @backstage/config@1.0.8
+  - @backstage/errors@1.2.1
+  - @backstage/plugin-tech-insights-common@0.2.11
+
+## 0.1.32-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.19.2-next.2
+  - @backstage/plugin-tech-insights-node@0.4.6-next.2
+
 ## 0.1.32-next.1
 
 ### Patch Changes
diff --git a/plugins/tech-insights-backend-module-jsonfc/catalog-info.yaml b/plugins/tech-insights-backend-module-jsonfc/catalog-info.yaml
new file mode 100644
index 0000000000..38d99d940a
--- /dev/null
+++ b/plugins/tech-insights-backend-module-jsonfc/catalog-info.yaml
@@ -0,0 +1,9 @@
+apiVersion: backstage.io/v1alpha1
+kind: Component
+metadata:
+  name: backstage-plugin-tech-insights-backend-module-jsonfc
+  title: '@backstage/plugin-tech-insights-backend-module-jsonfc'
+spec:
+  lifecycle: experimental
+  type: backstage-backend-plugin-module
+  owner: xantier
diff --git a/plugins/tech-insights-backend-module-jsonfc/package.json b/plugins/tech-insights-backend-module-jsonfc/package.json
index 021fed330c..a06234a52b 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.32-next.1",
+  "version": "0.1.35-next.2",
   "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 721c9b3c62..6c1c559fc4 100644
--- a/plugins/tech-insights-backend-module-jsonfc/src/service/JsonRulesEngineFactChecker.ts
+++ b/plugins/tech-insights-backend-module-jsonfc/src/service/JsonRulesEngineFactChecker.ts
@@ -222,6 +222,12 @@ export class JsonRulesEngineFactChecker
           this.retrieveIndividualFactReferences(con),
         ),
       );
+    } else if ('not' in condition) {
+      results = results.concat(
+        this.retrieveIndividualFactReferences(condition.not),
+      );
+    } else if ('condition' in condition) {
+      // ignore the ConditionReference type
     } else {
       results.push(condition.fact);
     }
diff --git a/plugins/tech-insights-backend/CHANGELOG.md b/plugins/tech-insights-backend/CHANGELOG.md
index f652b66b77..32da458286 100644
--- a/plugins/tech-insights-backend/CHANGELOG.md
+++ b/plugins/tech-insights-backend/CHANGELOG.md
@@ -1,5 +1,76 @@
 # @backstage/plugin-tech-insights-backend
 
+## 0.5.17-next.2
+
+### Patch Changes
+
+- 814feeed7343: Update to handle invalid luxon values
+- Updated dependencies
+  - @backstage/config@1.1.0-next.1
+  - @backstage/backend-tasks@0.5.8-next.2
+  - @backstage/backend-common@0.19.5-next.2
+  - @backstage/catalog-model@1.4.2-next.1
+  - @backstage/plugin-tech-insights-node@0.4.9-next.2
+  - @backstage/catalog-client@1.4.4-next.1
+  - @backstage/errors@1.2.1
+  - @backstage/types@1.1.0
+  - @backstage/plugin-tech-insights-common@0.2.11
+
+## 0.5.17-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config@1.1.0-next.0
+  - @backstage/backend-tasks@0.5.8-next.1
+  - @backstage/backend-common@0.19.5-next.1
+  - @backstage/catalog-model@1.4.2-next.0
+  - @backstage/plugin-tech-insights-node@0.4.9-next.1
+  - @backstage/catalog-client@1.4.4-next.0
+  - @backstage/errors@1.2.1
+  - @backstage/types@1.1.0
+  - @backstage/plugin-tech-insights-common@0.2.11
+
+## 0.5.16-next.0
+
+### Patch Changes
+
+- cfc3ca6ce060: Changes needed to support MySQL
+- Updated dependencies
+  - @backstage/backend-common@0.19.4-next.0
+  - @backstage/backend-tasks@0.5.7-next.0
+  - @backstage/catalog-client@1.4.3
+  - @backstage/catalog-model@1.4.1
+  - @backstage/config@1.0.8
+  - @backstage/errors@1.2.1
+  - @backstage/types@1.1.0
+  - @backstage/plugin-tech-insights-common@0.2.11
+  - @backstage/plugin-tech-insights-node@0.4.8-next.0
+
+## 0.5.14
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.19.2
+  - @backstage/backend-tasks@0.5.5
+  - @backstage/plugin-tech-insights-node@0.4.6
+  - @backstage/catalog-client@1.4.3
+  - @backstage/catalog-model@1.4.1
+  - @backstage/config@1.0.8
+  - @backstage/errors@1.2.1
+  - @backstage/types@1.1.0
+  - @backstage/plugin-tech-insights-common@0.2.11
+
+## 0.5.14-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-tasks@0.5.5-next.2
+  - @backstage/backend-common@0.19.2-next.2
+  - @backstage/plugin-tech-insights-node@0.4.6-next.2
+
 ## 0.5.14-next.1
 
 ### Patch Changes
diff --git a/plugins/tech-insights-backend/catalog-info.yaml b/plugins/tech-insights-backend/catalog-info.yaml
new file mode 100644
index 0000000000..ac3e86c4d6
--- /dev/null
+++ b/plugins/tech-insights-backend/catalog-info.yaml
@@ -0,0 +1,9 @@
+apiVersion: backstage.io/v1alpha1
+kind: Component
+metadata:
+  name: backstage-plugin-tech-insights-backend
+  title: '@backstage/plugin-tech-insights-backend'
+spec:
+  lifecycle: experimental
+  type: backstage-backend-plugin
+  owner: xantier
diff --git a/plugins/tech-insights-backend/migrations/202109061111_fact_schemas.js b/plugins/tech-insights-backend/migrations/202109061111_fact_schemas.js
index 6094daa4b7..2521f6d8bb 100644
--- a/plugins/tech-insights-backend/migrations/202109061111_fact_schemas.js
+++ b/plugins/tech-insights-backend/migrations/202109061111_fact_schemas.js
@@ -25,7 +25,7 @@ exports.up = async function up(knex) {
       'The table for tech insight fact schemas. Containing a versioned data model definition for a collection of facts.',
     );
     table
-      .text('id')
+      .string('id')
       .notNullable()
       .comment('Identifier of the fact retriever plugin/package');
     table
diff --git a/plugins/tech-insights-backend/migrations/202109061212_facts.js b/plugins/tech-insights-backend/migrations/202109061212_facts.js
index 0bdcdc0da1..237d826869 100644
--- a/plugins/tech-insights-backend/migrations/202109061212_facts.js
+++ b/plugins/tech-insights-backend/migrations/202109061212_facts.js
@@ -25,7 +25,7 @@ exports.up = async function up(knex) {
       'The table for tech insight fact collections. Contains facts for individual fact retriever namespace/ref.',
     );
     table
-      .text('id')
+      .string('id')
       .notNullable()
       .comment('Unique identifier of the fact retriever plugin/package');
     table
@@ -40,7 +40,7 @@ exports.up = async function up(knex) {
       .notNullable()
       .comment('The timestamp when this entry was created');
     table
-      .text('entity')
+      .string('entity')
       .notNullable()
       .comment('Identifier of the entity these facts relate to');
     table
diff --git a/plugins/tech-insights-backend/package.json b/plugins/tech-insights-backend/package.json
index c5dfc94afb..761e1f744d 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.14-next.1",
+  "version": "0.5.17-next.2",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
diff --git a/plugins/tech-insights-backend/src/service/persistence/TechInsightsDatabase.test.ts b/plugins/tech-insights-backend/src/service/persistence/TechInsightsDatabase.test.ts
index 3cf6d08c65..d778e84c79 100644
--- a/plugins/tech-insights-backend/src/service/persistence/TechInsightsDatabase.test.ts
+++ b/plugins/tech-insights-backend/src/service/persistence/TechInsightsDatabase.test.ts
@@ -74,13 +74,13 @@ const secondSchema = {
   }),
 };
 
-const now = DateTime.now().toISO();
+const now = DateTime.now().toISO()!;
 const shortlyInTheFuture = DateTime.now()
   .plus(Duration.fromMillis(555))
-  .toISO();
+  .toISO()!;
 const farInTheFuture = DateTime.now()
   .plus(Duration.fromMillis(555666777))
-  .toISO();
+  .toISO()!;
 
 const facts = [
   {
@@ -127,13 +127,13 @@ const sameFactsDiffDateSchema = {
   }),
 };
 
-const sameFactsDiffDateNow = DateTime.now().toISO();
+const sameFactsDiffDateNow = DateTime.now().toISO()!;
 const sameFactsDiffDateNearFuture = DateTime.now()
   .plus(Duration.fromMillis(555))
-  .toISO();
+  .toISO()!;
 const sameFactsDiffDateFuture = DateTime.now()
   .plus(Duration.fromMillis(1000))
-  .toISO();
+  .toISO()!;
 
 const multipleSameFacts = [
   {
diff --git a/plugins/tech-insights-backend/src/service/persistence/TechInsightsDatabase.ts b/plugins/tech-insights-backend/src/service/persistence/TechInsightsDatabase.ts
index c8f098a895..761a6bd273 100644
--- a/plugins/tech-insights-backend/src/service/persistence/TechInsightsDatabase.ts
+++ b/plugins/tech-insights-backend/src/service/persistence/TechInsightsDatabase.ts
@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 import { Knex } from 'knex';
 import {
   FactLifecycle,
@@ -105,12 +106,13 @@ export class TechInsightsDatabase implements TechInsightsStore {
     if (facts.length === 0) return;
     const currentSchema = await this.getLatestSchema(id);
     const factRows = facts.map(it => {
+      const ts = it.timestamp?.toISO();
       return {
         id,
         version: currentSchema.version,
         entity: stringifyEntityRef(it.entity),
         facts: JSON.stringify(it.facts),
-        ...(it.timestamp && { timestamp: it.timestamp.toISO() }),
+        ...(ts && { timestamp: ts }),
       };
     });
 
diff --git a/plugins/tech-insights-common/catalog-info.yaml b/plugins/tech-insights-common/catalog-info.yaml
new file mode 100644
index 0000000000..3f5cac294f
--- /dev/null
+++ b/plugins/tech-insights-common/catalog-info.yaml
@@ -0,0 +1,9 @@
+apiVersion: backstage.io/v1alpha1
+kind: Component
+metadata:
+  name: backstage-plugin-tech-insights-common
+  title: '@backstage/plugin-tech-insights-common'
+spec:
+  lifecycle: experimental
+  type: backstage-common-library
+  owner: maintainers
diff --git a/plugins/tech-insights-common/package.json b/plugins/tech-insights-common/package.json
index 3831073e87..aa859e23bb 100644
--- a/plugins/tech-insights-common/package.json
+++ b/plugins/tech-insights-common/package.json
@@ -22,6 +22,7 @@
     "backstage",
     "tech-insights"
   ],
+  "sideEffects": false,
   "scripts": {
     "start": "backstage-cli backend:dev",
     "build": "backstage-cli package build",
diff --git a/plugins/tech-insights-node/CHANGELOG.md b/plugins/tech-insights-node/CHANGELOG.md
index 57ab233cfd..7b9721fee6 100644
--- a/plugins/tech-insights-node/CHANGELOG.md
+++ b/plugins/tech-insights-node/CHANGELOG.md
@@ -1,5 +1,57 @@
 # @backstage/plugin-tech-insights-node
 
+## 0.4.9-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config@1.1.0-next.1
+  - @backstage/backend-tasks@0.5.8-next.2
+  - @backstage/backend-common@0.19.5-next.2
+  - @backstage/types@1.1.0
+  - @backstage/plugin-tech-insights-common@0.2.11
+
+## 0.4.9-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config@1.1.0-next.0
+  - @backstage/backend-tasks@0.5.8-next.1
+  - @backstage/backend-common@0.19.5-next.1
+  - @backstage/types@1.1.0
+  - @backstage/plugin-tech-insights-common@0.2.11
+
+## 0.4.8-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.19.4-next.0
+  - @backstage/backend-tasks@0.5.7-next.0
+  - @backstage/config@1.0.8
+  - @backstage/types@1.1.0
+  - @backstage/plugin-tech-insights-common@0.2.11
+
+## 0.4.6
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.19.2
+  - @backstage/backend-tasks@0.5.5
+  - @backstage/config@1.0.8
+  - @backstage/types@1.1.0
+  - @backstage/plugin-tech-insights-common@0.2.11
+
+## 0.4.6-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-tasks@0.5.5-next.2
+  - @backstage/backend-common@0.19.2-next.2
+
 ## 0.4.6-next.1
 
 ### Patch Changes
diff --git a/plugins/tech-insights-node/catalog-info.yaml b/plugins/tech-insights-node/catalog-info.yaml
new file mode 100644
index 0000000000..6f7bcc3eb9
--- /dev/null
+++ b/plugins/tech-insights-node/catalog-info.yaml
@@ -0,0 +1,9 @@
+apiVersion: backstage.io/v1alpha1
+kind: Component
+metadata:
+  name: backstage-plugin-tech-insights-node
+  title: '@backstage/plugin-tech-insights-node'
+spec:
+  lifecycle: experimental
+  type: backstage-node-library
+  owner: maintainers
diff --git a/plugins/tech-insights-node/package.json b/plugins/tech-insights-node/package.json
index f89bb41748..42dc59375d 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.4.6-next.1",
+  "version": "0.4.9-next.2",
   "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 c415a5a5af..19615326cb 100644
--- a/plugins/tech-insights/CHANGELOG.md
+++ b/plugins/tech-insights/CHANGELOG.md
@@ -1,5 +1,70 @@
 # @backstage/plugin-tech-insights
 
+## 0.3.16-next.2
+
+### Patch Changes
+
+- 8cec7664e146: Removed `@types/node` dependency
+- Updated dependencies
+  - @backstage/core-components@0.13.5-next.2
+  - @backstage/core-plugin-api@1.6.0-next.2
+  - @backstage/plugin-catalog-react@1.8.4-next.2
+  - @backstage/catalog-model@1.4.2-next.1
+  - @backstage/errors@1.2.1
+  - @backstage/theme@0.4.1
+  - @backstage/types@1.1.0
+  - @backstage/plugin-tech-insights-common@0.2.11
+
+## 0.3.16-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.8.4-next.1
+  - @backstage/core-components@0.13.5-next.1
+  - @backstage/catalog-model@1.4.2-next.0
+  - @backstage/core-plugin-api@1.6.0-next.1
+  - @backstage/errors@1.2.1
+  - @backstage/theme@0.4.1
+  - @backstage/types@1.1.0
+  - @backstage/plugin-tech-insights-common@0.2.11
+
+## 0.3.15-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-plugin-api@1.6.0-next.0
+  - @backstage/core-components@0.13.5-next.0
+  - @backstage/catalog-model@1.4.1
+  - @backstage/errors@1.2.1
+  - @backstage/theme@0.4.1
+  - @backstage/types@1.1.0
+  - @backstage/plugin-catalog-react@1.8.3-next.0
+  - @backstage/plugin-tech-insights-common@0.2.11
+
+## 0.3.13
+
+### Patch Changes
+
+- 12a8c94eda8d: Add package repository and homepage metadata
+- Updated dependencies
+  - @backstage/core-components@0.13.4
+  - @backstage/plugin-catalog-react@1.8.1
+  - @backstage/core-plugin-api@1.5.3
+  - @backstage/catalog-model@1.4.1
+  - @backstage/errors@1.2.1
+  - @backstage/theme@0.4.1
+  - @backstage/types@1.1.0
+  - @backstage/plugin-tech-insights-common@0.2.11
+
+## 0.3.13-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.8.1-next.1
+
 ## 0.3.13-next.1
 
 ### Patch Changes
diff --git a/plugins/tech-insights/api-report.md b/plugins/tech-insights/api-report.md
index f535a69120..14fe512ba0 100644
--- a/plugins/tech-insights/api-report.md
+++ b/plugins/tech-insights/api-report.md
@@ -14,11 +14,14 @@ import { DiscoveryApi } from '@backstage/core-plugin-api';
 import { FactSchema } from '@backstage/plugin-tech-insights-common';
 import { IdentityApi } from '@backstage/core-plugin-api';
 import { JsonValue } from '@backstage/types';
+import { JSX as JSX_2 } from 'react';
 import { default as React_2 } from 'react';
 import { RouteRef } from '@backstage/core-plugin-api';
 
 // @public (undocumented)
-export const BooleanCheck: (props: { checkResult: CheckResult }) => JSX.Element;
+export const BooleanCheck: (props: {
+  checkResult: CheckResult;
+}) => React_2.JSX.Element;
 
 // @public
 export type Check = {
@@ -43,14 +46,14 @@ export const EntityTechInsightsScorecardCard: (props: {
   title: string;
   description?: string | undefined;
   checksId?: string[] | undefined;
-}) => JSX.Element;
+}) => JSX_2.Element;
 
 // @public (undocumented)
 export const EntityTechInsightsScorecardContent: (props: {
   title: string;
   description?: string | undefined;
   checksId?: string[] | undefined;
-}) => JSX.Element;
+}) => JSX_2.Element;
 
 // @public
 export interface InsightFacts {
diff --git a/plugins/tech-insights/catalog-info.yaml b/plugins/tech-insights/catalog-info.yaml
new file mode 100644
index 0000000000..0c65b59d12
--- /dev/null
+++ b/plugins/tech-insights/catalog-info.yaml
@@ -0,0 +1,9 @@
+apiVersion: backstage.io/v1alpha1
+kind: Component
+metadata:
+  name: backstage-plugin-tech-insights
+  title: '@backstage/plugin-tech-insights'
+spec:
+  lifecycle: experimental
+  type: backstage-frontend-plugin
+  owner: maintainers
diff --git a/plugins/tech-insights/package.json b/plugins/tech-insights/package.json
index 21f65edd6b..840f357fcf 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.13-next.1",
+  "version": "0.3.16-next.2",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
@@ -18,6 +18,7 @@
     "url": "https://github.com/backstage/backstage",
     "directory": "plugins/tech-insights"
   },
+  "sideEffects": false,
   "scripts": {
     "build": "backstage-cli package build",
     "start": "backstage-cli package start",
@@ -57,7 +58,6 @@
     "@testing-library/jest-dom": "^5.10.1",
     "@testing-library/react": "^12.1.3",
     "@testing-library/user-event": "^14.0.0",
-    "@types/node": "^16.11.26",
     "msw": "^1.0.0"
   },
   "files": [
diff --git a/plugins/tech-radar/CHANGELOG.md b/plugins/tech-radar/CHANGELOG.md
index b14e7c34f7..813f59af0c 100644
--- a/plugins/tech-radar/CHANGELOG.md
+++ b/plugins/tech-radar/CHANGELOG.md
@@ -1,5 +1,46 @@
 # @backstage/plugin-tech-radar
 
+## 0.6.8-next.2
+
+### Patch Changes
+
+- b45d0ac68191: Add names to blip entry links in the radar to improve accessibility
+- 6d35e9ea2afa: Add description property for Rings which will be shown in the footer.
+- 8cec7664e146: Removed `@types/node` dependency
+- Updated dependencies
+  - @backstage/core-components@0.13.5-next.2
+  - @backstage/core-plugin-api@1.6.0-next.2
+  - @backstage/theme@0.4.1
+
+## 0.6.8-next.1
+
+### Patch Changes
+
+- 80b4d0b34f14: Fixed the width of the tech radar dialog so that the content fits
+- Updated dependencies
+  - @backstage/core-components@0.13.5-next.1
+  - @backstage/core-plugin-api@1.6.0-next.1
+  - @backstage/theme@0.4.1
+
+## 0.6.8-next.0
+
+### Patch Changes
+
+- 482bb5c0bbf8: Moved `@types/react` to be a regular dependency
+- Updated dependencies
+  - @backstage/core-plugin-api@1.6.0-next.0
+  - @backstage/core-components@0.13.5-next.0
+  - @backstage/theme@0.4.1
+
+## 0.6.7
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.13.4
+  - @backstage/core-plugin-api@1.5.3
+  - @backstage/theme@0.4.1
+
 ## 0.6.7-next.0
 
 ### Patch Changes
diff --git a/plugins/tech-radar/README.md b/plugins/tech-radar/README.md
index 1c64e4fc9e..31d90de938 100644
--- a/plugins/tech-radar/README.md
+++ b/plugins/tech-radar/README.md
@@ -85,11 +85,12 @@ When defining the radar entries you can see the available properties on the file
 
 ### ring
 
-| Name    | Type   | Description                                       | Required? |
-| ------- | ------ | ------------------------------------------------- | --------- |
-| `id`    | string | The id of the ring                                | Yes       |
-| `name`  | string | The name of the ring                              | Yes       |
-| `color` | string | The color of the ring and entries inside the ring | Yes       |
+| Name          | Type   | Description                                       | Required? |
+| ------------- | ------ | ------------------------------------------------- | --------- |
+| `id`          | string | The id of the ring                                | Yes       |
+| `name`        | string | The name of the ring                              | Yes       |
+| `color`       | string | The color of the ring and entries inside the ring | Yes       |
+| `description` | string | Description of the Ring                           | No        |
 
 ### entry
 
diff --git a/plugins/tech-radar/api-report.md b/plugins/tech-radar/api-report.md
index 3b84990d85..f55f0ee39e 100644
--- a/plugins/tech-radar/api-report.md
+++ b/plugins/tech-radar/api-report.md
@@ -3,10 +3,9 @@
 > Do not edit this file. It is a report generated by [API Extractor](https://api-extractor.com/).
 
 ```ts
-/// <reference types="react" />
-
 import { ApiRef } from '@backstage/core-plugin-api';
 import { BackstagePlugin } from '@backstage/core-plugin-api';
+import { default as React_2 } from 'react';
 import { RouteRef } from '@backstage/core-plugin-api';
 
 // @public
@@ -44,7 +43,7 @@ export interface RadarEntrySnapshot {
 }
 
 // @public
-export function RadarPage(props: TechRadarPageProps): JSX.Element;
+export function RadarPage(props: TechRadarPageProps): React_2.JSX.Element;
 
 // @public
 export interface RadarQuadrant {
@@ -55,6 +54,7 @@ export interface RadarQuadrant {
 // @public
 export interface RadarRing {
   color: string;
+  description?: string;
   id: string;
   name: string;
 }
@@ -71,7 +71,9 @@ export interface TechRadarApi {
 export const techRadarApiRef: ApiRef<TechRadarApi>;
 
 // @public
-export function TechRadarComponent(props: TechRadarComponentProps): JSX.Element;
+export function TechRadarComponent(
+  props: TechRadarComponentProps,
+): React_2.JSX.Element;
 
 // @public
 export interface TechRadarComponentProps {
diff --git a/plugins/tech-radar/catalog-info.yaml b/plugins/tech-radar/catalog-info.yaml
new file mode 100644
index 0000000000..ea88b4e264
--- /dev/null
+++ b/plugins/tech-radar/catalog-info.yaml
@@ -0,0 +1,10 @@
+apiVersion: backstage.io/v1alpha1
+kind: Component
+metadata:
+  name: backstage-plugin-tech-radar
+  title: '@backstage/plugin-tech-radar'
+  description: A Backstage plugin that lets you display a Tech Radar for your organization
+spec:
+  lifecycle: experimental
+  type: backstage-frontend-plugin
+  owner: maintainers
diff --git a/plugins/tech-radar/package.json b/plugins/tech-radar/package.json
index e376c05baf..efd18745bf 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.6.7-next.0",
+  "version": "0.6.8-next.2",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
@@ -22,6 +22,7 @@
   "keywords": [
     "backstage"
   ],
+  "sideEffects": false,
   "scripts": {
     "build": "backstage-cli package build",
     "lint": "backstage-cli package lint",
@@ -38,6 +39,7 @@
     "@material-ui/core": "^4.12.2",
     "@material-ui/icons": "^4.9.1",
     "@material-ui/lab": "4.0.0-alpha.61",
+    "@types/react": "^16.13.1 || ^17.0.0",
     "color": "^4.0.1",
     "d3-force": "^3.0.0",
     "prop-types": "^15.7.2",
@@ -59,8 +61,6 @@
     "@testing-library/user-event": "^14.0.0",
     "@types/color": "^3.0.1",
     "@types/d3-force": "^3.0.0",
-    "@types/node": "^16.11.26",
-    "@types/react": "^16.13.1 || ^17.0.0",
     "cross-fetch": "^3.1.5",
     "msw": "^1.0.0"
   },
diff --git a/plugins/tech-radar/src/api.ts b/plugins/tech-radar/src/api.ts
index c0b8fb8852..53fbb0bb15 100644
--- a/plugins/tech-radar/src/api.ts
+++ b/plugins/tech-radar/src/api.ts
@@ -71,6 +71,10 @@ export interface RadarRing {
    * Supports any value parseable by {@link https://www.npmjs.com/package/color-string | color-string}
    */
   color: string;
+  /**
+   * Description of the Ring
+   */
+  description?: string;
 }
 
 /**
diff --git a/plugins/tech-radar/src/components/Radar/Radar.tsx b/plugins/tech-radar/src/components/Radar/Radar.tsx
index 8ba5af9811..55b8a01784 100644
--- a/plugins/tech-radar/src/components/Radar/Radar.tsx
+++ b/plugins/tech-radar/src/components/Radar/Radar.tsx
@@ -36,7 +36,10 @@ const Radar = ({
   entries,
   ...props
 }: Props): JSX.Element => {
-  const radius = Math.min(width, height) / 2;
+  // Radius with optional buffer for the footer if rings have descriptions
+  const radius =
+    Math.min(width, height) / 2 -
+    (rings.some(ring => ring.description) ? 16 : 0);
 
   // State
   const [activeEntry, setActiveEntry] = useState<Entry>();
diff --git a/plugins/tech-radar/src/components/RadarComponent.tsx b/plugins/tech-radar/src/components/RadarComponent.tsx
index 1f14e9d258..9437501405 100644
--- a/plugins/tech-radar/src/components/RadarComponent.tsx
+++ b/plugins/tech-radar/src/components/RadarComponent.tsx
@@ -18,9 +18,13 @@ import { Progress } from '@backstage/core-components';
 import { errorApiRef, useApi } from '@backstage/core-plugin-api';
 import React, { useEffect } from 'react';
 import useAsync from 'react-use/lib/useAsync';
-import { RadarEntry, techRadarApiRef, TechRadarLoaderResponse } from '../api';
+import {
+  type RadarEntry,
+  techRadarApiRef,
+  type TechRadarLoaderResponse,
+} from '../api';
 import Radar from '../components/Radar';
-import { Entry } from '../utils/types';
+import type { Entry } from '../utils/types';
 
 const useTechRadarLoader = (id: string | undefined) => {
   const errorApi = useApi(errorApiRef);
diff --git a/plugins/tech-radar/src/components/RadarDescription/RadarDescription.tsx b/plugins/tech-radar/src/components/RadarDescription/RadarDescription.tsx
index df39c2ce55..7e2dabc3d4 100644
--- a/plugins/tech-radar/src/components/RadarDescription/RadarDescription.tsx
+++ b/plugins/tech-radar/src/components/RadarDescription/RadarDescription.tsx
@@ -45,7 +45,13 @@ const RadarDescription = (props: Props): JSX.Element => {
   const { open, onClose, title, description, timeline, url, links } = props;
 
   return (
-    <Dialog data-testid="radar-description" open={open} onClose={onClose}>
+    <Dialog
+      data-testid="radar-description"
+      open={open}
+      onClose={onClose}
+      maxWidth="lg"
+      fullWidth
+    >
       <DialogTitle data-testid="radar-description-dialog-title">
         {title}
       </DialogTitle>
diff --git a/plugins/tech-radar/src/components/RadarEntry/RadarEntry.test.tsx b/plugins/tech-radar/src/components/RadarEntry/RadarEntry.test.tsx
index 36f304330d..2935b29534 100644
--- a/plugins/tech-radar/src/components/RadarEntry/RadarEntry.test.tsx
+++ b/plugins/tech-radar/src/components/RadarEntry/RadarEntry.test.tsx
@@ -15,7 +15,7 @@
  */
 
 import React from 'react';
-import { screen } from '@testing-library/react';
+import { screen, within } from '@testing-library/react';
 import { renderInTestApp } from '@backstage/test-utils';
 import userEvent from '@testing-library/user-event';
 import GetBBoxPolyfill from '../../utils/polyfills/getBBox';
@@ -27,6 +27,7 @@ const minProps: Props = {
   y: 2,
   value: 2,
   color: 'red',
+  entryId: 'Typescript',
 };
 
 const optionalProps: Props = {
@@ -56,6 +57,11 @@ describe('RadarEntry', () => {
     expect(radarEntry).toBeInTheDocument();
     expect(radarEntry.getAttribute('transform')).toBe(`translate(${x}, ${y})`);
     expect(screen.getByText(String(minProps.value))).toBeInTheDocument();
+    expect(
+      within(radarEntry)
+        .getByText(String(minProps.value))
+        .getAttribute('aria-labelledby'),
+    ).toBe(minProps.entryId);
   });
 
   it('should render with description', async () => {
@@ -73,6 +79,11 @@ describe('RadarEntry', () => {
     const radarDescription = screen.getByTestId('radar-description');
     expect(radarDescription).toBeInTheDocument();
     expect(screen.getByText(String(minProps.value))).toBeInTheDocument();
+    expect(
+      within(radarEntry)
+        .getByText(String(minProps.value))
+        .getAttribute('aria-labelledby'),
+    ).toBe(minProps.entryId);
   });
 
   it('should render blip with url equal to # if description present', async () => {
@@ -87,5 +98,11 @@ describe('RadarEntry', () => {
     );
 
     expect(screen.getByRole('button')).toHaveAttribute('href', '#');
+    const radarEntry = screen.getByTestId('radar-entry');
+    expect(
+      within(radarEntry)
+        .getByText(String(minProps.value))
+        .getAttribute('aria-labelledby'),
+    ).toBe(minProps.entryId);
   });
 });
diff --git a/plugins/tech-radar/src/components/RadarEntry/RadarEntry.tsx b/plugins/tech-radar/src/components/RadarEntry/RadarEntry.tsx
index 66940cd1d7..b7f5ea5962 100644
--- a/plugins/tech-radar/src/components/RadarEntry/RadarEntry.tsx
+++ b/plugins/tech-radar/src/components/RadarEntry/RadarEntry.tsx
@@ -23,6 +23,7 @@ import type { EntrySnapshot } from '../../utils/types';
 export type Props = {
   x: number;
   y: number;
+  entryId: string;
   value: number;
   color: string;
   url?: string;
@@ -76,6 +77,7 @@ const RadarEntry = (props: Props): JSX.Element => {
     url,
     links,
     value,
+    entryId,
     x,
     y,
     onMouseEnter,
@@ -126,15 +128,16 @@ const RadarEntry = (props: Props): JSX.Element => {
           href="#"
           tabIndex={0}
           onKeyPress={toggle}
+          aria-labelledby={entryId}
         >
           {blip}
         </a>
       ) : (
-        <WithLink url={url} className={classes.link}>
+        <WithLink url={url} className={classes.link} aria-labelledby={entryId}>
           {blip}
         </WithLink>
       )}
-      <text y={3} className={classes.text}>
+      <text aria-labelledby={entryId} y={3} className={classes.text}>
         {value}
       </text>
     </g>
diff --git a/plugins/tech-radar/src/components/RadarFooter/RadarFooter.tsx b/plugins/tech-radar/src/components/RadarFooter/RadarFooter.tsx
index 63f10e8673..e20c07bb00 100644
--- a/plugins/tech-radar/src/components/RadarFooter/RadarFooter.tsx
+++ b/plugins/tech-radar/src/components/RadarFooter/RadarFooter.tsx
@@ -20,8 +20,12 @@ import { makeStyles } from '@material-ui/core';
 export type Props = {
   x: number;
   y: number;
+  spaces?: number;
+  labels?: Array<string>;
 };
 
+const onespace = '\u00a0';
+
 const useStyles = makeStyles(theme => ({
   text: {
     pointerEvents: 'none',
@@ -32,8 +36,9 @@ const useStyles = makeStyles(theme => ({
 }));
 
 const RadarFooter = (props: Props): JSX.Element => {
-  const { x, y } = props;
+  const { x, y, spaces = 5, labels } = props;
   const classes = useStyles(props);
+  const space = onespace.repeat(spaces);
 
   return (
     <text
@@ -41,7 +46,9 @@ const RadarFooter = (props: Props): JSX.Element => {
       transform={`translate(${x}, ${y})`}
       className={classes.text}
     >
-      {'▲ moved up\u00a0\u00a0\u00a0\u00a0\u00a0▼ moved down'}
+      {`▲ moved up${space}▼ moved down`}
+      {labels && space}
+      {labels?.join(space)}
     </text>
   );
 };
diff --git a/plugins/tech-radar/src/components/RadarLegend/RadarLegendLink.tsx b/plugins/tech-radar/src/components/RadarLegend/RadarLegendLink.tsx
index 4273963690..11443769f2 100644
--- a/plugins/tech-radar/src/components/RadarLegend/RadarLegendLink.tsx
+++ b/plugins/tech-radar/src/components/RadarLegend/RadarLegendLink.tsx
@@ -21,6 +21,7 @@ import { RadarDescription } from '../RadarDescription';
 import type { EntrySnapshot } from '../../utils/types';
 
 type RadarLegendLinkProps = {
+  entryId: string;
   url?: string;
   description?: string;
   title?: string;
@@ -31,6 +32,7 @@ type RadarLegendLinkProps = {
 };
 
 export const RadarLegendLink = ({
+  entryId,
   url,
   description,
   title,
@@ -66,6 +68,7 @@ export const RadarLegendLink = ({
         >
           <Typography
             component="span"
+            id={entryId}
             className={active ? classes.activeEntry : classes.entry}
           >
             {title}
@@ -89,6 +92,7 @@ export const RadarLegendLink = ({
     <WithLink url={url} className={classes.entryLink}>
       <Typography
         component="span"
+        id={entryId}
         className={active ? classes.activeEntry : classes.entry}
       >
         {title}
diff --git a/plugins/tech-radar/src/components/RadarLegend/RadarLegendRing.tsx b/plugins/tech-radar/src/components/RadarLegend/RadarLegendRing.tsx
index 2005d21915..8942efa08e 100644
--- a/plugins/tech-radar/src/components/RadarLegend/RadarLegendRing.tsx
+++ b/plugins/tech-radar/src/components/RadarLegend/RadarLegendRing.tsx
@@ -63,6 +63,7 @@ export const RadarLegendRing = ({
             >
               <RadarLegendLink
                 classes={classes}
+                entryId={entry.id}
                 url={entry.url}
                 title={entry.title}
                 description={entry.description}
diff --git a/plugins/tech-radar/src/components/RadarPage.tsx b/plugins/tech-radar/src/components/RadarPage.tsx
index 802acef2a8..a7ea538977 100644
--- a/plugins/tech-radar/src/components/RadarPage.tsx
+++ b/plugins/tech-radar/src/components/RadarPage.tsx
@@ -25,7 +25,7 @@ import {
 import { Grid, Input, makeStyles } from '@material-ui/core';
 import Typography from '@material-ui/core/Typography';
 import React from 'react';
-import { RadarComponent, TechRadarComponentProps } from './RadarComponent';
+import { RadarComponent, type TechRadarComponentProps } from './RadarComponent';
 
 const useStyles = makeStyles(() => ({
   overflowXScroll: {
diff --git a/plugins/tech-radar/src/components/RadarPlot/RadarPlot.tsx b/plugins/tech-radar/src/components/RadarPlot/RadarPlot.tsx
index 0fb6e3a36a..56fd029eee 100644
--- a/plugins/tech-radar/src/components/RadarPlot/RadarPlot.tsx
+++ b/plugins/tech-radar/src/components/RadarPlot/RadarPlot.tsx
@@ -64,13 +64,25 @@ const RadarPlot = (props: Props): JSX.Element => {
       />
       <g transform={`translate(${width / 2}, ${height / 2})`}>
         <RadarGrid radius={radius} rings={rings} />
-        <RadarFooter x={-0.5 * width} y={0.5 * height} />
+        <RadarFooter
+          x={-0.5 * width}
+          y={0.5 * height}
+          spaces={rings.some(ring => ring.description) ? 2 : undefined}
+          labels={
+            rings
+              .map(
+                ring => ring.description && `${ring.name}: ${ring.description}`,
+              )
+              .filter(e => e) as string[]
+          }
+        />
         {entries.map(entry => (
           <RadarEntry
             key={entry.id}
             x={entry.x || 0}
             y={entry.y || 0}
             color={entry.color || ''}
+            entryId={entry.id}
             value={(entry?.index || 0) + 1}
             url={entry.url}
             links={entry.links}
diff --git a/plugins/tech-radar/src/sample.ts b/plugins/tech-radar/src/sample.ts
index 9f6d65a683..77a7101f64 100644
--- a/plugins/tech-radar/src/sample.ts
+++ b/plugins/tech-radar/src/sample.ts
@@ -23,10 +23,32 @@ import {
 } from './api';
 
 const rings = new Array<RadarRing>();
-rings.push({ id: 'adopt', name: 'ADOPT', color: '#5BA300' });
-rings.push({ id: 'trial', name: 'TRIAL', color: '#009EB0' });
-rings.push({ id: 'assess', name: 'ASSESS', color: '#C7BA00' });
-rings.push({ id: 'hold', name: 'HOLD', color: '#E09B96' });
+rings.push({
+  id: 'adopt',
+  name: 'ADOPT',
+  color: '#5BA300',
+  description:
+    'Commodi accusantium culpa sed itaque excepturi rem eum nulla possimus.',
+});
+rings.push({
+  id: 'trial',
+  name: 'TRIAL',
+  color: '#009EB0',
+  description: 'Recusandae possimus ipsum dolores.',
+});
+rings.push({
+  id: 'assess',
+  name: 'ASSESS',
+  color: '#C7BA00',
+  description:
+    'In asperiores repellat error recusandae et adipisci laborum porro.',
+});
+rings.push({
+  id: 'hold',
+  name: 'HOLD',
+  color: '#E09B96',
+  description: 'Esse mollitia in.',
+});
 
 const quadrants = new Array<RadarQuadrant>();
 quadrants.push({ id: 'infrastructure', name: 'Infrastructure' });
diff --git a/plugins/tech-radar/src/utils/types.ts b/plugins/tech-radar/src/utils/types.ts
index 047319bd9e..4ab236765d 100644
--- a/plugins/tech-radar/src/utils/types.ts
+++ b/plugins/tech-radar/src/utils/types.ts
@@ -23,6 +23,7 @@ export type Ring = {
   color: string;
   outerRadius?: number;
   innerRadius?: number;
+  description?: string;
 };
 
 // Parameters for a quadrant (there should be exactly 4 of course)
diff --git a/plugins/techdocs-addons-test-utils/CHANGELOG.md b/plugins/techdocs-addons-test-utils/CHANGELOG.md
index ffa103dd67..0af47f3ee8 100644
--- a/plugins/techdocs-addons-test-utils/CHANGELOG.md
+++ b/plugins/techdocs-addons-test-utils/CHANGELOG.md
@@ -1,5 +1,79 @@
 # @backstage/plugin-techdocs-addons-test-utils
 
+## 1.0.21-next.2
+
+### Patch Changes
+
+- 8cec7664e146: Removed `@types/node` dependency
+- Updated dependencies
+  - @backstage/plugin-techdocs@1.7.0-next.2
+  - @backstage/plugin-catalog@1.13.0-next.2
+  - @backstage/integration-react@1.1.19-next.2
+  - @backstage/core-components@0.13.5-next.2
+  - @backstage/core-plugin-api@1.6.0-next.2
+  - @backstage/core-app-api@1.10.0-next.2
+  - @backstage/test-utils@1.4.3-next.2
+  - @backstage/plugin-search-react@1.7.0-next.2
+  - @backstage/plugin-techdocs-react@1.1.10-next.2
+  - @backstage/theme@0.4.1
+
+## 1.0.21-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.13.5-next.1
+  - @backstage/plugin-search-react@1.7.0-next.1
+  - @backstage/plugin-catalog@1.12.5-next.1
+  - @backstage/plugin-techdocs@1.6.9-next.1
+  - @backstage/integration-react@1.1.19-next.1
+  - @backstage/plugin-techdocs-react@1.1.10-next.1
+  - @backstage/core-app-api@1.10.0-next.1
+  - @backstage/core-plugin-api@1.6.0-next.1
+  - @backstage/test-utils@1.4.3-next.1
+  - @backstage/theme@0.4.1
+
+## 1.0.20-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/integration-react@1.1.18-next.0
+  - @backstage/plugin-catalog@1.12.4-next.0
+  - @backstage/plugin-techdocs@1.6.8-next.0
+  - @backstage/core-app-api@1.10.0-next.0
+  - @backstage/core-plugin-api@1.6.0-next.0
+  - @backstage/core-components@0.13.5-next.0
+  - @backstage/test-utils@1.4.3-next.0
+  - @backstage/theme@0.4.1
+  - @backstage/plugin-search-react@1.6.5-next.0
+  - @backstage/plugin-techdocs-react@1.1.10-next.0
+
+## 1.0.17
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-app-api@1.9.1
+  - @backstage/integration-react@1.1.16
+  - @backstage/core-components@0.13.4
+  - @backstage/plugin-catalog@1.12.1
+  - @backstage/core-plugin-api@1.5.3
+  - @backstage/test-utils@1.4.2
+  - @backstage/plugin-search-react@1.6.4
+  - @backstage/plugin-techdocs@1.6.6
+  - @backstage/theme@0.4.1
+  - @backstage/plugin-techdocs-react@1.1.9
+
+## 1.0.17-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog@1.12.1-next.2
+  - @backstage/plugin-techdocs@1.6.6-next.2
+  - @backstage/integration-react@1.1.16-next.1
+
 ## 1.0.17-next.1
 
 ### Patch Changes
diff --git a/plugins/techdocs-addons-test-utils/catalog-info.yaml b/plugins/techdocs-addons-test-utils/catalog-info.yaml
new file mode 100644
index 0000000000..c3e2159e54
--- /dev/null
+++ b/plugins/techdocs-addons-test-utils/catalog-info.yaml
@@ -0,0 +1,9 @@
+apiVersion: backstage.io/v1alpha1
+kind: Component
+metadata:
+  name: backstage-plugin-techdocs-addons-test-utils
+  title: '@backstage/plugin-techdocs-addons-test-utils'
+spec:
+  lifecycle: production
+  type: backstage-web-library
+  owner: techdocs-maintainers
diff --git a/plugins/techdocs-addons-test-utils/package.json b/plugins/techdocs-addons-test-utils/package.json
index a718d5a842..7d9d3e4a31 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.17-next.1",
+  "version": "1.0.21-next.2",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
@@ -22,6 +22,7 @@
     "backstage",
     "techdocs"
   ],
+  "sideEffects": false,
   "scripts": {
     "start": "backstage-cli package start",
     "build": "backstage-cli package build",
@@ -62,7 +63,6 @@
     "@testing-library/jest-dom": "^5.10.1",
     "@testing-library/react": "^12.1.3",
     "@testing-library/user-event": "^14.0.0",
-    "@types/node": "^16.11.26",
     "msw": "^1.0.0"
   },
   "files": [
diff --git a/plugins/techdocs-backend/CHANGELOG.md b/plugins/techdocs-backend/CHANGELOG.md
index ebb0e6c2ed..52676de3b0 100644
--- a/plugins/techdocs-backend/CHANGELOG.md
+++ b/plugins/techdocs-backend/CHANGELOG.md
@@ -1,5 +1,93 @@
 # @backstage/plugin-techdocs-backend
 
+## 1.7.0-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config@1.1.0-next.1
+  - @backstage/backend-common@0.19.5-next.2
+  - @backstage/plugin-search-backend-module-techdocs@0.1.7-next.2
+  - @backstage/integration@1.7.0-next.2
+  - @backstage/backend-plugin-api@0.6.3-next.2
+  - @backstage/catalog-model@1.4.2-next.1
+  - @backstage/plugin-permission-common@0.7.8-next.1
+  - @backstage/plugin-techdocs-node@1.8.0-next.2
+  - @backstage/catalog-client@1.4.4-next.1
+  - @backstage/errors@1.2.1
+  - @backstage/plugin-catalog-common@1.0.16-next.1
+  - @backstage/plugin-search-common@1.2.6-next.1
+
+## 1.7.0-next.1
+
+### Minor Changes
+
+- 5985d458ee30: Add a `techdocs.publisher.azureBlobStorage.connectionString` app-config setting, which can be leveraged for improved Azurite support.
+- 10a86bd4ae12: Add optional config and cli option for techdocs to specify default mkdocs plugins.
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config@1.1.0-next.0
+  - @backstage/integration@1.7.0-next.1
+  - @backstage/plugin-techdocs-node@1.8.0-next.1
+  - @backstage/backend-common@0.19.5-next.1
+  - @backstage/backend-plugin-api@0.6.3-next.1
+  - @backstage/catalog-model@1.4.2-next.0
+  - @backstage/plugin-permission-common@0.7.8-next.0
+  - @backstage/plugin-search-backend-module-techdocs@0.1.7-next.1
+  - @backstage/catalog-client@1.4.4-next.0
+  - @backstage/plugin-catalog-common@1.0.16-next.0
+  - @backstage/errors@1.2.1
+  - @backstage/plugin-search-common@1.2.6-next.0
+
+## 1.6.7-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.19.4-next.0
+  - @backstage/integration@1.7.0-next.0
+  - @backstage/backend-plugin-api@0.6.2-next.0
+  - @backstage/catalog-client@1.4.3
+  - @backstage/catalog-model@1.4.1
+  - @backstage/config@1.0.8
+  - @backstage/errors@1.2.1
+  - @backstage/plugin-catalog-common@1.0.15
+  - @backstage/plugin-permission-common@0.7.7
+  - @backstage/plugin-search-backend-module-techdocs@0.1.6-next.0
+  - @backstage/plugin-search-common@1.2.5
+  - @backstage/plugin-techdocs-node@1.7.6-next.0
+
+## 1.6.5
+
+### Patch Changes
+
+- 629cbd194a87: Use `coreServices.rootConfig` instead of `coreService.config`
+- Updated dependencies
+  - @backstage/plugin-search-backend-module-techdocs@0.1.4
+  - @backstage/backend-common@0.19.2
+  - @backstage/backend-plugin-api@0.6.0
+  - @backstage/integration@1.6.0
+  - @backstage/plugin-techdocs-node@1.7.4
+  - @backstage/catalog-client@1.4.3
+  - @backstage/catalog-model@1.4.1
+  - @backstage/config@1.0.8
+  - @backstage/errors@1.2.1
+  - @backstage/plugin-catalog-common@1.0.15
+  - @backstage/plugin-permission-common@0.7.7
+  - @backstage/plugin-search-common@1.2.5
+
+## 1.6.5-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-search-backend-module-techdocs@0.1.4-next.2
+  - @backstage/backend-plugin-api@0.6.0-next.2
+  - @backstage/backend-common@0.19.2-next.2
+  - @backstage/plugin-techdocs-node@1.7.4-next.2
+
 ## 1.6.5-next.1
 
 ### Patch Changes
diff --git a/plugins/techdocs-backend/alpha-api-report.md b/plugins/techdocs-backend/alpha-api-report.md
index 16db84c216..311dafd9a8 100644
--- a/plugins/techdocs-backend/alpha-api-report.md
+++ b/plugins/techdocs-backend/alpha-api-report.md
@@ -6,7 +6,8 @@
 import { BackendFeature } from '@backstage/backend-plugin-api';
 
 // @alpha
-export const techdocsPlugin: () => BackendFeature;
+const techdocsPlugin: () => BackendFeature;
+export default techdocsPlugin;
 
 // (No @packageDocumentation comment for this package)
 ```
diff --git a/plugins/techdocs-backend/catalog-info.yaml b/plugins/techdocs-backend/catalog-info.yaml
new file mode 100644
index 0000000000..3b30cde017
--- /dev/null
+++ b/plugins/techdocs-backend/catalog-info.yaml
@@ -0,0 +1,12 @@
+apiVersion: backstage.io/v1alpha1
+kind: Component
+metadata:
+  name: backstage-plugin-techdocs-backend
+  title: '@backstage/plugin-techdocs-backend'
+  description: >-
+    The Backstage backend plugin that renders technical documentation for your
+    components
+spec:
+  lifecycle: production
+  type: backstage-backend-plugin
+  owner: techdocs-maintainers
diff --git a/plugins/techdocs-backend/config.d.ts b/plugins/techdocs-backend/config.d.ts
index 3a05beabdc..01da1e7926 100644
--- a/plugins/techdocs-backend/config.d.ts
+++ b/plugins/techdocs-backend/config.d.ts
@@ -57,6 +57,11 @@ export interface Config {
          * will be broken in these scenarios.
          */
         legacyCopyReadmeMdToIndexMd?: boolean;
+
+        /**
+         * List of mkdocs plugins which should be added as default to all mkdocs.yml files.
+         */
+        defaultPlugins?: string[];
       };
     };
 
@@ -65,7 +70,12 @@ export interface Config {
      */
     publisher?:
       | {
-          type: 'local';
+          type:
+            | 'local'
+            | 'googleGcs'
+            | 'awsS3'
+            | 'azureBlobStorage'
+            | 'openStackSwift';
 
           local?: {
             /**
@@ -198,10 +208,15 @@ export interface Config {
            */
           azureBlobStorage?: {
             /**
-             * (Required) Credentials used to access a storage container.
+             * (Optional) Connection string of the storage container.
              * @visibility secret
              */
-            credentials: {
+            connectionString?: string;
+            /**
+             * (Optional) Credentials used to access a storage container.
+             * @visibility secret
+             */
+            credentials?: {
               /**
                * Account access name
                * @visibility secret
diff --git a/plugins/techdocs-backend/package.json b/plugins/techdocs-backend/package.json
index 87d10c91ae..b56ee004dd 100644
--- a/plugins/techdocs-backend/package.json
+++ b/plugins/techdocs-backend/package.json
@@ -1,14 +1,12 @@
 {
   "name": "@backstage/plugin-techdocs-backend",
   "description": "The Backstage backend plugin that renders technical documentation for your components",
-  "version": "1.6.5-next.1",
+  "version": "1.7.0-next.2",
   "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"
+    "access": "public"
   },
   "exports": {
     ".": "./src/index.ts",
diff --git a/plugins/techdocs-backend/src/alpha.ts b/plugins/techdocs-backend/src/alpha.ts
index 1a36c5a1f5..7ac39bde91 100644
--- a/plugins/techdocs-backend/src/alpha.ts
+++ b/plugins/techdocs-backend/src/alpha.ts
@@ -13,4 +13,5 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-export { techdocsPlugin } from './plugin';
+
+export { techdocsPlugin as default } from './plugin';
diff --git a/plugins/techdocs-backend/src/search/index.ts b/plugins/techdocs-backend/src/search/index.ts
index fc2b48375e..904f998042 100644
--- a/plugins/techdocs-backend/src/search/index.ts
+++ b/plugins/techdocs-backend/src/search/index.ts
@@ -25,12 +25,12 @@ import type { TechDocsCollatorFactoryOptions as _TechDocsCollatorFactoryOptions
 
 /**
  * @public
- * @deprecated import from `@backstage/search-backend-module-techdocs` instead
+ * @deprecated import from `@backstage/plugin-search-backend-module-techdocs` instead
  */
 export type TechDocsCollatorFactoryOptions = _TechDocsCollatorFactoryOptions;
 
 /**
  * @public
- * @deprecated import from `@backstage/search-backend-module-techdocs` instead
+ * @deprecated import from `@backstage/plugin-search-backend-module-techdocs` instead
  */
 export const DefaultTechDocsCollatorFactory = _DefaultTechDocsCollatorFactory;
diff --git a/plugins/techdocs-module-addons-contrib/CHANGELOG.md b/plugins/techdocs-module-addons-contrib/CHANGELOG.md
index 8af1e616bc..5ac5acaa93 100644
--- a/plugins/techdocs-module-addons-contrib/CHANGELOG.md
+++ b/plugins/techdocs-module-addons-contrib/CHANGELOG.md
@@ -1,5 +1,58 @@
 # @backstage/plugin-techdocs-module-addons-contrib
 
+## 1.1.0-next.2
+
+### Patch Changes
+
+- 8cec7664e146: Removed `@types/node` dependency
+- Updated dependencies
+  - @backstage/integration-react@1.1.19-next.2
+  - @backstage/core-components@0.13.5-next.2
+  - @backstage/core-plugin-api@1.6.0-next.2
+  - @backstage/plugin-techdocs-react@1.1.10-next.2
+  - @backstage/integration@1.7.0-next.2
+  - @backstage/theme@0.4.1
+
+## 1.1.0-next.1
+
+### Minor Changes
+
+- 86c19906fe4b: Enable zoom icon for techdocs images inside lightbox
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.13.5-next.1
+  - @backstage/integration@1.7.0-next.1
+  - @backstage/integration-react@1.1.19-next.1
+  - @backstage/plugin-techdocs-react@1.1.10-next.1
+  - @backstage/core-plugin-api@1.6.0-next.1
+  - @backstage/theme@0.4.1
+
+## 1.0.18-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/integration-react@1.1.18-next.0
+  - @backstage/integration@1.7.0-next.0
+  - @backstage/core-plugin-api@1.6.0-next.0
+  - @backstage/core-components@0.13.5-next.0
+  - @backstage/theme@0.4.1
+  - @backstage/plugin-techdocs-react@1.1.10-next.0
+
+## 1.0.16
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/integration-react@1.1.16
+  - @backstage/integration@1.6.0
+  - @backstage/core-components@0.13.4
+  - @backstage/core-plugin-api@1.5.3
+  - @backstage/theme@0.4.1
+  - @backstage/plugin-techdocs-react@1.1.9
+
 ## 1.0.16-next.1
 
 ### Patch Changes
diff --git a/plugins/techdocs-module-addons-contrib/catalog-info.yaml b/plugins/techdocs-module-addons-contrib/catalog-info.yaml
new file mode 100644
index 0000000000..a627718bef
--- /dev/null
+++ b/plugins/techdocs-module-addons-contrib/catalog-info.yaml
@@ -0,0 +1,10 @@
+apiVersion: backstage.io/v1alpha1
+kind: Component
+metadata:
+  name: backstage-plugin-techdocs-module-addons-contrib
+  title: '@backstage/plugin-techdocs-module-addons-contrib'
+  description: Plugin module for contributed TechDocs Addons
+spec:
+  lifecycle: production
+  type: backstage-frontend-plugin-module
+  owner: techdocs-maintainers
diff --git a/plugins/techdocs-module-addons-contrib/package.json b/plugins/techdocs-module-addons-contrib/package.json
index da388e9044..869a9f955c 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.16-next.1",
+  "version": "1.1.0-next.2",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
@@ -23,6 +23,7 @@
     "backstage",
     "techdocs"
   ],
+  "sideEffects": false,
   "scripts": {
     "start": "backstage-cli package start",
     "build": "backstage-cli package build",
@@ -62,7 +63,6 @@
     "@testing-library/jest-dom": "^5.10.1",
     "@testing-library/react": "^12.1.3",
     "@testing-library/user-event": "^14.0.0",
-    "@types/node": "^16.11.26",
     "@types/react": "^16.13.1 || ^17.0.0",
     "msw": "^1.0.0"
   },
diff --git a/plugins/techdocs-module-addons-contrib/src/LigthBox/LightBox.tsx b/plugins/techdocs-module-addons-contrib/src/LigthBox/LightBox.tsx
index b74c2f9659..38269e6245 100644
--- a/plugins/techdocs-module-addons-contrib/src/LigthBox/LightBox.tsx
+++ b/plugins/techdocs-module-addons-contrib/src/LigthBox/LightBox.tsx
@@ -17,7 +17,7 @@
 import { useEffect } from 'react';
 import { useShadowRootElements } from '@backstage/plugin-techdocs-react';
 // @ts-ignore
-import PhotoSwipeLightbox, { DataSource } from 'photoswipe/lightbox';
+import PhotoSwipeLightbox, { DataSource, ZoomLevel } from 'photoswipe/lightbox';
 import PhotoSwipe from 'photoswipe';
 import 'photoswipe/style.css';
 import './lightbox.css';
@@ -30,6 +30,21 @@ export const LightBoxAddon = () => {
 
     let lightbox = new PhotoSwipeLightbox({
       pswpModule: PhotoSwipe,
+      initialZoomLevel: 1,
+      secondaryZoomLevel: (zoomLevelObject: ZoomLevel) => {
+        // photoswipe/lightbox won't zoom the image further then the given width and height.
+        // therefore we need to calculate the zoom factor needed to fit the complete image in the viewport manually.
+        const imageWidth = zoomLevelObject.elementSize.x;
+        const imageHeight = zoomLevelObject.elementSize.y;
+        const viewportWidth = zoomLevelObject.panAreaSize.x;
+        const viewportHeight = zoomLevelObject.panAreaSize.y;
+
+        const widthScale = viewportWidth / imageWidth;
+        const heightScale = viewportHeight / imageHeight;
+
+        const scaleFactor = Math.min(widthScale, heightScale);
+        return scaleFactor;
+      },
       wheelToZoom: true,
       arrowPrevSVG:
         '<svg class="MuiSvgIcon-root MuiSvgIcon-fontSizeLarge  css-c1sh5i" focusable="false" aria-hidden="true" viewBox="0 0 24 24" data-testid="ArrowBackIosIcon" aria-label="fontSize large"><path d="M11.67 3.87 9.9 2.1 0 12l9.9 9.9 1.77-1.77L3.54 12z"></path></svg>',
@@ -37,8 +52,9 @@ export const LightBoxAddon = () => {
         '<svg class="MuiSvgIcon-root MuiSvgIcon-fontSizeLarge  css-c1sh5i" focusable="false" aria-hidden="true" viewBox="0 0 24 24" data-testid="ArrowForwardIosIcon" aria-label="fontSize large"><path d="M6.23 20.23 8 22l10-10L8 2 6.23 3.77 14.46 12z"></path></svg>',
       closeSVG:
         '<svg class="MuiSvgIcon-root MuiSvgIcon-fontSizeLarge  css-c1sh5i" focusable="false" aria-hidden="true" viewBox="0 0 24 24" data-testid="CloseIcon" aria-label="fontSize large"><path d="M19 6.41 17.59 5 12 10.59 6.41 5 5 6.41 10.59 12 5 17.59 6.41 19 12 13.41 17.59 19 19 17.59 13.41 12z"></path></svg>',
-      zoomSVG:
-        '<svg class="MuiSvgIcon-root MuiSvgIcon-fontSizeLarge  css-c1sh5i" focusable="false" aria-hidden="true" viewBox="0 0 24 24" data-testid="ZoomInIcon" aria-label="fontSize large"><path d="M15.5 14h-.79l-.28-.27C15.41 12.59 16 11.11 16 9.5 16 5.91 13.09 3 9.5 3S3 5.91 3 9.5 5.91 16 9.5 16c1.61 0 3.09-.59 4.23-1.57l.27.28v.79l5 4.99L20.49 19l-4.99-5zm-6 0C7.01 14 5 11.99 5 9.5S7.01 5 9.5 5 14 7.01 14 9.5 11.99 14 9.5 14z"></path><path d="M12 10h-2v2H9v-2H7V9h2V7h1v2h2v1z"></path></svg>',
+      zoomSVG: `<svg class="MuiSvgIcon-root MuiSvgIcon-fontSizeLarge  css-c1sh5i" focusable="false" aria-hidden="true" viewBox="0 0 24 24" data-testid="ZoomIcon" aria-label="fontSize large">
+          <path d="M15.5 14h-.79l-.28-.27C15.41 12.59 16 11.11 16 9.5 16 5.91 13.09 3 9.5 3S3 5.91 3 9.5 5.91 16 9.5 16c1.61 0 3.09-.59 4.23-1.57l.27.28v.79l5 4.99L20.49 19l-4.99-5zm-6 0C7.01 14 5 11.99 5 9.5S7.01 5 9.5 5 14 7.01 14 9.5 11.99 14 9.5 14z"></path><path d="M12 10h-2v2H9v-2H7V9h2V7h1v2h2v1z" id="photoswipe-zoom-icon-zoomin-path"></path><path d="M12 10H 7 V 9 H 12 Z" id="photoswipe-zoom-icon-zoomout-path">
+        </svg>`,
     });
 
     images.forEach((image, index) => {
diff --git a/plugins/techdocs-module-addons-contrib/src/LigthBox/lightbox.css b/plugins/techdocs-module-addons-contrib/src/LigthBox/lightbox.css
index 3371d0fa53..c864699bed 100644
--- a/plugins/techdocs-module-addons-contrib/src/LigthBox/lightbox.css
+++ b/plugins/techdocs-module-addons-contrib/src/LigthBox/lightbox.css
@@ -9,3 +9,13 @@
 .pswp__img {
   cursor: pointer !important;
 }
+
+/* hide "-" icon path */
+.pswp--zoomed-allowed #photoswipe-zoom-icon-zoomout-path {
+  display: none;
+}
+
+/* hide "+" path and show "-" */
+.pswp--zoomed-in #photoswipe-zoom-icon-zoomin-path {
+  display: none;
+}
diff --git a/plugins/techdocs-node/CHANGELOG.md b/plugins/techdocs-node/CHANGELOG.md
index 4f3b73146d..a241491d66 100644
--- a/plugins/techdocs-node/CHANGELOG.md
+++ b/plugins/techdocs-node/CHANGELOG.md
@@ -1,5 +1,69 @@
 # @backstage/plugin-techdocs-node
 
+## 1.8.0-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config@1.1.0-next.1
+  - @backstage/backend-common@0.19.5-next.2
+  - @backstage/integration@1.7.0-next.2
+  - @backstage/integration-aws-node@0.1.6-next.1
+  - @backstage/catalog-model@1.4.2-next.1
+  - @backstage/errors@1.2.1
+  - @backstage/plugin-search-common@1.2.6-next.1
+
+## 1.8.0-next.1
+
+### Minor Changes
+
+- 5985d458ee30: Add a `techdocs.publisher.azureBlobStorage.connectionString` app-config setting, which can be leveraged for improved Azurite support.
+- 10a86bd4ae12: Add optional config and cli option for techdocs to specify default mkdocs plugins.
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config@1.1.0-next.0
+  - @backstage/integration@1.7.0-next.1
+  - @backstage/backend-common@0.19.5-next.1
+  - @backstage/catalog-model@1.4.2-next.0
+  - @backstage/integration-aws-node@0.1.6-next.0
+  - @backstage/errors@1.2.1
+  - @backstage/plugin-search-common@1.2.6-next.0
+
+## 1.7.6-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.19.4-next.0
+  - @backstage/integration@1.7.0-next.0
+  - @backstage/catalog-model@1.4.1
+  - @backstage/config@1.0.8
+  - @backstage/errors@1.2.1
+  - @backstage/integration-aws-node@0.1.5
+  - @backstage/plugin-search-common@1.2.5
+
+## 1.7.4
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.19.2
+  - @backstage/integration@1.6.0
+  - @backstage/integration-aws-node@0.1.5
+  - @backstage/catalog-model@1.4.1
+  - @backstage/config@1.0.8
+  - @backstage/errors@1.2.1
+  - @backstage/plugin-search-common@1.2.5
+
+## 1.7.4-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.19.2-next.2
+
 ## 1.7.4-next.1
 
 ### Patch Changes
diff --git a/plugins/techdocs-node/catalog-info.yaml b/plugins/techdocs-node/catalog-info.yaml
new file mode 100644
index 0000000000..f29b70bf39
--- /dev/null
+++ b/plugins/techdocs-node/catalog-info.yaml
@@ -0,0 +1,12 @@
+apiVersion: backstage.io/v1alpha1
+kind: Component
+metadata:
+  name: backstage-plugin-techdocs-node
+  title: '@backstage/plugin-techdocs-node'
+  description: >-
+    Common node.js functionalities for TechDocs, to be shared between
+    techdocs-backend plugin and techdocs-cli
+spec:
+  lifecycle: production
+  type: backstage-node-library
+  owner: techdocs-maintainers
diff --git a/plugins/techdocs-node/package.json b/plugins/techdocs-node/package.json
index 5f0f3d69d7..34997de9d9 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.7.4-next.1",
+  "version": "1.8.0-next.2",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "publishConfig": {
diff --git a/plugins/techdocs-node/src/stages/generate/helpers.test.ts b/plugins/techdocs-node/src/stages/generate/helpers.test.ts
index 6bcdf0d984..e20e20ea5b 100644
--- a/plugins/techdocs-node/src/stages/generate/helpers.test.ts
+++ b/plugins/techdocs-node/src/stages/generate/helpers.test.ts
@@ -33,7 +33,7 @@ import {
 } from './helpers';
 import {
   patchMkdocsYmlPreBuild,
-  pathMkdocsYmlWithTechdocsPlugin,
+  patchMkdocsYmlWithPlugins,
 } from './mkdocsPatchers';
 import yaml from 'js-yaml';
 
@@ -310,7 +310,7 @@ describe('helpers', () => {
     });
   });
 
-  describe('pathMkdocsYmlWithTechdocsPlugin', () => {
+  describe('patchMkdocsYmlWithPlugins', () => {
     beforeEach(() => {
       mockFs({
         '/mkdocs_with_techdocs_plugin.yml': mkdocsYmlWithTechdocsPlugins,
@@ -319,7 +319,7 @@ describe('helpers', () => {
       });
     });
     it('should not add additional plugins if techdocs exists already in mkdocs file', async () => {
-      await pathMkdocsYmlWithTechdocsPlugin(
+      await patchMkdocsYmlWithPlugins(
         '/mkdocs_with_techdocs_plugin.yml',
         mockLogger,
       );
@@ -334,7 +334,7 @@ describe('helpers', () => {
       expect(parsedYml.plugins).toContain('techdocs-core');
     });
     it("should add the needed plugin if it doesn't exist in mkdocs file", async () => {
-      await pathMkdocsYmlWithTechdocsPlugin(
+      await patchMkdocsYmlWithPlugins(
         '/mkdocs_without_plugins.yml',
         mockLogger,
       );
@@ -347,7 +347,7 @@ describe('helpers', () => {
       expect(parsedYml.plugins).toContain('techdocs-core');
     });
     it('should not override existing plugins', async () => {
-      await pathMkdocsYmlWithTechdocsPlugin(
+      await patchMkdocsYmlWithPlugins(
         '/mkdocs_with_additional_plugins.yml',
         mockLogger,
       );
@@ -362,6 +362,23 @@ describe('helpers', () => {
       expect(parsedYml.plugins).toContain('not-techdocs-core');
       expect(parsedYml.plugins).toContain('also-not-techdocs-core');
     });
+    it('should add all provided default plugins', async () => {
+      await patchMkdocsYmlWithPlugins(
+        '/mkdocs_with_additional_plugins.yml',
+        mockLogger,
+        ['techdocs-core', 'custom-plugin'],
+      );
+
+      const updatedMkdocsYml = await fs.readFile(
+        '/mkdocs_with_additional_plugins.yml',
+      );
+      const parsedYml = yaml.load(updatedMkdocsYml.toString()) as {
+        plugins: string[];
+      };
+      expect(parsedYml.plugins).toHaveLength(4);
+      expect(parsedYml.plugins).toContain('techdocs-core');
+      expect(parsedYml.plugins).toContain('custom-plugin');
+    });
   });
 
   describe('patchIndexPreBuild', () => {
diff --git a/plugins/techdocs-node/src/stages/generate/mkdocsPatchers.ts b/plugins/techdocs-node/src/stages/generate/mkdocsPatchers.ts
index d03b5d83c2..945aab3884 100644
--- a/plugins/techdocs-node/src/stages/generate/mkdocsPatchers.ts
+++ b/plugins/techdocs-node/src/stages/generate/mkdocsPatchers.ts
@@ -138,27 +138,34 @@ export const patchMkdocsYmlPreBuild = async (
  * Update the mkdocs.yml file before TechDocs generator uses it to generate docs site.
  *
  * List of tasks:
- * - Add techdocs-core plugin to mkdocs file if it doesn't exist
+ * - Add all provided default plugins
  *
  * This function will not throw an error since this is not critical to the whole TechDocs pipeline.
  * Instead it will log warnings if there are any errors in reading, parsing or writing YAML.
  *
  * @param mkdocsYmlPath - Absolute path to mkdocs.yml or equivalent of a docs site
  * @param logger - A logger instance
+ * @param defaultPlugins - List of default mkdocs plugins
  */
-export const pathMkdocsYmlWithTechdocsPlugin = async (
+export const patchMkdocsYmlWithPlugins = async (
   mkdocsYmlPath: string,
   logger: Logger,
+  defaultPlugins: string[] = ['techdocs-core'],
 ) => {
   await patchMkdocsFile(mkdocsYmlPath, logger, mkdocsYml => {
-    // Modify mkdocs.yaml to contain the needed techdocs-core plugin if it is not there
+    // Modify mkdocs.yaml to contain the required default plugins
     if (!('plugins' in mkdocsYml)) {
-      mkdocsYml.plugins = ['techdocs-core'];
+      mkdocsYml.plugins = defaultPlugins;
       return true;
     }
 
-    if (mkdocsYml.plugins && !mkdocsYml.plugins.includes('techdocs-core')) {
-      mkdocsYml.plugins.push('techdocs-core');
+    if (
+      mkdocsYml.plugins &&
+      !defaultPlugins.every(plugin => mkdocsYml.plugins!.includes(plugin))
+    ) {
+      mkdocsYml.plugins = [
+        ...new Set([...mkdocsYml.plugins, ...defaultPlugins]),
+      ];
       return true;
     }
     return false;
diff --git a/plugins/techdocs-node/src/stages/generate/techdocs.test.ts b/plugins/techdocs-node/src/stages/generate/techdocs.test.ts
index 11c9ee0135..82bfcfff55 100644
--- a/plugins/techdocs-node/src/stages/generate/techdocs.test.ts
+++ b/plugins/techdocs-node/src/stages/generate/techdocs.test.ts
@@ -157,4 +157,24 @@ describe('readGeneratorConfig', () => {
       legacyCopyReadmeMdToIndexMd: true,
     });
   });
+
+  it('should read the default plugins config', () => {
+    const config = new ConfigReader({
+      techdocs: {
+        generator: {
+          runIn: 'docker',
+          dockerImage: 'my-org/techdocs',
+          pullImage: false,
+          mkdocs: { defaultPlugins: ['mkdocs-custom-plugin'] },
+        },
+      },
+    });
+
+    expect(readGeneratorConfig(config, logger)).toEqual({
+      runIn: 'docker',
+      dockerImage: 'my-org/techdocs',
+      pullImage: false,
+      defaultPlugins: ['mkdocs-custom-plugin'],
+    });
+  });
 });
diff --git a/plugins/techdocs-node/src/stages/generate/techdocs.ts b/plugins/techdocs-node/src/stages/generate/techdocs.ts
index 06160b85c9..b1baf214b3 100644
--- a/plugins/techdocs-node/src/stages/generate/techdocs.ts
+++ b/plugins/techdocs-node/src/stages/generate/techdocs.ts
@@ -33,7 +33,7 @@ import {
 
 import {
   patchMkdocsYmlPreBuild,
-  pathMkdocsYmlWithTechdocsPlugin,
+  patchMkdocsYmlWithPlugins,
 } from './mkdocsPatchers';
 import {
   GeneratorBase,
@@ -121,10 +121,18 @@ export class TechdocsGenerator implements GeneratorBase {
       await patchIndexPreBuild({ inputDir, logger: childLogger, docsDir });
     }
 
-    if (!this.options.omitTechdocsCoreMkdocsPlugin) {
-      await pathMkdocsYmlWithTechdocsPlugin(mkdocsYmlPath, childLogger);
+    // patch the list of mkdocs plugins
+    const defaultPlugins = this.options.defaultPlugins ?? [];
+
+    if (
+      !this.options.omitTechdocsCoreMkdocsPlugin &&
+      !defaultPlugins.includes('techdocs-core')
+    ) {
+      defaultPlugins.push('techdocs-core');
     }
 
+    await patchMkdocsYmlWithPlugins(mkdocsYmlPath, childLogger, defaultPlugins);
+
     // Directories to bind on container
     const mountDirs = {
       [inputDir]: '/input',
@@ -233,5 +241,8 @@ export function readGeneratorConfig(
     legacyCopyReadmeMdToIndexMd: config.getOptionalBoolean(
       'techdocs.generator.mkdocs.legacyCopyReadmeMdToIndexMd',
     ),
+    defaultPlugins: config.getOptionalStringArray(
+      'techdocs.generator.mkdocs.defaultPlugins',
+    ),
   };
 }
diff --git a/plugins/techdocs-node/src/stages/generate/types.ts b/plugins/techdocs-node/src/stages/generate/types.ts
index 70c332344a..eca1057914 100644
--- a/plugins/techdocs-node/src/stages/generate/types.ts
+++ b/plugins/techdocs-node/src/stages/generate/types.ts
@@ -41,6 +41,7 @@ export type GeneratorConfig = {
   pullImage?: boolean;
   omitTechdocsCoreMkdocsPlugin?: boolean;
   legacyCopyReadmeMdToIndexMd?: boolean;
+  defaultPlugins?: string[];
 };
 
 /**
diff --git a/plugins/techdocs-node/src/stages/publish/azureBlobStorage.ts b/plugins/techdocs-node/src/stages/publish/azureBlobStorage.ts
index bcbc10a94d..39a50e963a 100644
--- a/plugins/techdocs-node/src/stages/publish/azureBlobStorage.ts
+++ b/plugins/techdocs-node/src/stages/publish/azureBlobStorage.ts
@@ -66,6 +66,7 @@ export class AzureBlobStoragePublish implements PublisherBase {
   }
 
   static fromConfig(config: Config, logger: Logger): PublisherBase {
+    let storageClient: BlobServiceClient;
     let containerName = '';
     try {
       containerName = config.getString(
@@ -78,41 +79,53 @@ export class AzureBlobStoragePublish implements PublisherBase {
       );
     }
 
-    let accountName = '';
-    try {
-      accountName = config.getString(
-        'techdocs.publisher.azureBlobStorage.credentials.accountName',
-      );
-    } catch (error) {
-      throw new Error(
-        "Since techdocs.publisher.type is set to 'azureBlobStorage' in your app config, " +
-          'techdocs.publisher.azureBlobStorage.credentials.accountName is required.',
-      );
-    }
-
-    // Credentials is an optional config. If missing, default Azure Blob Storage environment variables will be used.
-    // https://docs.microsoft.com/en-us/azure/storage/common/storage-auth-aad-app
-    const accountKey = config.getOptionalString(
-      'techdocs.publisher.azureBlobStorage.credentials.accountKey',
-    );
-
-    let credential;
-    if (accountKey) {
-      credential = new StorageSharedKeyCredential(accountName, accountKey);
-    } else {
-      credential = new DefaultAzureCredential();
-    }
-
-    const storageClient = new BlobServiceClient(
-      `https://${accountName}.blob.core.windows.net`,
-      credential,
-    );
-
     const legacyPathCasing =
       config.getOptionalBoolean(
         'techdocs.legacyUseCaseSensitiveTripletPaths',
       ) || false;
 
+    // Give more priority for connectionString, if configured, return the AzureBlobStoragePublish object here itself
+    const connectionStringKey =
+      'techdocs.publisher.azureBlobStorage.connectionString';
+    const connectionString = config.getOptionalString(connectionStringKey);
+
+    if (connectionString) {
+      logger.info(
+        `Using '${connectionStringKey}' configuration to create storage client`,
+      );
+      storageClient = BlobServiceClient.fromConnectionString(connectionString);
+    } else {
+      let accountName = '';
+      try {
+        accountName = config.getString(
+          'techdocs.publisher.azureBlobStorage.credentials.accountName',
+        );
+      } catch (error) {
+        throw new Error(
+          "Since techdocs.publisher.type is set to 'azureBlobStorage' in your app config, " +
+            'techdocs.publisher.azureBlobStorage.credentials.accountName is required.',
+        );
+      }
+
+      // Credentials is an optional config. If missing, default Azure Blob Storage environment variables will be used.
+      // https://docs.microsoft.com/en-us/azure/storage/common/storage-auth-aad-app
+      const accountKey = config.getOptionalString(
+        'techdocs.publisher.azureBlobStorage.credentials.accountKey',
+      );
+
+      let credential;
+      if (accountKey) {
+        credential = new StorageSharedKeyCredential(accountName, accountKey);
+      } else {
+        credential = new DefaultAzureCredential();
+      }
+
+      storageClient = new BlobServiceClient(
+        `https://${accountName}.blob.core.windows.net`,
+        credential,
+      );
+    }
+
     return new AzureBlobStoragePublish({
       storageClient: storageClient,
       containerName: containerName,
diff --git a/plugins/techdocs-react/CHANGELOG.md b/plugins/techdocs-react/CHANGELOG.md
index 8aa94ebbe5..436e5faf3a 100644
--- a/plugins/techdocs-react/CHANGELOG.md
+++ b/plugins/techdocs-react/CHANGELOG.md
@@ -1,5 +1,49 @@
 # @backstage/plugin-techdocs-react
 
+## 1.1.10-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.13.5-next.2
+  - @backstage/core-plugin-api@1.6.0-next.2
+  - @backstage/config@1.1.0-next.1
+  - @backstage/catalog-model@1.4.2-next.1
+  - @backstage/version-bridge@1.0.4
+
+## 1.1.10-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.13.5-next.1
+  - @backstage/config@1.1.0-next.0
+  - @backstage/catalog-model@1.4.2-next.0
+  - @backstage/core-plugin-api@1.6.0-next.1
+  - @backstage/version-bridge@1.0.4
+
+## 1.1.10-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-plugin-api@1.6.0-next.0
+  - @backstage/core-components@0.13.5-next.0
+  - @backstage/catalog-model@1.4.1
+  - @backstage/config@1.0.8
+  - @backstage/version-bridge@1.0.4
+
+## 1.1.9
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.13.4
+  - @backstage/core-plugin-api@1.5.3
+  - @backstage/catalog-model@1.4.1
+  - @backstage/config@1.0.8
+  - @backstage/version-bridge@1.0.4
+
 ## 1.1.9-next.0
 
 ### Patch Changes
diff --git a/plugins/techdocs-react/api-report.md b/plugins/techdocs-react/api-report.md
index bb21e25dfd..93456b7586 100644
--- a/plugins/techdocs-react/api-report.md
+++ b/plugins/techdocs-react/api-report.md
@@ -91,7 +91,7 @@ export type TechDocsMetadata = {
 
 // @public
 export const TechDocsReaderPageProvider: React_2.MemoExoticComponent<
-  (props: TechDocsReaderPageProviderProps) => JSX.Element
+  (props: TechDocsReaderPageProviderProps) => React_2.JSX.Element
 >;
 
 // @public
@@ -120,7 +120,9 @@ export type TechDocsReaderPageValue = {
 };
 
 // @public
-export const TechDocsShadowDom: (props: TechDocsShadowDomProps) => JSX.Element;
+export const TechDocsShadowDom: (
+  props: TechDocsShadowDomProps,
+) => React_2.JSX.Element;
 
 // @public
 export type TechDocsShadowDomProps = PropsWithChildren<{
diff --git a/plugins/techdocs-react/catalog-info.yaml b/plugins/techdocs-react/catalog-info.yaml
new file mode 100644
index 0000000000..73d71b7b24
--- /dev/null
+++ b/plugins/techdocs-react/catalog-info.yaml
@@ -0,0 +1,10 @@
+apiVersion: backstage.io/v1alpha1
+kind: Component
+metadata:
+  name: backstage-plugin-techdocs-react
+  title: '@backstage/plugin-techdocs-react'
+  description: Shared frontend utilities for TechDocs and Addons
+spec:
+  lifecycle: production
+  type: backstage-web-library
+  owner: techdocs-maintainers
diff --git a/plugins/techdocs-react/package.json b/plugins/techdocs-react/package.json
index 42df70d181..81212ea313 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.9-next.0",
+  "version": "1.1.10-next.2",
   "publishConfig": {
     "access": "public",
     "main": "dist/index.esm.js",
@@ -23,6 +23,7 @@
   "license": "Apache-2.0",
   "main": "src/index.ts",
   "types": "src/index.ts",
+  "sideEffects": false,
   "scripts": {
     "build": "backstage-cli package build",
     "lint": "backstage-cli package lint",
diff --git a/plugins/techdocs/CHANGELOG.md b/plugins/techdocs/CHANGELOG.md
index fe0813b36a..83647e1ec6 100644
--- a/plugins/techdocs/CHANGELOG.md
+++ b/plugins/techdocs/CHANGELOG.md
@@ -1,5 +1,91 @@
 # @backstage/plugin-techdocs
 
+## 1.7.0-next.2
+
+### Minor Changes
+
+- e44f45ac4515: This change allows a new annotation of `backstage.io/techdocs-entity` this ref allows you to reference another entity for its TechDocs. This allows you have a single TechDoc for all items in a system, for example you might have a frontend and a backend in the same repo. This would allow you to have TechDocs build under a `System` entity while referencing the system e.g.: `backstage.io/techdocs-entity: system:default/example` that will show the systems docs in both the TechDocs button and the TechDocs tab without needing to do duplicate builds and filling the TechDocs page with garbage.
+
+### Patch Changes
+
+- 8cec7664e146: Removed `@types/node` dependency
+- Updated dependencies
+  - @backstage/integration-react@1.1.19-next.2
+  - @backstage/core-components@0.13.5-next.2
+  - @backstage/core-plugin-api@1.6.0-next.2
+  - @backstage/config@1.1.0-next.1
+  - @backstage/plugin-catalog-react@1.8.4-next.2
+  - @backstage/plugin-search-react@1.7.0-next.2
+  - @backstage/plugin-techdocs-react@1.1.10-next.2
+  - @backstage/integration@1.7.0-next.2
+  - @backstage/catalog-model@1.4.2-next.1
+  - @backstage/errors@1.2.1
+  - @backstage/theme@0.4.1
+  - @backstage/plugin-search-common@1.2.6-next.1
+
+## 1.6.9-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.8.4-next.1
+  - @backstage/core-components@0.13.5-next.1
+  - @backstage/config@1.1.0-next.0
+  - @backstage/integration@1.7.0-next.1
+  - @backstage/plugin-search-react@1.7.0-next.1
+  - @backstage/integration-react@1.1.19-next.1
+  - @backstage/plugin-techdocs-react@1.1.10-next.1
+  - @backstage/catalog-model@1.4.2-next.0
+  - @backstage/core-plugin-api@1.6.0-next.1
+  - @backstage/errors@1.2.1
+  - @backstage/theme@0.4.1
+  - @backstage/plugin-search-common@1.2.6-next.0
+
+## 1.6.8-next.0
+
+### Patch Changes
+
+- 88c9525a36f3: Fixed bug in styles that caused next and previous links in footer to overlap page content.
+- Updated dependencies
+  - @backstage/integration-react@1.1.18-next.0
+  - @backstage/integration@1.7.0-next.0
+  - @backstage/core-plugin-api@1.6.0-next.0
+  - @backstage/core-components@0.13.5-next.0
+  - @backstage/catalog-model@1.4.1
+  - @backstage/config@1.0.8
+  - @backstage/errors@1.2.1
+  - @backstage/theme@0.4.1
+  - @backstage/plugin-catalog-react@1.8.3-next.0
+  - @backstage/plugin-search-common@1.2.5
+  - @backstage/plugin-search-react@1.6.5-next.0
+  - @backstage/plugin-techdocs-react@1.1.10-next.0
+
+## 1.6.6
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/integration-react@1.1.16
+  - @backstage/integration@1.6.0
+  - @backstage/core-components@0.13.4
+  - @backstage/plugin-catalog-react@1.8.1
+  - @backstage/core-plugin-api@1.5.3
+  - @backstage/plugin-search-react@1.6.4
+  - @backstage/catalog-model@1.4.1
+  - @backstage/config@1.0.8
+  - @backstage/errors@1.2.1
+  - @backstage/theme@0.4.1
+  - @backstage/plugin-search-common@1.2.5
+  - @backstage/plugin-techdocs-react@1.1.9
+
+## 1.6.6-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.8.1-next.1
+  - @backstage/integration-react@1.1.16-next.1
+
 ## 1.6.6-next.1
 
 ### Patch Changes
diff --git a/plugins/techdocs/api-report.md b/plugins/techdocs/api-report.md
index 27af44bb13..3207a16f87 100644
--- a/plugins/techdocs/api-report.md
+++ b/plugins/techdocs/api-report.md
@@ -14,6 +14,7 @@ import { DiscoveryApi } from '@backstage/core-plugin-api';
 import { Entity } from '@backstage/catalog-model';
 import { FetchApi } from '@backstage/core-plugin-api';
 import { IdentityApi } from '@backstage/core-plugin-api';
+import { JSX as JSX_2 } from 'react';
 import { PropsWithChildren } from 'react';
 import { default as React_2 } from 'react';
 import { ReactNode } from 'react';
@@ -51,13 +52,15 @@ export type ContentStateTypes =
 // @public
 export const DefaultTechDocsHome: (
   props: TechDocsIndexPageProps,
-) => JSX.Element;
+) => React_2.JSX.Element;
 
 // @public @deprecated
 export type DefaultTechDocsHomeProps = TechDocsIndexPageProps;
 
 // @public
-export const DocsCardGrid: (props: DocsCardGridProps) => JSX.Element | null;
+export const DocsCardGrid: (
+  props: DocsCardGridProps,
+) => React_2.JSX.Element | null;
 
 // @public
 export type DocsCardGridProps = {
@@ -72,7 +75,7 @@ export type DocsGroupConfig = {
 
 // @public
 export const DocsTable: {
-  (props: DocsTableProps): JSX.Element | null;
+  (props: DocsTableProps): React_2.JSX.Element | null;
   columns: {
     createNameColumn(): TableColumn<DocsTableRow>;
     createOwnerColumn(): TableColumn<DocsTableRow>;
@@ -80,7 +83,7 @@ export const DocsTable: {
   };
   actions: {
     createCopyDocsUrlAction(copyToClipboard: Function): (row: DocsTableRow) => {
-      icon: () => JSX.Element;
+      icon: () => React_2.JSX.Element;
       tooltip: string;
       onClick: () => any;
     };
@@ -91,7 +94,7 @@ export const DocsTable: {
       cellStyle: {
         paddingLeft: string;
       };
-      icon: () => JSX.Element;
+      icon: () => React_2.JSX.Element;
       tooltip: string;
       onClick: () => any;
     };
@@ -121,12 +124,12 @@ export type DocsTableRow = {
 // @public
 export const EmbeddedDocsRouter: (
   props: PropsWithChildren<{}>,
-) => JSX.Element | null;
+) => React_2.JSX.Element | null;
 
 // @public
 export const EntityListDocsGrid: (
   props: EntityListDocsGridPageProps,
-) => JSX.Element;
+) => React_2.JSX.Element;
 
 // @public
 export type EntityListDocsGridPageProps = {
@@ -135,7 +138,7 @@ export type EntityListDocsGridPageProps = {
 
 // @public
 export const EntityListDocsTable: {
-  (props: EntityListDocsTableProps): JSX.Element;
+  (props: EntityListDocsTableProps): React_2.JSX.Element;
   columns: {
     createNameColumn(): TableColumn<DocsTableRow>;
     createOwnerColumn(): TableColumn<DocsTableRow>;
@@ -143,7 +146,7 @@ export const EntityListDocsTable: {
   };
   actions: {
     createCopyDocsUrlAction(copyToClipboard: Function): (row: DocsTableRow) => {
-      icon: () => JSX.Element;
+      icon: () => React_2.JSX.Element;
       tooltip: string;
       onClick: () => any;
     };
@@ -154,7 +157,7 @@ export const EntityListDocsTable: {
       cellStyle: {
         paddingLeft: string;
       };
-      icon: () => JSX.Element;
+      icon: () => React_2.JSX.Element;
       tooltip: string;
       onClick: () => any;
     };
@@ -171,7 +174,7 @@ export type EntityListDocsTableProps = {
 // @public
 export const EntityTechdocsContent: (props: {
   children?: ReactNode;
-}) => JSX.Element | null;
+}) => JSX_2.Element | null;
 
 // @public
 export const isTechDocsAvailable: (entity: Entity) => boolean;
@@ -194,7 +197,9 @@ export interface PanelConfig {
 export type PanelType = 'DocsCardGrid' | 'DocsTable';
 
 // @public @deprecated
-export const Reader: (props: TechDocsReaderPageContentProps) => JSX.Element;
+export const Reader: (
+  props: TechDocsReaderPageContentProps,
+) => React_2.JSX.Element;
 
 // @public
 export type ReaderState = {
@@ -208,7 +213,7 @@ export type ReaderState = {
 };
 
 // @public
-export const Router: () => JSX.Element;
+export const Router: () => React_2.JSX.Element;
 
 // @public @deprecated
 export type SyncResult = 'cached' | 'updated';
@@ -261,7 +266,7 @@ export class TechDocsClient implements TechDocsApi_2 {
 // @public
 export const TechDocsCustomHome: (
   props: TechDocsCustomHomeProps,
-) => JSX.Element;
+) => JSX_2.Element;
 
 // @public
 export type TechDocsCustomHomeProps = {
@@ -272,7 +277,9 @@ export type TechDocsCustomHomeProps = {
 export type TechDocsEntityMetadata = TechDocsEntityMetadata_2;
 
 // @public
-export const TechDocsIndexPage: (props: TechDocsIndexPageProps) => JSX.Element;
+export const TechDocsIndexPage: (
+  props: TechDocsIndexPageProps,
+) => JSX_2.Element;
 
 // @public
 export type TechDocsIndexPageProps = {
@@ -285,12 +292,12 @@ export type TechDocsIndexPageProps = {
 export type TechDocsMetadata = TechDocsMetadata_2;
 
 // @public
-export const TechdocsPage: () => JSX.Element;
+export const TechdocsPage: () => JSX_2.Element;
 
 // @public
 export const TechDocsPageWrapper: (
   props: TechDocsPageWrapperProps,
-) => JSX.Element;
+) => React_2.JSX.Element;
 
 // @public
 export type TechDocsPageWrapperProps = {
@@ -320,7 +327,7 @@ export { techdocsPlugin };
 // @public
 export const TechDocsReaderLayout: (
   props: TechDocsReaderLayoutProps,
-) => JSX.Element;
+) => React_2.JSX.Element;
 
 // @public
 export type TechDocsReaderLayoutProps = {
@@ -331,12 +338,12 @@ export type TechDocsReaderLayoutProps = {
 // @public
 export const TechDocsReaderPage: (
   props: TechDocsReaderPageProps,
-) => JSX.Element;
+) => JSX_2.Element;
 
 // @public
 export const TechDocsReaderPageContent: (
   props: TechDocsReaderPageContentProps,
-) => JSX.Element;
+) => React_2.JSX.Element;
 
 // @public
 export type TechDocsReaderPageContentProps = {
@@ -348,7 +355,7 @@ export type TechDocsReaderPageContentProps = {
 // @public
 export const TechDocsReaderPageHeader: (
   props: TechDocsReaderPageHeaderProps,
-) => JSX.Element | null;
+) => React_2.JSX.Element | null;
 
 // @public @deprecated
 export type TechDocsReaderPageHeaderProps = PropsWithChildren<{
@@ -374,12 +381,12 @@ export type TechDocsReaderPageRenderFunction = (options: {
 // @public
 export const TechDocsReaderPageSubheader: (props: {
   toolbarProps?: ToolbarProps;
-}) => JSX.Element | null;
+}) => React_2.JSX.Element | null;
 
 // @public
 export const TechDocsReaderProvider: (
   props: TechDocsReaderProviderProps,
-) => JSX.Element;
+) => React_2.JSX.Element;
 
 // @public
 export type TechDocsReaderProviderProps = {
@@ -392,7 +399,9 @@ export type TechDocsReaderProviderRenderFunction = (
 ) => JSX.Element;
 
 // @public
-export const TechDocsSearch: (props: TechDocsSearchProps) => JSX.Element;
+export const TechDocsSearch: (
+  props: TechDocsSearchProps,
+) => React_2.JSX.Element;
 
 // @public
 export type TechDocsSearchProps = {
diff --git a/plugins/techdocs/catalog-info.yaml b/plugins/techdocs/catalog-info.yaml
new file mode 100644
index 0000000000..136ef1e07f
--- /dev/null
+++ b/plugins/techdocs/catalog-info.yaml
@@ -0,0 +1,12 @@
+apiVersion: backstage.io/v1alpha1
+kind: Component
+metadata:
+  name: backstage-plugin-techdocs
+  title: '@backstage/plugin-techdocs'
+  description: >-
+    The Backstage plugin that renders technical documentation for your
+    components
+spec:
+  lifecycle: production
+  type: backstage-frontend-plugin
+  owner: techdocs-maintainers
diff --git a/plugins/techdocs/package.json b/plugins/techdocs/package.json
index 080401b9f6..ce90da9c0a 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.6.6-next.1",
+  "version": "1.7.0-next.2",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
@@ -23,6 +23,7 @@
     "backstage",
     "techdocs"
   ],
+  "sideEffects": false,
   "scripts": {
     "build": "backstage-cli package build",
     "start": "backstage-cli package start",
@@ -76,7 +77,6 @@
     "@testing-library/user-event": "^14.0.0",
     "@types/dompurify": "^2.2.2",
     "@types/event-source-polyfill": "^1.0.0",
-    "@types/node": "^16.11.26",
     "canvas": "^2.10.2",
     "cross-fetch": "^3.1.5",
     "msw": "^1.0.0"
diff --git a/plugins/techdocs/src/EntityPageDocs.tsx b/plugins/techdocs/src/EntityPageDocs.tsx
index b0e529f9a5..af184bb1a8 100644
--- a/plugins/techdocs/src/EntityPageDocs.tsx
+++ b/plugins/techdocs/src/EntityPageDocs.tsx
@@ -14,18 +14,33 @@
  * limitations under the License.
  */
 
+import {
+  Entity,
+  getCompoundEntityRef,
+  parseEntityRef,
+} from '@backstage/catalog-model';
+
 import React from 'react';
-
-import { Entity, getCompoundEntityRef } from '@backstage/catalog-model';
-
 import { TechDocsReaderPage } from './plugin';
-import { TechDocsReaderPageSubheader } from './reader/components/TechDocsReaderPageSubheader';
 import { TechDocsReaderPageContent } from './reader/components/TechDocsReaderPageContent';
+import { TechDocsReaderPageSubheader } from './reader/components/TechDocsReaderPageSubheader';
+
+const TECHDOCS_EXTERNAL_ANNOTATION = 'backstage.io/techdocs-entity';
 
 type EntityPageDocsProps = { entity: Entity };
 
 export const EntityPageDocs = ({ entity }: EntityPageDocsProps) => {
-  const entityRef = getCompoundEntityRef(entity);
+  let entityRef = getCompoundEntityRef(entity);
+
+  if (entity.metadata.annotations?.[TECHDOCS_EXTERNAL_ANNOTATION]) {
+    try {
+      entityRef = parseEntityRef(
+        entity.metadata.annotations?.[TECHDOCS_EXTERNAL_ANNOTATION],
+      );
+    } catch {
+      // not a fan of this but we don't care if the parseEntityRef fails
+    }
+  }
 
   return (
     <TechDocsReaderPage entityRef={entityRef}>
diff --git a/plugins/techdocs/src/Router.tsx b/plugins/techdocs/src/Router.tsx
index f821da2a9f..814bf3cf65 100644
--- a/plugins/techdocs/src/Router.tsx
+++ b/plugins/techdocs/src/Router.tsx
@@ -18,22 +18,24 @@ import React, { PropsWithChildren } from 'react';
 import { Route, Routes, useRoutes } from 'react-router-dom';
 
 import { Entity } from '@backstage/catalog-model';
-import { useEntity } from '@backstage/plugin-catalog-react';
-import { MissingAnnotationEmptyState } from '@backstage/core-components';
-
 import { EntityPageDocs } from './EntityPageDocs';
+import { MissingAnnotationEmptyState } from '@backstage/core-components';
 import { TechDocsIndexPage } from './home/components/TechDocsIndexPage';
 import { TechDocsReaderPage } from './reader/components/TechDocsReaderPage';
+import { useEntity } from '@backstage/plugin-catalog-react';
 
 const TECHDOCS_ANNOTATION = 'backstage.io/techdocs-ref';
 
+const TECHDOCS_EXTERNAL_ANNOTATION = 'backstage.io/techdocs-entity';
+
 /**
  * Helper that takes in entity and returns true/false if TechDocs is available for the entity
  *
  * @public
  */
 export const isTechDocsAvailable = (entity: Entity) =>
-  Boolean(entity?.metadata?.annotations?.[TECHDOCS_ANNOTATION]);
+  Boolean(entity?.metadata?.annotations?.[TECHDOCS_ANNOTATION]) ||
+  Boolean(entity?.metadata?.annotations?.[TECHDOCS_EXTERNAL_ANNOTATION]);
 
 /**
  * Responsible for registering routes for TechDocs, TechDocs Homepage and separate TechDocs page
@@ -75,10 +77,12 @@ export const EmbeddedDocsRouter = (props: PropsWithChildren<{}>) => {
     },
   ]);
 
-  const projectId = entity.metadata.annotations?.[TECHDOCS_ANNOTATION];
+  const projectId =
+    entity.metadata.annotations?.[TECHDOCS_ANNOTATION] ||
+    entity.metadata.annotations?.[TECHDOCS_EXTERNAL_ANNOTATION];
 
   if (!projectId) {
-    return <MissingAnnotationEmptyState annotation={TECHDOCS_ANNOTATION} />;
+    return <MissingAnnotationEmptyState annotation={[TECHDOCS_ANNOTATION]} />;
   }
 
   return element;
diff --git a/plugins/techdocs/src/reader/transformers/styles/rules/layout.ts b/plugins/techdocs/src/reader/transformers/styles/rules/layout.ts
index cce6af7d6f..d78f8222f8 100644
--- a/plugins/techdocs/src/reader/transformers/styles/rules/layout.ts
+++ b/plugins/techdocs/src/reader/transformers/styles/rules/layout.ts
@@ -120,7 +120,7 @@ export default ({ theme, sidebar }: RuleOptions) => `
 .md-footer__title {
   background-color: unset;
 }
-.md-footer-nav__link {
+.md-footer-nav__link, .md-footer__link {
   width: 16rem;
 }
 
diff --git a/plugins/todo-backend/CHANGELOG.md b/plugins/todo-backend/CHANGELOG.md
index ab059adbff..f5f6b0d926 100644
--- a/plugins/todo-backend/CHANGELOG.md
+++ b/plugins/todo-backend/CHANGELOG.md
@@ -1,5 +1,80 @@
 # @backstage/plugin-todo-backend
 
+## 0.2.3-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config@1.1.0-next.1
+  - @backstage/backend-common@0.19.5-next.2
+  - @backstage/plugin-catalog-node@1.4.4-next.2
+  - @backstage/integration@1.7.0-next.2
+  - @backstage/backend-plugin-api@0.6.3-next.2
+  - @backstage/catalog-model@1.4.2-next.1
+  - @backstage/backend-openapi-utils@0.0.3
+  - @backstage/catalog-client@1.4.4-next.1
+  - @backstage/errors@1.2.1
+
+## 0.2.3-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config@1.1.0-next.0
+  - @backstage/integration@1.7.0-next.1
+  - @backstage/backend-common@0.19.5-next.1
+  - @backstage/backend-plugin-api@0.6.3-next.1
+  - @backstage/catalog-model@1.4.2-next.0
+  - @backstage/plugin-catalog-node@1.4.4-next.1
+  - @backstage/catalog-client@1.4.4-next.0
+  - @backstage/backend-openapi-utils@0.0.3
+  - @backstage/errors@1.2.1
+
+## 0.2.2-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.19.4-next.0
+  - @backstage/integration@1.7.0-next.0
+  - @backstage/backend-openapi-utils@0.0.3
+  - @backstage/backend-plugin-api@0.6.2-next.0
+  - @backstage/catalog-client@1.4.3
+  - @backstage/catalog-model@1.4.1
+  - @backstage/config@1.0.8
+  - @backstage/errors@1.2.1
+  - @backstage/plugin-catalog-node@1.4.3-next.0
+
+## 0.2.0
+
+### Minor Changes
+
+- ebeb77586975: Now performs request validation based on OpenAPI schema through `@backstage/backend-openapi-utils`. Error responses for invalid input, like `"a"` instead of a number, may have changed.
+
+### Patch Changes
+
+- 629cbd194a87: Use `coreServices.rootConfig` instead of `coreService.config`
+- ad3fb5401729: Fixed a bug where filter queries from the frontend would always fail validation.
+- Updated dependencies
+  - @backstage/backend-common@0.19.2
+  - @backstage/backend-plugin-api@0.6.0
+  - @backstage/backend-openapi-utils@0.0.3
+  - @backstage/plugin-catalog-node@1.4.1
+  - @backstage/integration@1.6.0
+  - @backstage/catalog-client@1.4.3
+  - @backstage/catalog-model@1.4.1
+  - @backstage/config@1.0.8
+  - @backstage/errors@1.2.1
+
+## 0.2.0-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@0.6.0-next.2
+  - @backstage/backend-common@0.19.2-next.2
+  - @backstage/plugin-catalog-node@1.4.1-next.2
+
 ## 0.2.0-next.1
 
 ### Patch Changes
diff --git a/plugins/todo-backend/api-report.md b/plugins/todo-backend/api-report.md
index 6db1e012e9..3244b397eb 100644
--- a/plugins/todo-backend/api-report.md
+++ b/plugins/todo-backend/api-report.md
@@ -91,7 +91,8 @@ export type TodoParserResult = {
 };
 
 // @public
-export const todoPlugin: () => BackendFeature;
+const todoPlugin: () => BackendFeature;
+export default todoPlugin;
 
 // @public (undocumented)
 export interface TodoReader {
diff --git a/plugins/todo-backend/catalog-info.yaml b/plugins/todo-backend/catalog-info.yaml
new file mode 100644
index 0000000000..6406a6baae
--- /dev/null
+++ b/plugins/todo-backend/catalog-info.yaml
@@ -0,0 +1,12 @@
+apiVersion: backstage.io/v1alpha1
+kind: Component
+metadata:
+  name: backstage-plugin-todo-backend
+  title: '@backstage/plugin-todo-backend'
+  description: >-
+    A Backstage backend plugin that lets you browse TODO comments in your source
+    code
+spec:
+  lifecycle: experimental
+  type: backstage-backend-plugin
+  owner: maintainers
diff --git a/plugins/todo-backend/package.json b/plugins/todo-backend/package.json
index 520fac0215..5168b44035 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.2.0-next.1",
+  "version": "0.2.3-next.2",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
diff --git a/plugins/todo-backend/src/index.ts b/plugins/todo-backend/src/index.ts
index b1654327d6..58a8336ca2 100644
--- a/plugins/todo-backend/src/index.ts
+++ b/plugins/todo-backend/src/index.ts
@@ -22,4 +22,4 @@
 
 export * from './lib';
 export * from './service';
-export * from './plugin';
+export { todoPlugin as default } from './plugin';
diff --git a/plugins/todo-backend/src/schema/openapi.generated.ts b/plugins/todo-backend/src/schema/openapi.generated.ts
index a58a96ddb8..effe851790 100644
--- a/plugins/todo-backend/src/schema/openapi.generated.ts
+++ b/plugins/todo-backend/src/schema/openapi.generated.ts
@@ -173,6 +173,7 @@ export const spec = {
             name: 'filter',
             in: 'query',
             required: false,
+            allowReserved: true,
             schema: {
               type: 'array',
               description:
diff --git a/plugins/todo-backend/src/schema/openapi.yaml b/plugins/todo-backend/src/schema/openapi.yaml
index 0e6203e002..8023144f48 100644
--- a/plugins/todo-backend/src/schema/openapi.yaml
+++ b/plugins/todo-backend/src/schema/openapi.yaml
@@ -111,6 +111,7 @@ paths:
         - name: filter
           in: query
           required: false
+          allowReserved: true
           schema:
             type: array
             description: A list of filters used to narrow down the listed TODO items
diff --git a/plugins/todo-backend/src/service/router.test.ts b/plugins/todo-backend/src/service/router.test.ts
index 0bf591316c..64f894a147 100644
--- a/plugins/todo-backend/src/service/router.test.ts
+++ b/plugins/todo-backend/src/service/router.test.ts
@@ -131,6 +131,23 @@ describe('createRouter', () => {
       );
     });
 
+    it('forwards filter query', async () => {
+      mockService.listTodos.mockResolvedValueOnce(mockListBody);
+
+      const response = await request(app).get('/v1/todos?filter=text=*borked*');
+      expect(response.status).toEqual(200);
+      expect(response.body).toEqual(mockListBody);
+      expect(mockService.listTodos).toHaveBeenCalledWith(
+        {
+          entity: undefined,
+          offset: undefined,
+          limit: undefined,
+          filters: [{ field: 'text', value: '*borked*' }],
+        },
+        { token: undefined },
+      );
+    });
+
     it('rejects invalid queries', async () => {
       request(app)
         .get('/v1/todos?entity=k:n&entity=k:n')
diff --git a/plugins/todo/CHANGELOG.md b/plugins/todo/CHANGELOG.md
index 9a7758da72..b253514085 100644
--- a/plugins/todo/CHANGELOG.md
+++ b/plugins/todo/CHANGELOG.md
@@ -1,5 +1,62 @@
 # @backstage/plugin-todo
 
+## 0.2.26-next.2
+
+### Patch Changes
+
+- 8cec7664e146: Removed `@types/node` dependency
+- Updated dependencies
+  - @backstage/core-components@0.13.5-next.2
+  - @backstage/core-plugin-api@1.6.0-next.2
+  - @backstage/plugin-catalog-react@1.8.4-next.2
+  - @backstage/catalog-model@1.4.2-next.1
+  - @backstage/errors@1.2.1
+  - @backstage/theme@0.4.1
+
+## 0.2.26-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.8.4-next.1
+  - @backstage/core-components@0.13.5-next.1
+  - @backstage/catalog-model@1.4.2-next.0
+  - @backstage/core-plugin-api@1.6.0-next.1
+  - @backstage/errors@1.2.1
+  - @backstage/theme@0.4.1
+
+## 0.2.25-next.0
+
+### Patch Changes
+
+- 482bb5c0bbf8: Moved `@types/react` to be a regular dependency
+- Updated dependencies
+  - @backstage/core-plugin-api@1.6.0-next.0
+  - @backstage/core-components@0.13.5-next.0
+  - @backstage/catalog-model@1.4.1
+  - @backstage/errors@1.2.1
+  - @backstage/theme@0.4.1
+  - @backstage/plugin-catalog-react@1.8.3-next.0
+
+## 0.2.23
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.13.4
+  - @backstage/plugin-catalog-react@1.8.1
+  - @backstage/core-plugin-api@1.5.3
+  - @backstage/catalog-model@1.4.1
+  - @backstage/errors@1.2.1
+  - @backstage/theme@0.4.1
+
+## 0.2.23-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.8.1-next.1
+
 ## 0.2.23-next.0
 
 ### Patch Changes
diff --git a/plugins/todo/api-report.md b/plugins/todo/api-report.md
index 09356cd48f..ae4c4f3645 100644
--- a/plugins/todo/api-report.md
+++ b/plugins/todo/api-report.md
@@ -10,10 +10,11 @@ import { BackstagePlugin } from '@backstage/core-plugin-api';
 import { DiscoveryApi } from '@backstage/core-plugin-api';
 import { Entity } from '@backstage/catalog-model';
 import { IdentityApi } from '@backstage/core-plugin-api';
+import { JSX as JSX_2 } from 'react';
 import { RouteRef } from '@backstage/core-plugin-api';
 
 // @public
-export const EntityTodoContent: () => JSX.Element;
+export const EntityTodoContent: () => JSX_2.Element;
 
 // @public
 export interface TodoApi {
diff --git a/plugins/todo/catalog-info.yaml b/plugins/todo/catalog-info.yaml
new file mode 100644
index 0000000000..4ab6c9c927
--- /dev/null
+++ b/plugins/todo/catalog-info.yaml
@@ -0,0 +1,10 @@
+apiVersion: backstage.io/v1alpha1
+kind: Component
+metadata:
+  name: backstage-plugin-todo
+  title: '@backstage/plugin-todo'
+  description: A Backstage plugin that lets you browse TODO comments in your source code
+spec:
+  lifecycle: experimental
+  type: backstage-frontend-plugin
+  owner: maintainers
diff --git a/plugins/todo/package.json b/plugins/todo/package.json
index fa18bf94bb..5037f47f34 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.23-next.0",
+  "version": "0.2.26-next.2",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
@@ -20,6 +20,7 @@
     "url": "https://github.com/backstage/backstage",
     "directory": "plugins/todo"
   },
+  "sideEffects": false,
   "scripts": {
     "build": "backstage-cli package build --experimental-type-build",
     "start": "backstage-cli package start",
@@ -39,6 +40,7 @@
     "@material-ui/core": "^4.12.2",
     "@material-ui/icons": "^4.9.1",
     "@material-ui/lab": "4.0.0-alpha.61",
+    "@types/react": "^16.13.1 || ^17.0.0",
     "react-use": "^17.2.4"
   },
   "peerDependencies": {
@@ -55,8 +57,6 @@
     "@testing-library/jest-dom": "^5.10.1",
     "@testing-library/react": "^12.1.3",
     "@testing-library/user-event": "^14.0.0",
-    "@types/node": "^16.11.26",
-    "@types/react": "^16.13.1 || ^17.0.0",
     "msw": "^1.0.0"
   },
   "files": [
diff --git a/plugins/user-settings-backend/CHANGELOG.md b/plugins/user-settings-backend/CHANGELOG.md
index c33eab6b77..67d2a07479 100644
--- a/plugins/user-settings-backend/CHANGELOG.md
+++ b/plugins/user-settings-backend/CHANGELOG.md
@@ -1,5 +1,63 @@
 # @backstage/plugin-user-settings-backend
 
+## 0.1.15-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.19.5-next.2
+  - @backstage/plugin-auth-node@0.3.0-next.2
+  - @backstage/backend-plugin-api@0.6.3-next.2
+  - @backstage/catalog-model@1.4.2-next.1
+  - @backstage/errors@1.2.1
+  - @backstage/types@1.1.0
+
+## 0.1.15-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.19.5-next.1
+  - @backstage/backend-plugin-api@0.6.3-next.1
+  - @backstage/catalog-model@1.4.2-next.0
+  - @backstage/plugin-auth-node@0.3.0-next.1
+  - @backstage/errors@1.2.1
+  - @backstage/types@1.1.0
+
+## 0.1.14-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-auth-node@0.3.0-next.0
+  - @backstage/backend-common@0.19.4-next.0
+  - @backstage/backend-plugin-api@0.6.2-next.0
+  - @backstage/catalog-model@1.4.1
+  - @backstage/errors@1.2.1
+  - @backstage/types@1.1.0
+
+## 0.1.12
+
+### Patch Changes
+
+- 12a8c94eda8d: Add package repository and homepage metadata
+- Updated dependencies
+  - @backstage/backend-common@0.19.2
+  - @backstage/backend-plugin-api@0.6.0
+  - @backstage/plugin-auth-node@0.2.17
+  - @backstage/catalog-model@1.4.1
+  - @backstage/errors@1.2.1
+  - @backstage/types@1.1.0
+
+## 0.1.12-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@0.6.0-next.2
+  - @backstage/backend-common@0.19.2-next.2
+  - @backstage/plugin-auth-node@0.2.17-next.2
+
 ## 0.1.12-next.1
 
 ### Patch Changes
diff --git a/plugins/user-settings-backend/api-report.md b/plugins/user-settings-backend/api-report.md
index b015915723..808bd0f29b 100644
--- a/plugins/user-settings-backend/api-report.md
+++ b/plugins/user-settings-backend/api-report.md
@@ -20,7 +20,8 @@ export interface RouterOptions {
 }
 
 // @alpha
-export const userSettingsPlugin: () => BackendFeature;
+const userSettingsPlugin: () => BackendFeature;
+export default userSettingsPlugin;
 
 // (No @packageDocumentation comment for this package)
 ```
diff --git a/plugins/user-settings-backend/catalog-info.yaml b/plugins/user-settings-backend/catalog-info.yaml
new file mode 100644
index 0000000000..b380b6691f
--- /dev/null
+++ b/plugins/user-settings-backend/catalog-info.yaml
@@ -0,0 +1,10 @@
+apiVersion: backstage.io/v1alpha1
+kind: Component
+metadata:
+  name: backstage-plugin-user-settings-backend
+  title: '@backstage/plugin-user-settings-backend'
+  description: The Backstage backend plugin to manage user settings
+spec:
+  lifecycle: experimental
+  type: backstage-backend-plugin
+  owner: sda-se-reviewers
diff --git a/plugins/user-settings-backend/package.json b/plugins/user-settings-backend/package.json
index b472754b2b..2fc9b8955d 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.12-next.1",
+  "version": "0.1.15-next.2",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
diff --git a/plugins/user-settings-backend/src/index.ts b/plugins/user-settings-backend/src/index.ts
index 5504aaa564..14a9704e53 100644
--- a/plugins/user-settings-backend/src/index.ts
+++ b/plugins/user-settings-backend/src/index.ts
@@ -16,4 +16,4 @@
 
 export * from './service';
 export * from './database';
-export { userSettingsPlugin } from './plugin';
+export { userSettingsPlugin as default } from './plugin';
diff --git a/plugins/user-settings/CHANGELOG.md b/plugins/user-settings/CHANGELOG.md
index 026ea410f9..698bd082b8 100644
--- a/plugins/user-settings/CHANGELOG.md
+++ b/plugins/user-settings/CHANGELOG.md
@@ -1,5 +1,68 @@
 # @backstage/plugin-user-settings
 
+## 0.7.9-next.2
+
+### Patch Changes
+
+- e03f3ee2be94: changed auto theme tooltip title to camel case
+- 8cec7664e146: Removed `@types/node` dependency
+- 6e30769cc627: Introduced experimental support for internationalization.
+- Updated dependencies
+  - @backstage/core-components@0.13.5-next.2
+  - @backstage/core-plugin-api@1.6.0-next.2
+  - @backstage/core-app-api@1.10.0-next.2
+  - @backstage/plugin-catalog-react@1.8.4-next.2
+  - @backstage/errors@1.2.1
+  - @backstage/theme@0.4.1
+  - @backstage/types@1.1.0
+
+## 0.7.9-next.1
+
+### Patch Changes
+
+- ce77b23423cb: conditionally rendering the user email in user profile card
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.8.4-next.1
+  - @backstage/core-components@0.13.5-next.1
+  - @backstage/core-app-api@1.10.0-next.1
+  - @backstage/core-plugin-api@1.6.0-next.1
+  - @backstage/errors@1.2.1
+  - @backstage/theme@0.4.1
+  - @backstage/types@1.1.0
+
+## 0.7.8-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-app-api@1.10.0-next.0
+  - @backstage/core-plugin-api@1.6.0-next.0
+  - @backstage/core-components@0.13.5-next.0
+  - @backstage/errors@1.2.1
+  - @backstage/theme@0.4.1
+  - @backstage/types@1.1.0
+  - @backstage/plugin-catalog-react@1.8.3-next.0
+
+## 0.7.6
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-app-api@1.9.1
+  - @backstage/core-components@0.13.4
+  - @backstage/plugin-catalog-react@1.8.1
+  - @backstage/core-plugin-api@1.5.3
+  - @backstage/errors@1.2.1
+  - @backstage/theme@0.4.1
+  - @backstage/types@1.1.0
+
+## 0.7.6-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.8.1-next.1
+
 ## 0.7.6-next.0
 
 ### Patch Changes
diff --git a/plugins/user-settings/alpha-api-report.md b/plugins/user-settings/alpha-api-report.md
new file mode 100644
index 0000000000..925d387882
--- /dev/null
+++ b/plugins/user-settings/alpha-api-report.md
@@ -0,0 +1,26 @@
+## API Report File for "@backstage/plugin-user-settings"
+
+> Do not edit this file. It is a report generated by [API Extractor](https://api-extractor.com/).
+
+```ts
+import { TranslationRef } from '@backstage/core-plugin-api/alpha';
+
+// @alpha (undocumented)
+export const userSettingsTranslationRef: TranslationRef<{
+  language: string;
+  change_the_language: string;
+  theme: string;
+  theme_light: string;
+  theme_dark: string;
+  theme_auto: string;
+  change_the_theme_mode: string;
+  select_theme_light: string;
+  select_theme_dark: string;
+  select_theme_auto: string;
+  select_theme_custom: string;
+  lng: string;
+  select_lng: string;
+}>;
+
+// (No @packageDocumentation comment for this package)
+```
diff --git a/plugins/user-settings/api-report.md b/plugins/user-settings/api-report.md
index dd8f9428ca..cdb576c45c 100644
--- a/plugins/user-settings/api-report.md
+++ b/plugins/user-settings/api-report.md
@@ -14,6 +14,7 @@ import { FetchApi } from '@backstage/core-plugin-api';
 import { IconComponent } from '@backstage/core-plugin-api';
 import { IdentityApi } from '@backstage/core-plugin-api';
 import { JsonValue } from '@backstage/types';
+import { JSX as JSX_2 } from 'react';
 import { Observable } from '@backstage/types';
 import { ProfileInfo } from '@backstage/core-plugin-api';
 import { ProfileInfoApi } from '@backstage/core-plugin-api';
@@ -28,7 +29,7 @@ import { TabProps } from '@material-ui/core';
 // @public (undocumented)
 export const DefaultProviderSettings: (props: {
   configuredProviders: string[];
-}) => JSX.Element;
+}) => React_2.JSX.Element;
 
 // @public (undocumented)
 export const ProviderSettingsItem: (props: {
@@ -36,17 +37,19 @@ export const ProviderSettingsItem: (props: {
   description: string;
   icon: IconComponent;
   apiRef: ApiRef<ProfileInfoApi & SessionApi>;
-}) => JSX.Element;
+}) => React_2.JSX.Element;
 
 // @public (undocumented)
-export const Router: (props: { providerSettings?: JSX.Element }) => JSX.Element;
+export const Router: (props: {
+  providerSettings?: JSX.Element;
+}) => React_2.JSX.Element;
 
 // @public (undocumented)
-export const Settings: (props: { icon?: IconComponent }) => JSX.Element;
+export const Settings: (props: { icon?: IconComponent }) => React_2.JSX.Element;
 
 // @public (undocumented)
 export const SettingsLayout: {
-  (props: SettingsLayoutProps): JSX.Element;
+  (props: SettingsLayoutProps): React_2.JSX.Element;
   Route: (props: SettingsLayoutRouteProps) => null;
 };
 
@@ -74,32 +77,35 @@ export type SettingsLayoutRouteProps = {
 export const USER_SETTINGS_TAB_KEY = 'plugin.user-settings.settingsLayoutRoute';
 
 // @public (undocumented)
-export const UserSettingsAppearanceCard: () => JSX.Element;
+export const UserSettingsAppearanceCard: () => React_2.JSX.Element;
 
 // @public (undocumented)
 export const UserSettingsAuthProviders: (props: {
   providerSettings?: JSX.Element;
-}) => JSX.Element;
+}) => React_2.JSX.Element;
 
 // @public (undocumented)
-export const UserSettingsFeatureFlags: () => JSX.Element;
+export const UserSettingsFeatureFlags: () => React_2.JSX.Element;
 
 // @public (undocumented)
-export const UserSettingsGeneral: () => JSX.Element;
+export const UserSettingsGeneral: () => React_2.JSX.Element;
 
 // @public (undocumented)
-export const UserSettingsIdentityCard: () => JSX.Element;
+export const UserSettingsIdentityCard: () => React_2.JSX.Element;
 
 // @public (undocumented)
-export const UserSettingsMenu: () => JSX.Element;
+export const UserSettingsLanguageToggle: () => React_2.JSX.Element | null;
+
+// @public (undocumented)
+export const UserSettingsMenu: () => React_2.JSX.Element;
 
 // @public (undocumented)
 export const UserSettingsPage: (props: {
   providerSettings?: JSX.Element | undefined;
-}) => JSX.Element;
+}) => JSX_2.Element;
 
 // @public (undocumented)
-export const UserSettingsPinToggle: () => JSX.Element;
+export const UserSettingsPinToggle: () => React_2.JSX.Element;
 
 // @public (undocumented)
 const userSettingsPlugin: BackstagePlugin<
@@ -113,12 +119,12 @@ export { userSettingsPlugin as plugin };
 export { userSettingsPlugin };
 
 // @public (undocumented)
-export const UserSettingsProfileCard: () => JSX.Element;
+export const UserSettingsProfileCard: () => React_2.JSX.Element;
 
 // @public (undocumented)
 export const UserSettingsSignInAvatar: (props: {
   size?: number;
-}) => JSX.Element;
+}) => React_2.JSX.Element;
 
 // @public
 export class UserSettingsStorage implements StorageApi {
@@ -145,7 +151,9 @@ export class UserSettingsStorage implements StorageApi {
 }
 
 // @public @deprecated
-export const UserSettingsTab: (props: UserSettingsTabProps) => JSX.Element;
+export const UserSettingsTab: (
+  props: UserSettingsTabProps,
+) => React_2.JSX.Element;
 
 // @public @deprecated (undocumented)
 export type UserSettingsTabProps = PropsWithChildren<{
@@ -154,7 +162,7 @@ export type UserSettingsTabProps = PropsWithChildren<{
 }>;
 
 // @public (undocumented)
-export const UserSettingsThemeToggle: () => JSX.Element;
+export const UserSettingsThemeToggle: () => React_2.JSX.Element;
 
 // @public (undocumented)
 export const useUserProfile: () =>
diff --git a/plugins/user-settings/catalog-info.yaml b/plugins/user-settings/catalog-info.yaml
new file mode 100644
index 0000000000..a69f4ba1a5
--- /dev/null
+++ b/plugins/user-settings/catalog-info.yaml
@@ -0,0 +1,10 @@
+apiVersion: backstage.io/v1alpha1
+kind: Component
+metadata:
+  name: backstage-plugin-user-settings
+  title: '@backstage/plugin-user-settings'
+  description: A Backstage plugin that provides a settings page
+spec:
+  lifecycle: experimental
+  type: backstage-frontend-plugin
+  owner: maintainers
diff --git a/plugins/user-settings/package.json b/plugins/user-settings/package.json
index 57a6d89be0..b522dafe86 100644
--- a/plugins/user-settings/package.json
+++ b/plugins/user-settings/package.json
@@ -1,14 +1,27 @@
 {
   "name": "@backstage/plugin-user-settings",
   "description": "A Backstage plugin that provides a settings page",
-  "version": "0.7.6-next.0",
+  "version": "0.7.9-next.2",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
+  "exports": {
+    ".": "./src/index.ts",
+    "./alpha": "./src/alpha.ts",
+    "./package.json": "./package.json"
+  },
+  "typesVersions": {
+    "*": {
+      "alpha": [
+        "src/alpha.ts"
+      ],
+      "package.json": [
+        "package.json"
+      ]
+    }
+  },
   "publishConfig": {
-    "access": "public",
-    "main": "dist/index.esm.js",
-    "types": "dist/index.d.ts"
+    "access": "public"
   },
   "backstage": {
     "role": "frontend-plugin"
@@ -22,6 +35,7 @@
   "keywords": [
     "backstage"
   ],
+  "sideEffects": false,
   "scripts": {
     "build": "backstage-cli package build",
     "start": "backstage-cli package start",
@@ -43,6 +57,7 @@
     "@material-ui/icons": "^4.9.1",
     "@material-ui/lab": "4.0.0-alpha.61",
     "@types/react": "^16.13.1 || ^17.0.0",
+    "react-i18next": "^12.3.1",
     "react-use": "^17.2.4",
     "zen-observable": "^0.10.0"
   },
@@ -59,7 +74,6 @@
     "@testing-library/jest-dom": "^5.10.1",
     "@testing-library/react": "^12.1.3",
     "@testing-library/user-event": "^14.0.0",
-    "@types/node": "^16.11.26",
     "cross-fetch": "^3.1.5",
     "msw": "^1.0.0"
   },
diff --git a/plugins/user-settings/src/alpha.ts b/plugins/user-settings/src/alpha.ts
new file mode 100644
index 0000000000..e1f7678bae
--- /dev/null
+++ b/plugins/user-settings/src/alpha.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 * from './translation';
diff --git a/plugins/user-settings/src/components/General/UserSettingsAppearanceCard.tsx b/plugins/user-settings/src/components/General/UserSettingsAppearanceCard.tsx
index 6b61edb83b..8a32c0bd9b 100644
--- a/plugins/user-settings/src/components/General/UserSettingsAppearanceCard.tsx
+++ b/plugins/user-settings/src/components/General/UserSettingsAppearanceCard.tsx
@@ -19,6 +19,7 @@ import { List } from '@material-ui/core';
 import React from 'react';
 import { UserSettingsPinToggle } from './UserSettingsPinToggle';
 import { UserSettingsThemeToggle } from './UserSettingsThemeToggle';
+import { UserSettingsLanguageToggle } from './UserSettingsLanguageToggle';
 
 /** @public */
 export const UserSettingsAppearanceCard = () => {
@@ -28,6 +29,7 @@ export const UserSettingsAppearanceCard = () => {
     <InfoCard title="Appearance" variant="gridItem">
       <List dense>
         <UserSettingsThemeToggle />
+        <UserSettingsLanguageToggle />
         {!isMobile && <UserSettingsPinToggle />}
       </List>
     </InfoCard>
diff --git a/plugins/user-settings/src/components/General/UserSettingsLanguageToggle.test.tsx b/plugins/user-settings/src/components/General/UserSettingsLanguageToggle.test.tsx
new file mode 100644
index 0000000000..bb0e778993
--- /dev/null
+++ b/plugins/user-settings/src/components/General/UserSettingsLanguageToggle.test.tsx
@@ -0,0 +1,125 @@
+/*
+ * 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 { render, screen, fireEvent } from '@testing-library/react';
+import { useTranslationRef } from '@backstage/core-plugin-api/alpha';
+import { UserSettingsLanguageToggle } from './UserSettingsLanguageToggle';
+import { wrapInTestApp } from '@backstage/test-utils';
+import { useTranslation } from 'react-i18next';
+
+jest.mock('@backstage/core-plugin-api/alpha', () => ({
+  ...jest.requireActual('@backstage/core-plugin-api/alpha'),
+  useTranslationRef: jest.fn(),
+}));
+
+jest.mock('react-i18next', () => ({
+  ...jest.requireActual('react-i18next'),
+  useTranslation: jest.fn(),
+}));
+
+describe('UserSettingsLanguageToggle', () => {
+  beforeEach(() => {
+    jest.clearAllMocks();
+  });
+
+  it('should render correctly with multiple supported languages', () => {
+    const messages: Record<string, string> = {
+      en: 'English',
+      fr: 'French',
+      de: 'German',
+      language: 'language',
+      change_the_language: 'Change the language',
+    };
+
+    const i18nMock = {
+      language: 'en',
+      options: {
+        supportedLngs: ['en', 'fr', 'de'],
+      },
+      changeLanguage: jest.fn(),
+    };
+
+    (useTranslation as jest.Mock).mockReturnValue({
+      i18n: i18nMock,
+    });
+
+    (useTranslationRef as jest.Mock).mockReturnValue(
+      (key: string, option: any) =>
+        messages[option?.language || key] || 'translatedValue',
+    );
+
+    render(wrapInTestApp(<UserSettingsLanguageToggle />));
+
+    expect(screen.getAllByText('Change the language')).toHaveLength(1);
+    expect(screen.getAllByText('English')).toHaveLength(1);
+    expect(screen.getAllByText('French')).toHaveLength(1);
+    expect(screen.getAllByText('German')).toHaveLength(1);
+  });
+
+  it('should not render when only one supported language', () => {
+    const tMock = jest.fn().mockReturnValue('translatedValue');
+    const i18nMock = {
+      language: 'en',
+      options: {
+        supportedLngs: ['en'],
+      },
+      changeLanguage: jest.fn(),
+    };
+
+    (useTranslationRef as jest.Mock).mockReturnValue(tMock);
+
+    (useTranslation as jest.Mock).mockReturnValue({
+      i18n: i18nMock,
+    });
+
+    render(wrapInTestApp(<UserSettingsLanguageToggle />));
+
+    expect(screen.queryByText('translatedValue')).toBeNull();
+    expect(screen.queryByText('English')).toBeNull();
+  });
+
+  it('should handle language change', () => {
+    const messages: Record<string, string> = {
+      en: 'English',
+      fr: 'French',
+      language: 'language',
+      change_the_language: 'Change the language',
+    };
+
+    const i18nMock = {
+      language: 'en',
+      options: {
+        supportedLngs: ['en', 'fr'],
+      },
+      changeLanguage: jest.fn(),
+    };
+
+    (useTranslationRef as jest.Mock).mockReturnValue(
+      (key: string, option: any) =>
+        messages[option?.language || key] || 'translatedValue',
+    );
+
+    (useTranslation as jest.Mock).mockReturnValue({
+      i18n: i18nMock,
+    });
+
+    render(wrapInTestApp(<UserSettingsLanguageToggle />));
+
+    fireEvent.click(screen.getByText('French'));
+
+    expect(i18nMock.changeLanguage).toHaveBeenCalledWith('fr');
+  });
+});
diff --git a/plugins/user-settings/src/components/General/UserSettingsLanguageToggle.tsx b/plugins/user-settings/src/components/General/UserSettingsLanguageToggle.tsx
new file mode 100644
index 0000000000..3c5772ab16
--- /dev/null
+++ b/plugins/user-settings/src/components/General/UserSettingsLanguageToggle.tsx
@@ -0,0 +1,149 @@
+/*
+ * 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 React, { useMemo } from 'react';
+import { useTranslationRef } from '@backstage/core-plugin-api/alpha';
+import ToggleButton from '@material-ui/lab/ToggleButton';
+import ToggleButtonGroup from '@material-ui/lab/ToggleButtonGroup';
+import {
+  ListItem,
+  ListItemText,
+  ListItemSecondaryAction,
+  Tooltip,
+  makeStyles,
+} from '@material-ui/core';
+import { userSettingsTranslationRef } from '../../translation';
+import { useTranslation } from 'react-i18next';
+
+type TooltipToggleButtonProps = {
+  children: JSX.Element;
+  title: string;
+  value: string;
+};
+
+const useStyles = makeStyles(theme => ({
+  container: {
+    display: 'flex',
+    flexWrap: 'wrap',
+    width: '100%',
+    justifyContent: 'space-between',
+    alignItems: 'center',
+    paddingBottom: 8,
+    paddingRight: 16,
+  },
+  list: {
+    width: 'initial',
+    [theme.breakpoints.down('xs')]: {
+      width: '100%',
+      padding: `0 0 12px`,
+    },
+  },
+  listItemText: {
+    paddingRight: 0,
+    paddingLeft: 0,
+  },
+  listItemSecondaryAction: {
+    position: 'relative',
+    transform: 'unset',
+    top: 'auto',
+    right: 'auto',
+    paddingLeft: 16,
+    [theme.breakpoints.down('xs')]: {
+      paddingLeft: 0,
+    },
+  },
+}));
+
+// ToggleButtonGroup uses React.children.map instead of context
+// so wrapping with Tooltip breaks ToggleButton functionality.
+const TooltipToggleButton = ({
+  children,
+  title,
+  value,
+  ...props
+}: TooltipToggleButtonProps) => (
+  <Tooltip placement="top" arrow title={title}>
+    <ToggleButton value={value} {...props}>
+      {children}
+    </ToggleButton>
+  </Tooltip>
+);
+
+/** @public */
+export const UserSettingsLanguageToggle = () => {
+  const classes = useStyles();
+  const { i18n } = useTranslation();
+  const t = useTranslationRef(userSettingsTranslationRef);
+
+  const supportedLngs = useMemo(
+    () => (i18n.options.supportedLngs || []).filter(lng => lng !== 'cimode'),
+    [i18n],
+  );
+
+  if (supportedLngs.length <= 1) {
+    return null;
+  }
+
+  const handleSetLanguage = (
+    _event: React.MouseEvent<HTMLElement>,
+    newLanguage: string | undefined,
+  ) => {
+    if (supportedLngs.some(it => it === newLanguage)) {
+      i18n.changeLanguage(newLanguage);
+    } else {
+      i18n.changeLanguage(undefined);
+    }
+  };
+
+  return (
+    <ListItem
+      className={classes.list}
+      classes={{ container: classes.container }}
+    >
+      <ListItemText
+        className={classes.listItemText}
+        primary={t('language')}
+        secondary={t('change_the_language')}
+      />
+      <ListItemSecondaryAction className={classes.listItemSecondaryAction}>
+        <ToggleButtonGroup
+          exclusive
+          size="small"
+          value={i18n.language}
+          onChange={handleSetLanguage}
+        >
+          {supportedLngs.map(lng => {
+            return (
+              <TooltipToggleButton
+                key={lng}
+                title={t('select_lng', {
+                  language: lng,
+                })}
+                value={lng}
+              >
+                <>
+                  {t('lng', {
+                    language: lng,
+                  })}
+                </>
+              </TooltipToggleButton>
+            );
+          })}
+        </ToggleButtonGroup>
+      </ListItemSecondaryAction>
+    </ListItem>
+  );
+};
diff --git a/plugins/user-settings/src/components/General/UserSettingsProfileCard.tsx b/plugins/user-settings/src/components/General/UserSettingsProfileCard.tsx
index 3c49121cfc..c96d2bb21e 100644
--- a/plugins/user-settings/src/components/General/UserSettingsProfileCard.tsx
+++ b/plugins/user-settings/src/components/General/UserSettingsProfileCard.tsx
@@ -37,9 +37,11 @@ export const UserSettingsProfileCard = () => {
               <Typography variant="subtitle1" gutterBottom>
                 {displayName}
               </Typography>
-              <Typography variant="body2" color="textSecondary">
-                {profile.email}
-              </Typography>
+              {profile.email && (
+                <Typography variant="body2" color="textSecondary">
+                  {profile.email}
+                </Typography>
+              )}
             </Grid>
           </Grid>
           <Grid item>
diff --git a/plugins/user-settings/src/components/General/UserSettingsThemeToggle.test.tsx b/plugins/user-settings/src/components/General/UserSettingsThemeToggle.test.tsx
index 09b27cb559..48d16a9fde 100644
--- a/plugins/user-settings/src/components/General/UserSettingsThemeToggle.test.tsx
+++ b/plugins/user-settings/src/components/General/UserSettingsThemeToggle.test.tsx
@@ -15,6 +15,7 @@
  */
 
 import { AppTheme, appThemeApiRef } from '@backstage/core-plugin-api';
+import { useTranslationRef } from '@backstage/core-plugin-api/alpha';
 import {
   renderWithEffects,
   TestApiRegistry,
@@ -27,6 +28,7 @@ import { fireEvent } from '@testing-library/react';
 import React from 'react';
 import { UserSettingsThemeToggle } from './UserSettingsThemeToggle';
 import { ApiProvider, AppThemeSelector } from '@backstage/core-app-api';
+import { userSettingsTranslationRef } from '../../translation';
 
 const mockTheme: AppTheme = {
   id: 'light-theme',
@@ -39,6 +41,11 @@ const mockTheme: AppTheme = {
   ),
 };
 
+jest.mock('@backstage/core-plugin-api/alpha', () => ({
+  ...jest.requireActual('@backstage/core-plugin-api/alpha'),
+  useTranslationRef: jest.fn(),
+}));
+
 const apiRegistry = TestApiRegistry.from([
   appThemeApiRef,
   AppThemeSelector.createWithStorage([mockTheme]),
@@ -47,6 +54,16 @@ const apiRegistry = TestApiRegistry.from([
 describe('<UserSettingsThemeToggle />', () => {
   it('toggles the theme select button', async () => {
     const themeApi = apiRegistry.get(appThemeApiRef);
+    // todo: general test provider
+    const messages: Record<string, string> =
+      userSettingsTranslationRef.getDefaultMessages();
+
+    const useTranslationRefMock = jest
+      .fn()
+      .mockReturnValue((key: string) => messages[key]);
+
+    (useTranslationRef as jest.Mock).mockImplementation(useTranslationRefMock);
+
     const rendered = await renderWithEffects(
       wrapInTestApp(
         <ApiProvider apis={apiRegistry}>
@@ -57,7 +74,7 @@ describe('<UserSettingsThemeToggle />', () => {
 
     expect(rendered.getByText('Theme')).toBeInTheDocument();
 
-    const themeButton = rendered.getByTitle('Select Mock Theme');
+    const themeButton = rendered.getByText('Mock Theme');
     expect(themeApi?.getActiveThemeId()).toBe(undefined);
     fireEvent.click(themeButton);
     expect(themeApi?.getActiveThemeId()).toBe('light-theme');
diff --git a/plugins/user-settings/src/components/General/UserSettingsThemeToggle.tsx b/plugins/user-settings/src/components/General/UserSettingsThemeToggle.tsx
index 156ac210fd..42490ec118 100644
--- a/plugins/user-settings/src/components/General/UserSettingsThemeToggle.tsx
+++ b/plugins/user-settings/src/components/General/UserSettingsThemeToggle.tsx
@@ -27,6 +27,8 @@ import {
   makeStyles,
 } from '@material-ui/core';
 import { appThemeApiRef, useApi } from '@backstage/core-plugin-api';
+import { useTranslationRef } from '@backstage/core-plugin-api/alpha';
+import { userSettingsTranslationRef } from '../../translation';
 
 type ThemeIconProps = {
   id: string;
@@ -101,18 +103,20 @@ const TooltipToggleButton = ({
 export const UserSettingsThemeToggle = () => {
   const classes = useStyles();
   const appThemeApi = useApi(appThemeApiRef);
-  const themeId = useObservable(
+  const activeThemeId = useObservable(
     appThemeApi.activeThemeId$(),
     appThemeApi.getActiveThemeId(),
   );
 
   const themeIds = appThemeApi.getInstalledThemes();
 
+  const t = useTranslationRef(userSettingsTranslationRef);
+
   const handleSetTheme = (
     _event: React.MouseEvent<HTMLElement>,
     newThemeId: string | undefined,
   ) => {
-    if (themeIds.some(t => t.id === newThemeId)) {
+    if (themeIds.some(it => it.id === newThemeId)) {
       appThemeApi.setActiveThemeId(newThemeId);
     } else {
       appThemeApi.setActiveThemeId(undefined);
@@ -126,26 +130,31 @@ export const UserSettingsThemeToggle = () => {
     >
       <ListItemText
         className={classes.listItemText}
-        primary="Theme"
-        secondary="Change the theme mode"
+        primary={t('theme')}
+        secondary={t('change_the_theme_mode')}
       />
       <ListItemSecondaryAction className={classes.listItemSecondaryAction}>
         <ToggleButtonGroup
           exclusive
           size="small"
-          value={themeId ?? 'auto'}
+          value={activeThemeId ?? 'auto'}
           onChange={handleSetTheme}
         >
           {themeIds.map(theme => {
-            const themeIcon = themeIds.find(t => t.id === theme.id)?.icon;
+            const themeIcon = themeIds.find(it => it.id === theme.id)?.icon;
+            const themeId = theme.id as 'light' | 'dark';
             return (
               <TooltipToggleButton
                 key={theme.id}
-                title={`Select ${theme.title}`}
+                title={
+                  theme.title
+                    ? t('select_theme_custom', { custom: theme.title })
+                    : t(`select_theme_${themeId}`)
+                }
                 value={theme.id}
               >
                 <>
-                  {theme.title}&nbsp;
+                  {theme.title || t(`theme_${themeId}`)}&nbsp;
                   <ThemeIcon
                     id={theme.id}
                     icon={themeIcon}
@@ -155,10 +164,12 @@ export const UserSettingsThemeToggle = () => {
               </TooltipToggleButton>
             );
           })}
-          <Tooltip placement="top" arrow title="Select auto theme">
-            <ToggleButton value="auto" selected={themeId === undefined}>
-              Auto&nbsp;
-              <AutoIcon color={themeId === undefined ? 'primary' : undefined} />
+          <Tooltip placement="top" arrow title={t('select_theme_auto')}>
+            <ToggleButton value="auto" selected={activeThemeId === undefined}>
+              {t('theme_auto')}&nbsp;
+              <AutoIcon
+                color={activeThemeId === undefined ? 'primary' : undefined}
+              />
             </ToggleButton>
           </Tooltip>
         </ToggleButtonGroup>
diff --git a/plugins/user-settings/src/components/General/index.ts b/plugins/user-settings/src/components/General/index.ts
index ff4d1210c4..d21355a970 100644
--- a/plugins/user-settings/src/components/General/index.ts
+++ b/plugins/user-settings/src/components/General/index.ts
@@ -22,3 +22,4 @@ export { UserSettingsAppearanceCard } from './UserSettingsAppearanceCard';
 export { UserSettingsThemeToggle } from './UserSettingsThemeToggle';
 export { UserSettingsPinToggle } from './UserSettingsPinToggle';
 export { UserSettingsIdentityCard } from './UserSettingsIdentityCard';
+export { UserSettingsLanguageToggle } from './UserSettingsLanguageToggle';
diff --git a/plugins/user-settings/src/translation.ts b/plugins/user-settings/src/translation.ts
new file mode 100644
index 0000000000..920f499082
--- /dev/null
+++ b/plugins/user-settings/src/translation.ts
@@ -0,0 +1,37 @@
+/*
+ * 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 { createTranslationRef } from '@backstage/core-plugin-api/alpha';
+
+/** @alpha */
+export const userSettingsTranslationRef = createTranslationRef({
+  id: 'user-settings',
+  messages: {
+    language: 'Language',
+    change_the_language: 'Change the language',
+    theme: 'Theme',
+    theme_light: 'Light',
+    theme_dark: 'Dark',
+    theme_auto: 'Auto',
+    change_the_theme_mode: 'Change the theme mode',
+    select_theme_light: 'Select light',
+    select_theme_dark: 'Select dark',
+    select_theme_auto: 'Select Auto Theme',
+    select_theme_custom: 'Select {{custom}}',
+    lng: '{{language}}',
+    select_lng: 'Select language {{language}}',
+  },
+});
diff --git a/plugins/vault-backend/CHANGELOG.md b/plugins/vault-backend/CHANGELOG.md
index cac3188526..a9cfdd9b99 100644
--- a/plugins/vault-backend/CHANGELOG.md
+++ b/plugins/vault-backend/CHANGELOG.md
@@ -1,5 +1,53 @@
 # @backstage/plugin-vault-backend
 
+## 0.3.7-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config@1.1.0-next.1
+  - @backstage/backend-tasks@0.5.8-next.2
+  - @backstage/backend-common@0.19.5-next.2
+  - @backstage/errors@1.2.1
+
+## 0.3.7-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config@1.1.0-next.0
+  - @backstage/backend-tasks@0.5.8-next.1
+  - @backstage/backend-common@0.19.5-next.1
+  - @backstage/errors@1.2.1
+
+## 0.3.6-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.19.4-next.0
+  - @backstage/backend-tasks@0.5.7-next.0
+  - @backstage/config@1.0.8
+  - @backstage/errors@1.2.1
+
+## 0.3.4
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.19.2
+  - @backstage/backend-tasks@0.5.5
+  - @backstage/config@1.0.8
+  - @backstage/errors@1.2.1
+
+## 0.3.4-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-tasks@0.5.5-next.2
+  - @backstage/backend-common@0.19.2-next.2
+
 ## 0.3.4-next.1
 
 ### Patch Changes
diff --git a/plugins/vault-backend/catalog-info.yaml b/plugins/vault-backend/catalog-info.yaml
new file mode 100644
index 0000000000..d4fd503873
--- /dev/null
+++ b/plugins/vault-backend/catalog-info.yaml
@@ -0,0 +1,10 @@
+apiVersion: backstage.io/v1alpha1
+kind: Component
+metadata:
+  name: backstage-plugin-vault-backend
+  title: '@backstage/plugin-vault-backend'
+  description: A Backstage backend plugin that integrates towards Vault
+spec:
+  lifecycle: experimental
+  type: backstage-backend-plugin
+  owner: maintainers
diff --git a/plugins/vault-backend/package.json b/plugins/vault-backend/package.json
index 44d01c576b..a20445febb 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.3.4-next.1",
+  "version": "0.3.7-next.2",
   "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 d6ba597c0d..d7b6e14e2c 100644
--- a/plugins/vault/CHANGELOG.md
+++ b/plugins/vault/CHANGELOG.md
@@ -1,5 +1,62 @@
 # @backstage/plugin-vault
 
+## 0.1.18-next.2
+
+### Patch Changes
+
+- 8cec7664e146: Removed `@types/node` dependency
+- Updated dependencies
+  - @backstage/core-components@0.13.5-next.2
+  - @backstage/core-plugin-api@1.6.0-next.2
+  - @backstage/plugin-catalog-react@1.8.4-next.2
+  - @backstage/catalog-model@1.4.2-next.1
+  - @backstage/errors@1.2.1
+  - @backstage/theme@0.4.1
+
+## 0.1.18-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.8.4-next.1
+  - @backstage/core-components@0.13.5-next.1
+  - @backstage/catalog-model@1.4.2-next.0
+  - @backstage/core-plugin-api@1.6.0-next.1
+  - @backstage/errors@1.2.1
+  - @backstage/theme@0.4.1
+
+## 0.1.17-next.0
+
+### Patch Changes
+
+- 482bb5c0bbf8: Moved `@types/react` to be a regular dependency
+- Updated dependencies
+  - @backstage/core-plugin-api@1.6.0-next.0
+  - @backstage/core-components@0.13.5-next.0
+  - @backstage/catalog-model@1.4.1
+  - @backstage/errors@1.2.1
+  - @backstage/theme@0.4.1
+  - @backstage/plugin-catalog-react@1.8.3-next.0
+
+## 0.1.15
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.13.4
+  - @backstage/plugin-catalog-react@1.8.1
+  - @backstage/core-plugin-api@1.5.3
+  - @backstage/catalog-model@1.4.1
+  - @backstage/errors@1.2.1
+  - @backstage/theme@0.4.1
+
+## 0.1.15-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.8.1-next.1
+
 ## 0.1.15-next.0
 
 ### Patch Changes
diff --git a/plugins/vault/api-report.md b/plugins/vault/api-report.md
index ee85145202..8afa6285f4 100644
--- a/plugins/vault/api-report.md
+++ b/plugins/vault/api-report.md
@@ -8,9 +8,10 @@
 import { ApiRef } from '@backstage/core-plugin-api';
 import { BackstagePlugin } from '@backstage/core-plugin-api';
 import { Entity } from '@backstage/catalog-model';
+import { JSX as JSX_2 } from 'react';
 
 // @public
-export const EntityVaultCard: () => JSX.Element;
+export const EntityVaultCard: () => JSX_2.Element;
 
 // @public
 export function isVaultAvailable(entity: Entity): boolean;
diff --git a/plugins/vault/catalog-info.yaml b/plugins/vault/catalog-info.yaml
new file mode 100644
index 0000000000..3f9d97ea09
--- /dev/null
+++ b/plugins/vault/catalog-info.yaml
@@ -0,0 +1,10 @@
+apiVersion: backstage.io/v1alpha1
+kind: Component
+metadata:
+  name: backstage-plugin-vault
+  title: '@backstage/plugin-vault'
+  description: A Backstage plugin that integrates towards Vault
+spec:
+  lifecycle: experimental
+  type: backstage-frontend-plugin
+  owner: maintainers
diff --git a/plugins/vault/package.json b/plugins/vault/package.json
index 7d77495527..f33973694d 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.15-next.0",
+  "version": "0.1.18-next.2",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
@@ -23,6 +23,7 @@
     "backstage",
     "vault"
   ],
+  "sideEffects": false,
   "scripts": {
     "start": "backstage-cli package start",
     "build": "backstage-cli package build",
@@ -42,6 +43,7 @@
     "@material-ui/core": "^4.12.2",
     "@material-ui/icons": "^4.9.1",
     "@material-ui/lab": "4.0.0-alpha.61",
+    "@types/react": "^16.13.1 || ^17.0.0",
     "react-use": "^17.2.4"
   },
   "peerDependencies": {
@@ -58,8 +60,6 @@
     "@testing-library/jest-dom": "^5.10.1",
     "@testing-library/react": "^12.1.3",
     "@testing-library/user-event": "^14.0.0",
-    "@types/node": "*",
-    "@types/react": "^16.13.1 || ^17.0.0",
     "msw": "^1.0.0"
   },
   "files": [
diff --git a/plugins/xcmetrics/CHANGELOG.md b/plugins/xcmetrics/CHANGELOG.md
index 5fafa11c11..a68ba59435 100644
--- a/plugins/xcmetrics/CHANGELOG.md
+++ b/plugins/xcmetrics/CHANGELOG.md
@@ -1,5 +1,50 @@
 # @backstage/plugin-xcmetrics
 
+## 0.2.42-next.2
+
+### Patch Changes
+
+- 8cec7664e146: Removed `@types/node` dependency
+- 814feeed7343: Update to handle invalid luxon values
+- Updated dependencies
+  - @backstage/core-components@0.13.5-next.2
+  - @backstage/core-plugin-api@1.6.0-next.2
+  - @backstage/errors@1.2.1
+  - @backstage/theme@0.4.1
+
+## 0.2.42-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.13.5-next.1
+  - @backstage/core-plugin-api@1.6.0-next.1
+  - @backstage/errors@1.2.1
+  - @backstage/theme@0.4.1
+
+## 0.2.42-next.0
+
+### Patch Changes
+
+- 482bb5c0bbf8: Moved `@types/react` to be a regular dependency
+- Updated dependencies
+  - @backstage/core-plugin-api@1.6.0-next.0
+  - @backstage/core-components@0.13.5-next.0
+  - @backstage/errors@1.2.1
+  - @backstage/theme@0.4.1
+
+## 0.2.41
+
+### Patch Changes
+
+- 12a8c94eda8d: Add package repository and homepage metadata
+- 3d86be999fdf: Prefer simple `theme.spacing` without string interpolation
+- Updated dependencies
+  - @backstage/core-components@0.13.4
+  - @backstage/core-plugin-api@1.5.3
+  - @backstage/errors@1.2.1
+  - @backstage/theme@0.4.1
+
 ## 0.2.41-next.1
 
 ### Patch Changes
diff --git a/plugins/xcmetrics/api-report.md b/plugins/xcmetrics/api-report.md
index 8dd87cc7d6..4cbac0683c 100644
--- a/plugins/xcmetrics/api-report.md
+++ b/plugins/xcmetrics/api-report.md
@@ -6,10 +6,11 @@
 /// <reference types="react" />
 
 import { BackstagePlugin } from '@backstage/core-plugin-api';
+import { JSX as JSX_2 } from 'react';
 import { RouteRef } from '@backstage/core-plugin-api';
 
 // @public (undocumented)
-export const XcmetricsPage: () => JSX.Element;
+export const XcmetricsPage: () => JSX_2.Element;
 
 // @public (undocumented)
 export const xcmetricsPlugin: BackstagePlugin<
diff --git a/plugins/xcmetrics/catalog-info.yaml b/plugins/xcmetrics/catalog-info.yaml
new file mode 100644
index 0000000000..5550198a2f
--- /dev/null
+++ b/plugins/xcmetrics/catalog-info.yaml
@@ -0,0 +1,10 @@
+apiVersion: backstage.io/v1alpha1
+kind: Component
+metadata:
+  name: backstage-plugin-xcmetrics
+  title: '@backstage/plugin-xcmetrics'
+  description: A Backstage plugin that shows XCode build metrics for your components
+spec:
+  lifecycle: experimental
+  type: backstage-frontend-plugin
+  owner: maintainers
diff --git a/plugins/xcmetrics/package.json b/plugins/xcmetrics/package.json
index 54320e6f7f..8404027de1 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.41-next.1",
+  "version": "0.2.42-next.2",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
@@ -19,6 +19,7 @@
     "url": "https://github.com/backstage/backstage",
     "directory": "plugins/xcmetrics"
   },
+  "sideEffects": false,
   "scripts": {
     "build": "backstage-cli package build",
     "start": "backstage-cli package start",
@@ -36,6 +37,7 @@
     "@material-ui/core": "^4.12.2",
     "@material-ui/icons": "^4.9.1",
     "@material-ui/lab": "4.0.0-alpha.61",
+    "@types/react": "^16.13.1 || ^17.0.0",
     "lodash": "^4.17.21",
     "luxon": "^3.0.0",
     "react-use": "^17.2.4",
@@ -56,8 +58,6 @@
     "@testing-library/react": "^12.1.3",
     "@testing-library/user-event": "^14.0.0",
     "@types/luxon": "^3.0.0",
-    "@types/node": "^16.11.26",
-    "@types/react": "^16.13.1 || ^17.0.0",
     "msw": "^1.0.0"
   },
   "files": [
diff --git a/plugins/xcmetrics/src/components/BuildList/BuildList.test.tsx b/plugins/xcmetrics/src/components/BuildList/BuildList.test.tsx
index 94178d0388..ee22647b2b 100644
--- a/plugins/xcmetrics/src/components/BuildList/BuildList.test.tsx
+++ b/plugins/xcmetrics/src/components/BuildList/BuildList.test.tsx
@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 import React from 'react';
 import { renderInTestApp, TestApiProvider } from '@backstage/test-utils';
 import { BuildList } from './BuildList';
diff --git a/plugins/xcmetrics/src/components/BuildList/BuildList.tsx b/plugins/xcmetrics/src/components/BuildList/BuildList.tsx
index 5a6e1bd322..20924b181b 100644
--- a/plugins/xcmetrics/src/components/BuildList/BuildList.tsx
+++ b/plugins/xcmetrics/src/components/BuildList/BuildList.tsx
@@ -39,8 +39,8 @@ export const BuildList = () => {
   const tableRef = useRef<any>();
 
   const initialFilters = {
-    from: DateTime.now().minus({ years: 1 }).toISODate(),
-    to: DateTime.now().toISODate(),
+    from: DateTime.now().minus({ years: 1 }).toISODate()!,
+    to: DateTime.now().toISODate()!,
   };
 
   const [filters, setFilters] = useState<BuildFilters>(initialFilters);
diff --git a/scripts/patch-release-for-pr.js b/scripts/patch-release-for-pr.js
index be417e2911..c450743799 100755
--- a/scripts/patch-release-for-pr.js
+++ b/scripts/patch-release-for-pr.js
@@ -81,12 +81,15 @@ async function findCurrentReleaseVersion() {
   throw new Error('No stable release found');
 }
 
-async function main(prNumberStr) {
-  const prNumber = parseInt(prNumberStr, 10);
-  if (!Number.isInteger(prNumber)) {
-    throw new Error('Must provide a PR number as the first argument');
-  }
-  console.log(`PR number: ${prNumber}`);
+async function main(args) {
+  const prNumbers = args.map(s => {
+    const num = parseInt(s, 10);
+    if (!Number.isInteger(num)) {
+      throw new Error(`Must provide valid PR number arguments, got ${s}`);
+    }
+    return num;
+  });
+  console.log(`PR number(s): ${prNumbers.join(', ')}`);
 
   if (await run('git', 'status', '--porcelain')) {
     throw new Error('Cannot run with a dirty working tree');
@@ -105,44 +108,46 @@ async function main(prNumberStr) {
     await run('git', 'push', 'origin', '-u', patchBranch);
   }
 
-  const { data } = await octokit.pulls.get({
-    owner,
-    repo,
-    pull_number: prNumber,
-  });
-
-  const headSha = data.head.sha;
-  if (!headSha) {
-    throw new Error('head sha not available');
-  }
-  const baseSha = data.base.sha;
-  if (!baseSha) {
-    throw new Error('base sha not available');
-  }
-  const mergeBaseSha = await run('git', 'merge-base', headSha, baseSha);
-
   // Create new branch, apply changes from all commits on PR branch, commit, push
-  const branchName = `patch-release-pr-${prNumber}`;
+  const branchName = `patch-release-pr-${prNumbers.join('-')}`;
   await run('git', 'checkout', '-b', branchName);
 
-  const logLines = await run(
-    'git',
-    'log',
-    `${mergeBaseSha}...${headSha}`,
-    '--reverse',
-    '--pretty=%H',
-  );
-  for (const logSha of logLines.split(/\r?\n/)) {
-    await run('git', 'cherry-pick', '-n', logSha);
+  for (const prNumber of prNumbers) {
+    const { data } = await octokit.pulls.get({
+      owner,
+      repo,
+      pull_number: prNumber,
+    });
+
+    const headSha = data.head.sha;
+    if (!headSha) {
+      throw new Error('head sha not available');
+    }
+    const baseSha = data.base.sha;
+    if (!baseSha) {
+      throw new Error('base sha not available');
+    }
+    const mergeBaseSha = await run('git', 'merge-base', headSha, baseSha);
+
+    const logLines = await run(
+      'git',
+      'log',
+      `${mergeBaseSha}...${headSha}`,
+      '--reverse',
+      '--pretty=%H',
+    );
+    for (const logSha of logLines.split(/\r?\n/)) {
+      await run('git', 'cherry-pick', '-n', logSha);
+    }
+    await run(
+      'git',
+      'commit',
+      '--signoff',
+      '--no-verify',
+      '-m',
+      `Patch from PR #${prNumber}`,
+    );
   }
-  await run(
-    'git',
-    'commit',
-    '--signoff',
-    '--no-verify',
-    '-m',
-    `Patch from PR #${prNumber}`,
-  );
 
   console.log('Running "yarn release" ...');
   await run('yarn', 'release');
@@ -159,8 +164,13 @@ async function main(prNumberStr) {
 
   await run('git', 'push', 'origin', '-u', branchName);
 
+  const params = new URLSearchParams({
+    expand: 1,
+    body: 'This release fixes an issue where',
+    title: `Patch release of ${prNumbers.map(nr => `#${nr}`).join(', ')}`,
+  });
   console.log(
-    `https://github.com/backstage/backstage/compare/${patchBranch}...${branchName}?expand=1&body=This%20release%20fixes%20an%20issue%20where&title=Patch%20release%20of%20%23${prNumber}`,
+    `https://github.com/backstage/backstage/compare/${patchBranch}...${branchName}?${params}`,
   );
 }
 
diff --git a/storybook/yarn.lock b/storybook/yarn.lock
index 61718c7a2f..c1519c75dc 100644
--- a/storybook/yarn.lock
+++ b/storybook/yarn.lock
@@ -2840,90 +2840,91 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@swc/core-darwin-arm64@npm:1.3.68":
-  version: 1.3.68
-  resolution: "@swc/core-darwin-arm64@npm:1.3.68"
+"@swc/core-darwin-arm64@npm:1.3.82":
+  version: 1.3.82
+  resolution: "@swc/core-darwin-arm64@npm:1.3.82"
   conditions: os=darwin & cpu=arm64
   languageName: node
   linkType: hard
 
-"@swc/core-darwin-x64@npm:1.3.68":
-  version: 1.3.68
-  resolution: "@swc/core-darwin-x64@npm:1.3.68"
+"@swc/core-darwin-x64@npm:1.3.82":
+  version: 1.3.82
+  resolution: "@swc/core-darwin-x64@npm:1.3.82"
   conditions: os=darwin & cpu=x64
   languageName: node
   linkType: hard
 
-"@swc/core-linux-arm-gnueabihf@npm:1.3.68":
-  version: 1.3.68
-  resolution: "@swc/core-linux-arm-gnueabihf@npm:1.3.68"
+"@swc/core-linux-arm-gnueabihf@npm:1.3.82":
+  version: 1.3.82
+  resolution: "@swc/core-linux-arm-gnueabihf@npm:1.3.82"
   conditions: os=linux & cpu=arm
   languageName: node
   linkType: hard
 
-"@swc/core-linux-arm64-gnu@npm:1.3.68":
-  version: 1.3.68
-  resolution: "@swc/core-linux-arm64-gnu@npm:1.3.68"
+"@swc/core-linux-arm64-gnu@npm:1.3.82":
+  version: 1.3.82
+  resolution: "@swc/core-linux-arm64-gnu@npm:1.3.82"
   conditions: os=linux & cpu=arm64 & libc=glibc
   languageName: node
   linkType: hard
 
-"@swc/core-linux-arm64-musl@npm:1.3.68":
-  version: 1.3.68
-  resolution: "@swc/core-linux-arm64-musl@npm:1.3.68"
+"@swc/core-linux-arm64-musl@npm:1.3.82":
+  version: 1.3.82
+  resolution: "@swc/core-linux-arm64-musl@npm:1.3.82"
   conditions: os=linux & cpu=arm64 & libc=musl
   languageName: node
   linkType: hard
 
-"@swc/core-linux-x64-gnu@npm:1.3.68":
-  version: 1.3.68
-  resolution: "@swc/core-linux-x64-gnu@npm:1.3.68"
+"@swc/core-linux-x64-gnu@npm:1.3.82":
+  version: 1.3.82
+  resolution: "@swc/core-linux-x64-gnu@npm:1.3.82"
   conditions: os=linux & cpu=x64 & libc=glibc
   languageName: node
   linkType: hard
 
-"@swc/core-linux-x64-musl@npm:1.3.68":
-  version: 1.3.68
-  resolution: "@swc/core-linux-x64-musl@npm:1.3.68"
+"@swc/core-linux-x64-musl@npm:1.3.82":
+  version: 1.3.82
+  resolution: "@swc/core-linux-x64-musl@npm:1.3.82"
   conditions: os=linux & cpu=x64 & libc=musl
   languageName: node
   linkType: hard
 
-"@swc/core-win32-arm64-msvc@npm:1.3.68":
-  version: 1.3.68
-  resolution: "@swc/core-win32-arm64-msvc@npm:1.3.68"
+"@swc/core-win32-arm64-msvc@npm:1.3.82":
+  version: 1.3.82
+  resolution: "@swc/core-win32-arm64-msvc@npm:1.3.82"
   conditions: os=win32 & cpu=arm64
   languageName: node
   linkType: hard
 
-"@swc/core-win32-ia32-msvc@npm:1.3.68":
-  version: 1.3.68
-  resolution: "@swc/core-win32-ia32-msvc@npm:1.3.68"
+"@swc/core-win32-ia32-msvc@npm:1.3.82":
+  version: 1.3.82
+  resolution: "@swc/core-win32-ia32-msvc@npm:1.3.82"
   conditions: os=win32 & cpu=ia32
   languageName: node
   linkType: hard
 
-"@swc/core-win32-x64-msvc@npm:1.3.68":
-  version: 1.3.68
-  resolution: "@swc/core-win32-x64-msvc@npm:1.3.68"
+"@swc/core-win32-x64-msvc@npm:1.3.82":
+  version: 1.3.82
+  resolution: "@swc/core-win32-x64-msvc@npm:1.3.82"
   conditions: os=win32 & cpu=x64
   languageName: node
   linkType: hard
 
 "@swc/core@npm:^1.3.46":
-  version: 1.3.68
-  resolution: "@swc/core@npm:1.3.68"
+  version: 1.3.82
+  resolution: "@swc/core@npm:1.3.82"
   dependencies:
-    "@swc/core-darwin-arm64": 1.3.68
-    "@swc/core-darwin-x64": 1.3.68
-    "@swc/core-linux-arm-gnueabihf": 1.3.68
-    "@swc/core-linux-arm64-gnu": 1.3.68
-    "@swc/core-linux-arm64-musl": 1.3.68
-    "@swc/core-linux-x64-gnu": 1.3.68
-    "@swc/core-linux-x64-musl": 1.3.68
-    "@swc/core-win32-arm64-msvc": 1.3.68
-    "@swc/core-win32-ia32-msvc": 1.3.68
-    "@swc/core-win32-x64-msvc": 1.3.68
+    "@swc/core-darwin-arm64": 1.3.82
+    "@swc/core-darwin-x64": 1.3.82
+    "@swc/core-linux-arm-gnueabihf": 1.3.82
+    "@swc/core-linux-arm64-gnu": 1.3.82
+    "@swc/core-linux-arm64-musl": 1.3.82
+    "@swc/core-linux-x64-gnu": 1.3.82
+    "@swc/core-linux-x64-musl": 1.3.82
+    "@swc/core-win32-arm64-msvc": 1.3.82
+    "@swc/core-win32-ia32-msvc": 1.3.82
+    "@swc/core-win32-x64-msvc": 1.3.82
+    "@swc/types": ^0.1.4
   peerDependencies:
     "@swc/helpers": ^0.5.0
   dependenciesMeta:
@@ -2950,7 +2951,14 @@ __metadata:
   peerDependenciesMeta:
     "@swc/helpers":
       optional: true
-  checksum: f56ad1d4cb91f7cc1cb5d4b9894bbb528da0b2eabc98984581f5b3f3187cf2c0d512003880f6ff7a3f6d215b7a3dcbf5a9c45e8a428ac2d711941027c0151d89
+  checksum: 4c4adbed22071c0af935129a6fe7cc35d1688a5c1a069efdd8c97740930fa7eaf324e75dc88634a4ea0520330f6c88101d5aa5cf7ed6e02d336cc46ee7131ea3
+  languageName: node
+  linkType: hard
+
+"@swc/types@npm:^0.1.4":
+  version: 0.1.4
+  resolution: "@swc/types@npm:0.1.4"
+  checksum: 9b09de7dca8e4b19bfb43f9e332c771855158cb761d26000807fe858447ecbc5342a6c257b26d9aa5497f7138fc58913693e2bee222e5042e0e8f57c2979ae66
   languageName: node
   linkType: hard
 
@@ -11739,8 +11747,8 @@ __metadata:
   linkType: hard
 
 "webpack@npm:^5.73.0":
-  version: 5.88.1
-  resolution: "webpack@npm:5.88.1"
+  version: 5.88.2
+  resolution: "webpack@npm:5.88.2"
   dependencies:
     "@types/eslint-scope": ^3.7.3
     "@types/estree": ^1.0.0
@@ -11771,7 +11779,7 @@ __metadata:
       optional: true
   bin:
     webpack: bin/webpack.js
-  checksum: 726e7e05ab2e7c142609a673dd6aa1a711ed97f349418a2a393d650c5ddad172d191257f60e1e37f6b2a77261571c202aabd5ce9240791a686774f0801cf5ec2
+  checksum: 79476a782da31a21f6dd38fbbd06b68da93baf6a62f0d08ca99222367f3b8668f5a1f2086b7bb78e23172e31fa6df6fa7ab09b25e827866c4fc4dc2b30443ce2
   languageName: node
   linkType: hard
 
diff --git a/yarn.lock b/yarn.lock
index e62fd7ae0f..6efa788884 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -13,18 +13,19 @@ __metadata:
   linkType: hard
 
 "@adobe/css-tools@npm:^4.0.1":
-  version: 4.0.1
-  resolution: "@adobe/css-tools@npm:4.0.1"
-  checksum: 80226e2229024c21da9ffa6b5cd4a34b931f071e06f45aba4777ade071d7a6c94605cf73b13718b0c4b34e8b124c65c607b82eaa53a326d3eb73d9682a04a593
+  version: 4.3.1
+  resolution: "@adobe/css-tools@npm:4.3.1"
+  checksum: ad43456379ff391132aff687ece190cb23ea69395e23c9b96690eeabe2468da89a4aaf266e4f8b6eaab53db3d1064107ce0f63c3a974e864f4a04affc768da3f
   languageName: node
   linkType: hard
 
-"@ampproject/remapping@npm:^2.1.0":
-  version: 2.1.2
-  resolution: "@ampproject/remapping@npm:2.1.2"
+"@ampproject/remapping@npm:^2.2.0":
+  version: 2.2.1
+  resolution: "@ampproject/remapping@npm:2.2.1"
   dependencies:
-    "@jridgewell/trace-mapping": ^0.3.0
-  checksum: e023f92cdd9723f3042cde3b4d922adfeef0e198aa73486b0b6c034ad36af5f96e5c0cc72b335b30b2eb9852d907efc92af6bfcd3f4b4d286177ee32a189cf92
+    "@jridgewell/gen-mapping": ^0.3.0
+    "@jridgewell/trace-mapping": ^0.3.9
+  checksum: 03c04fd526acc64a1f4df22651186f3e5ef0a9d6d6530ce4482ec9841269cf7a11dbb8af79237c282d721c5312024ff17529cd72cc4768c11e999b58e2302079
   languageName: node
   linkType: hard
 
@@ -102,16 +103,16 @@ __metadata:
   linkType: hard
 
 "@apollo/client@npm:^3.0.0":
-  version: 3.7.17
-  resolution: "@apollo/client@npm:3.7.17"
+  version: 3.8.3
+  resolution: "@apollo/client@npm:3.8.3"
   dependencies:
     "@graphql-typed-document-node/core": ^3.1.1
-    "@wry/context": ^0.7.0
-    "@wry/equality": ^0.5.0
-    "@wry/trie": ^0.4.0
+    "@wry/context": ^0.7.3
+    "@wry/equality": ^0.5.6
+    "@wry/trie": ^0.4.3
     graphql-tag: ^2.12.6
     hoist-non-react-statics: ^3.3.2
-    optimism: ^0.16.2
+    optimism: ^0.17.5
     prop-types: ^15.7.2
     response-iterator: ^0.2.6
     symbol-observable: ^4.0.0
@@ -133,7 +134,7 @@ __metadata:
       optional: true
     subscriptions-transport-ws:
       optional: true
-  checksum: d25e955f3c409885185405ca5876cb74538becafa202257a27483c07d7faa9ce83b34d4cab4b7fd9ad217f80d768e651881292c406dbbca221c91013917890d7
+  checksum: cdecd5d613c0f941d00fc1904b9ecdeb502fc157c10400430231adb47d8f67727c78eed1b7489aed91cce6e20e32fc44e16b6c2d5424a42d7c100dcef65b942b
   languageName: node
   linkType: hard
 
@@ -199,8 +200,8 @@ __metadata:
   linkType: hard
 
 "@apollo/server@npm:^4.0.0":
-  version: 4.9.1
-  resolution: "@apollo/server@npm:4.9.1"
+  version: 4.9.3
+  resolution: "@apollo/server@npm:4.9.3"
   dependencies:
     "@apollo/cache-control-types": ^1.0.3
     "@apollo/server-gateway-interface": ^1.1.1
@@ -230,7 +231,7 @@ __metadata:
     whatwg-mimetype: ^3.0.0
   peerDependencies:
     graphql: ^16.6.0
-  checksum: d5299acfc8f0519adb5aed59e067880bdfd2528353711be07c935d0038ef95e06eecfc58af473011d215c92659f1858ae06c26fe9f70f865383d8e5457e17be5
+  checksum: 28537d7646669a5dc1302cfd75d8a9bf473459ee585c6b778d174628a2cfb3f89a5ac742eca7de2a779b6c9e3f30da509a8787a71227520d009ac190aa7a9207
   languageName: node
   linkType: hard
 
@@ -569,498 +570,457 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@aws-sdk/client-cognito-identity@npm:3.382.0":
-  version: 3.382.0
-  resolution: "@aws-sdk/client-cognito-identity@npm:3.382.0"
+"@aws-sdk/client-cognito-identity@npm:3.405.0":
+  version: 3.405.0
+  resolution: "@aws-sdk/client-cognito-identity@npm:3.405.0"
   dependencies:
     "@aws-crypto/sha256-browser": 3.0.0
     "@aws-crypto/sha256-js": 3.0.0
-    "@aws-sdk/client-sts": 3.382.0
-    "@aws-sdk/credential-provider-node": 3.382.0
-    "@aws-sdk/middleware-host-header": 3.379.1
-    "@aws-sdk/middleware-logger": 3.378.0
-    "@aws-sdk/middleware-recursion-detection": 3.378.0
-    "@aws-sdk/middleware-signing": 3.379.1
-    "@aws-sdk/middleware-user-agent": 3.382.0
-    "@aws-sdk/types": 3.378.0
-    "@aws-sdk/util-endpoints": 3.382.0
-    "@aws-sdk/util-user-agent-browser": 3.378.0
-    "@aws-sdk/util-user-agent-node": 3.378.0
-    "@smithy/config-resolver": ^2.0.1
-    "@smithy/fetch-http-handler": ^2.0.1
-    "@smithy/hash-node": ^2.0.1
-    "@smithy/invalid-dependency": ^2.0.1
-    "@smithy/middleware-content-length": ^2.0.1
-    "@smithy/middleware-endpoint": ^2.0.1
-    "@smithy/middleware-retry": ^2.0.1
-    "@smithy/middleware-serde": ^2.0.1
+    "@aws-sdk/client-sts": 3.405.0
+    "@aws-sdk/credential-provider-node": 3.405.0
+    "@aws-sdk/middleware-host-header": 3.398.0
+    "@aws-sdk/middleware-logger": 3.398.0
+    "@aws-sdk/middleware-recursion-detection": 3.398.0
+    "@aws-sdk/middleware-signing": 3.398.0
+    "@aws-sdk/middleware-user-agent": 3.398.0
+    "@aws-sdk/types": 3.398.0
+    "@aws-sdk/util-endpoints": 3.398.0
+    "@aws-sdk/util-user-agent-browser": 3.398.0
+    "@aws-sdk/util-user-agent-node": 3.405.0
+    "@smithy/config-resolver": ^2.0.5
+    "@smithy/fetch-http-handler": ^2.0.5
+    "@smithy/hash-node": ^2.0.5
+    "@smithy/invalid-dependency": ^2.0.5
+    "@smithy/middleware-content-length": ^2.0.5
+    "@smithy/middleware-endpoint": ^2.0.5
+    "@smithy/middleware-retry": ^2.0.5
+    "@smithy/middleware-serde": ^2.0.5
     "@smithy/middleware-stack": ^2.0.0
-    "@smithy/node-config-provider": ^2.0.1
-    "@smithy/node-http-handler": ^2.0.1
-    "@smithy/protocol-http": ^2.0.1
-    "@smithy/smithy-client": ^2.0.1
-    "@smithy/types": ^2.0.2
-    "@smithy/url-parser": ^2.0.1
+    "@smithy/node-config-provider": ^2.0.6
+    "@smithy/node-http-handler": ^2.0.5
+    "@smithy/protocol-http": ^2.0.5
+    "@smithy/smithy-client": ^2.0.5
+    "@smithy/types": ^2.2.2
+    "@smithy/url-parser": ^2.0.5
     "@smithy/util-base64": ^2.0.0
     "@smithy/util-body-length-browser": ^2.0.0
-    "@smithy/util-body-length-node": ^2.0.0
-    "@smithy/util-defaults-mode-browser": ^2.0.1
-    "@smithy/util-defaults-mode-node": ^2.0.1
+    "@smithy/util-body-length-node": ^2.1.0
+    "@smithy/util-defaults-mode-browser": ^2.0.6
+    "@smithy/util-defaults-mode-node": ^2.0.6
     "@smithy/util-retry": ^2.0.0
     "@smithy/util-utf8": ^2.0.0
     tslib: ^2.5.0
-  checksum: 42f44e01e751358f427c0a60b4b996dc6eda3ac1c5f6324785067f6ca36c1cbee213a4d6d642a73b072ad5b54ff15b84b57c69accfbfda082c39e63c727f5a96
+  checksum: 7cae774ec605939c0bb629b7dcb3155fe998250550d8e4f5696e546fd9debba7cb749556c54787e223613b586c06cec7138f4a9a7718de1df8a5abb43556d1a8
   languageName: node
   linkType: hard
 
 "@aws-sdk/client-eks@npm:^3.350.0":
-  version: 3.382.0
-  resolution: "@aws-sdk/client-eks@npm:3.382.0"
+  version: 3.405.0
+  resolution: "@aws-sdk/client-eks@npm:3.405.0"
   dependencies:
     "@aws-crypto/sha256-browser": 3.0.0
     "@aws-crypto/sha256-js": 3.0.0
-    "@aws-sdk/client-sts": 3.382.0
-    "@aws-sdk/credential-provider-node": 3.382.0
-    "@aws-sdk/middleware-host-header": 3.379.1
-    "@aws-sdk/middleware-logger": 3.378.0
-    "@aws-sdk/middleware-recursion-detection": 3.378.0
-    "@aws-sdk/middleware-signing": 3.379.1
-    "@aws-sdk/middleware-user-agent": 3.382.0
-    "@aws-sdk/types": 3.378.0
-    "@aws-sdk/util-endpoints": 3.382.0
-    "@aws-sdk/util-user-agent-browser": 3.378.0
-    "@aws-sdk/util-user-agent-node": 3.378.0
-    "@smithy/config-resolver": ^2.0.1
-    "@smithy/fetch-http-handler": ^2.0.1
-    "@smithy/hash-node": ^2.0.1
-    "@smithy/invalid-dependency": ^2.0.1
-    "@smithy/middleware-content-length": ^2.0.1
-    "@smithy/middleware-endpoint": ^2.0.1
-    "@smithy/middleware-retry": ^2.0.1
-    "@smithy/middleware-serde": ^2.0.1
+    "@aws-sdk/client-sts": 3.405.0
+    "@aws-sdk/credential-provider-node": 3.405.0
+    "@aws-sdk/middleware-host-header": 3.398.0
+    "@aws-sdk/middleware-logger": 3.398.0
+    "@aws-sdk/middleware-recursion-detection": 3.398.0
+    "@aws-sdk/middleware-signing": 3.398.0
+    "@aws-sdk/middleware-user-agent": 3.398.0
+    "@aws-sdk/types": 3.398.0
+    "@aws-sdk/util-endpoints": 3.398.0
+    "@aws-sdk/util-user-agent-browser": 3.398.0
+    "@aws-sdk/util-user-agent-node": 3.405.0
+    "@smithy/config-resolver": ^2.0.5
+    "@smithy/fetch-http-handler": ^2.0.5
+    "@smithy/hash-node": ^2.0.5
+    "@smithy/invalid-dependency": ^2.0.5
+    "@smithy/middleware-content-length": ^2.0.5
+    "@smithy/middleware-endpoint": ^2.0.5
+    "@smithy/middleware-retry": ^2.0.5
+    "@smithy/middleware-serde": ^2.0.5
     "@smithy/middleware-stack": ^2.0.0
-    "@smithy/node-config-provider": ^2.0.1
-    "@smithy/node-http-handler": ^2.0.1
-    "@smithy/protocol-http": ^2.0.1
-    "@smithy/smithy-client": ^2.0.1
-    "@smithy/types": ^2.0.2
-    "@smithy/url-parser": ^2.0.1
+    "@smithy/node-config-provider": ^2.0.6
+    "@smithy/node-http-handler": ^2.0.5
+    "@smithy/protocol-http": ^2.0.5
+    "@smithy/smithy-client": ^2.0.5
+    "@smithy/types": ^2.2.2
+    "@smithy/url-parser": ^2.0.5
     "@smithy/util-base64": ^2.0.0
     "@smithy/util-body-length-browser": ^2.0.0
-    "@smithy/util-body-length-node": ^2.0.0
-    "@smithy/util-defaults-mode-browser": ^2.0.1
-    "@smithy/util-defaults-mode-node": ^2.0.1
+    "@smithy/util-body-length-node": ^2.1.0
+    "@smithy/util-defaults-mode-browser": ^2.0.6
+    "@smithy/util-defaults-mode-node": ^2.0.6
     "@smithy/util-retry": ^2.0.0
     "@smithy/util-utf8": ^2.0.0
-    "@smithy/util-waiter": ^2.0.1
+    "@smithy/util-waiter": ^2.0.5
     tslib: ^2.5.0
     uuid: ^8.3.2
-  checksum: 129ea874365fd5938257e918d4ffb59216528b5f6ae877a35b71e63b893529090cd710a5eb3bb15b182e24a8212de0c8131410d84698a6d8b52024b7aad26ec2
+  checksum: 166feb777e7bd4f1e7d78201b0f0402f0c2afb8e0f35e32576bd22eeb21bd3a2dda504d7c10a502dd64ddce79ff4f76df971a26fd5944dfe42770b962a242c59
   languageName: node
   linkType: hard
 
 "@aws-sdk/client-organizations@npm:^3.350.0":
-  version: 3.382.0
-  resolution: "@aws-sdk/client-organizations@npm:3.382.0"
+  version: 3.405.0
+  resolution: "@aws-sdk/client-organizations@npm:3.405.0"
   dependencies:
     "@aws-crypto/sha256-browser": 3.0.0
     "@aws-crypto/sha256-js": 3.0.0
-    "@aws-sdk/client-sts": 3.382.0
-    "@aws-sdk/credential-provider-node": 3.382.0
-    "@aws-sdk/middleware-host-header": 3.379.1
-    "@aws-sdk/middleware-logger": 3.378.0
-    "@aws-sdk/middleware-recursion-detection": 3.378.0
-    "@aws-sdk/middleware-signing": 3.379.1
-    "@aws-sdk/middleware-user-agent": 3.382.0
-    "@aws-sdk/types": 3.378.0
-    "@aws-sdk/util-endpoints": 3.382.0
-    "@aws-sdk/util-user-agent-browser": 3.378.0
-    "@aws-sdk/util-user-agent-node": 3.378.0
-    "@smithy/config-resolver": ^2.0.1
-    "@smithy/fetch-http-handler": ^2.0.1
-    "@smithy/hash-node": ^2.0.1
-    "@smithy/invalid-dependency": ^2.0.1
-    "@smithy/middleware-content-length": ^2.0.1
-    "@smithy/middleware-endpoint": ^2.0.1
-    "@smithy/middleware-retry": ^2.0.1
-    "@smithy/middleware-serde": ^2.0.1
+    "@aws-sdk/client-sts": 3.405.0
+    "@aws-sdk/credential-provider-node": 3.405.0
+    "@aws-sdk/middleware-host-header": 3.398.0
+    "@aws-sdk/middleware-logger": 3.398.0
+    "@aws-sdk/middleware-recursion-detection": 3.398.0
+    "@aws-sdk/middleware-signing": 3.398.0
+    "@aws-sdk/middleware-user-agent": 3.398.0
+    "@aws-sdk/types": 3.398.0
+    "@aws-sdk/util-endpoints": 3.398.0
+    "@aws-sdk/util-user-agent-browser": 3.398.0
+    "@aws-sdk/util-user-agent-node": 3.405.0
+    "@smithy/config-resolver": ^2.0.5
+    "@smithy/fetch-http-handler": ^2.0.5
+    "@smithy/hash-node": ^2.0.5
+    "@smithy/invalid-dependency": ^2.0.5
+    "@smithy/middleware-content-length": ^2.0.5
+    "@smithy/middleware-endpoint": ^2.0.5
+    "@smithy/middleware-retry": ^2.0.5
+    "@smithy/middleware-serde": ^2.0.5
     "@smithy/middleware-stack": ^2.0.0
-    "@smithy/node-config-provider": ^2.0.1
-    "@smithy/node-http-handler": ^2.0.1
-    "@smithy/protocol-http": ^2.0.1
-    "@smithy/smithy-client": ^2.0.1
-    "@smithy/types": ^2.0.2
-    "@smithy/url-parser": ^2.0.1
+    "@smithy/node-config-provider": ^2.0.6
+    "@smithy/node-http-handler": ^2.0.5
+    "@smithy/protocol-http": ^2.0.5
+    "@smithy/smithy-client": ^2.0.5
+    "@smithy/types": ^2.2.2
+    "@smithy/url-parser": ^2.0.5
     "@smithy/util-base64": ^2.0.0
     "@smithy/util-body-length-browser": ^2.0.0
-    "@smithy/util-body-length-node": ^2.0.0
-    "@smithy/util-defaults-mode-browser": ^2.0.1
-    "@smithy/util-defaults-mode-node": ^2.0.1
+    "@smithy/util-body-length-node": ^2.1.0
+    "@smithy/util-defaults-mode-browser": ^2.0.6
+    "@smithy/util-defaults-mode-node": ^2.0.6
     "@smithy/util-retry": ^2.0.0
     "@smithy/util-utf8": ^2.0.0
     tslib: ^2.5.0
-  checksum: 0abb001f0738f2037afb56e4de39c55efadd728b338da52d2b4c1f605209442ad5f9229b93ee04315f182a054c651283099e782e933e1b4df10aa63a8e93171f
+  checksum: 9abdf6593730942a3f97b77ab00b1f52b78c6acb695b34e59fcffb03d92b5e66dae9b7c4005660a4189851d40b66c7845bce1be81be4329262d9977d01c7dcc9
   languageName: node
   linkType: hard
 
 "@aws-sdk/client-s3@npm:^3.350.0":
-  version: 3.383.0
-  resolution: "@aws-sdk/client-s3@npm:3.383.0"
+  version: 3.405.0
+  resolution: "@aws-sdk/client-s3@npm:3.405.0"
   dependencies:
     "@aws-crypto/sha1-browser": 3.0.0
     "@aws-crypto/sha256-browser": 3.0.0
     "@aws-crypto/sha256-js": 3.0.0
-    "@aws-sdk/client-sts": 3.382.0
-    "@aws-sdk/credential-provider-node": 3.382.0
-    "@aws-sdk/middleware-bucket-endpoint": 3.378.0
-    "@aws-sdk/middleware-expect-continue": 3.378.0
-    "@aws-sdk/middleware-flexible-checksums": 3.383.0
-    "@aws-sdk/middleware-host-header": 3.379.1
-    "@aws-sdk/middleware-location-constraint": 3.379.1
-    "@aws-sdk/middleware-logger": 3.378.0
-    "@aws-sdk/middleware-recursion-detection": 3.378.0
-    "@aws-sdk/middleware-sdk-s3": 3.379.1
-    "@aws-sdk/middleware-signing": 3.379.1
-    "@aws-sdk/middleware-ssec": 3.378.0
-    "@aws-sdk/middleware-user-agent": 3.382.0
-    "@aws-sdk/signature-v4-multi-region": 3.378.0
-    "@aws-sdk/types": 3.378.0
-    "@aws-sdk/util-endpoints": 3.382.0
-    "@aws-sdk/util-user-agent-browser": 3.378.0
-    "@aws-sdk/util-user-agent-node": 3.378.0
+    "@aws-sdk/client-sts": 3.405.0
+    "@aws-sdk/credential-provider-node": 3.405.0
+    "@aws-sdk/middleware-bucket-endpoint": 3.405.0
+    "@aws-sdk/middleware-expect-continue": 3.398.0
+    "@aws-sdk/middleware-flexible-checksums": 3.400.0
+    "@aws-sdk/middleware-host-header": 3.398.0
+    "@aws-sdk/middleware-location-constraint": 3.398.0
+    "@aws-sdk/middleware-logger": 3.398.0
+    "@aws-sdk/middleware-recursion-detection": 3.398.0
+    "@aws-sdk/middleware-sdk-s3": 3.398.0
+    "@aws-sdk/middleware-signing": 3.398.0
+    "@aws-sdk/middleware-ssec": 3.398.0
+    "@aws-sdk/middleware-user-agent": 3.398.0
+    "@aws-sdk/signature-v4-multi-region": 3.398.0
+    "@aws-sdk/types": 3.398.0
+    "@aws-sdk/util-endpoints": 3.398.0
+    "@aws-sdk/util-user-agent-browser": 3.398.0
+    "@aws-sdk/util-user-agent-node": 3.405.0
     "@aws-sdk/xml-builder": 3.310.0
-    "@smithy/config-resolver": ^2.0.1
-    "@smithy/eventstream-serde-browser": ^2.0.1
-    "@smithy/eventstream-serde-config-resolver": ^2.0.1
-    "@smithy/eventstream-serde-node": ^2.0.1
-    "@smithy/fetch-http-handler": ^2.0.1
-    "@smithy/hash-blob-browser": ^2.0.1
-    "@smithy/hash-node": ^2.0.1
-    "@smithy/hash-stream-node": ^2.0.1
-    "@smithy/invalid-dependency": ^2.0.1
-    "@smithy/md5-js": ^2.0.1
-    "@smithy/middleware-content-length": ^2.0.1
-    "@smithy/middleware-endpoint": ^2.0.1
-    "@smithy/middleware-retry": ^2.0.1
-    "@smithy/middleware-serde": ^2.0.1
+    "@smithy/config-resolver": ^2.0.5
+    "@smithy/eventstream-serde-browser": ^2.0.5
+    "@smithy/eventstream-serde-config-resolver": ^2.0.5
+    "@smithy/eventstream-serde-node": ^2.0.5
+    "@smithy/fetch-http-handler": ^2.0.5
+    "@smithy/hash-blob-browser": ^2.0.5
+    "@smithy/hash-node": ^2.0.5
+    "@smithy/hash-stream-node": ^2.0.5
+    "@smithy/invalid-dependency": ^2.0.5
+    "@smithy/md5-js": ^2.0.5
+    "@smithy/middleware-content-length": ^2.0.5
+    "@smithy/middleware-endpoint": ^2.0.5
+    "@smithy/middleware-retry": ^2.0.5
+    "@smithy/middleware-serde": ^2.0.5
     "@smithy/middleware-stack": ^2.0.0
-    "@smithy/node-config-provider": ^2.0.1
-    "@smithy/node-http-handler": ^2.0.1
-    "@smithy/protocol-http": ^2.0.1
-    "@smithy/smithy-client": ^2.0.1
-    "@smithy/types": ^2.0.2
-    "@smithy/url-parser": ^2.0.1
+    "@smithy/node-config-provider": ^2.0.6
+    "@smithy/node-http-handler": ^2.0.5
+    "@smithy/protocol-http": ^2.0.5
+    "@smithy/smithy-client": ^2.0.5
+    "@smithy/types": ^2.2.2
+    "@smithy/url-parser": ^2.0.5
     "@smithy/util-base64": ^2.0.0
     "@smithy/util-body-length-browser": ^2.0.0
-    "@smithy/util-body-length-node": ^2.0.0
-    "@smithy/util-defaults-mode-browser": ^2.0.1
-    "@smithy/util-defaults-mode-node": ^2.0.1
+    "@smithy/util-body-length-node": ^2.1.0
+    "@smithy/util-defaults-mode-browser": ^2.0.6
+    "@smithy/util-defaults-mode-node": ^2.0.6
     "@smithy/util-retry": ^2.0.0
-    "@smithy/util-stream": ^2.0.1
+    "@smithy/util-stream": ^2.0.5
     "@smithy/util-utf8": ^2.0.0
-    "@smithy/util-waiter": ^2.0.1
+    "@smithy/util-waiter": ^2.0.5
     fast-xml-parser: 4.2.5
     tslib: ^2.5.0
-  checksum: 0d3302e132e99e598db0628e697579828abc8a3ff68cf60b25113d077a62e05ca8438a822ae9601bb90420d7446caa6dc590bc5daf4d3bd9c48fd0527a928de6
+  checksum: e9665537bcd809d9f8b71d45ce4971618017db35d6074a01e89b96d19a5b2e76e9d8e0005f7f9bf898c1556d1d20125dae38bcfc5609ce11f9e418d03e216d76
   languageName: node
   linkType: hard
 
 "@aws-sdk/client-sqs@npm:^3.350.0":
-  version: 3.382.0
-  resolution: "@aws-sdk/client-sqs@npm:3.382.0"
+  version: 3.405.0
+  resolution: "@aws-sdk/client-sqs@npm:3.405.0"
   dependencies:
     "@aws-crypto/sha256-browser": 3.0.0
     "@aws-crypto/sha256-js": 3.0.0
-    "@aws-sdk/client-sts": 3.382.0
-    "@aws-sdk/credential-provider-node": 3.382.0
-    "@aws-sdk/middleware-host-header": 3.379.1
-    "@aws-sdk/middleware-logger": 3.378.0
-    "@aws-sdk/middleware-recursion-detection": 3.378.0
-    "@aws-sdk/middleware-sdk-sqs": 3.378.0
-    "@aws-sdk/middleware-signing": 3.379.1
-    "@aws-sdk/middleware-user-agent": 3.382.0
-    "@aws-sdk/types": 3.378.0
-    "@aws-sdk/util-endpoints": 3.382.0
-    "@aws-sdk/util-user-agent-browser": 3.378.0
-    "@aws-sdk/util-user-agent-node": 3.378.0
-    "@smithy/config-resolver": ^2.0.1
-    "@smithy/fetch-http-handler": ^2.0.1
-    "@smithy/hash-node": ^2.0.1
-    "@smithy/invalid-dependency": ^2.0.1
-    "@smithy/md5-js": ^2.0.1
-    "@smithy/middleware-content-length": ^2.0.1
-    "@smithy/middleware-endpoint": ^2.0.1
-    "@smithy/middleware-retry": ^2.0.1
-    "@smithy/middleware-serde": ^2.0.1
+    "@aws-sdk/client-sts": 3.405.0
+    "@aws-sdk/credential-provider-node": 3.405.0
+    "@aws-sdk/middleware-host-header": 3.398.0
+    "@aws-sdk/middleware-logger": 3.398.0
+    "@aws-sdk/middleware-recursion-detection": 3.398.0
+    "@aws-sdk/middleware-sdk-sqs": 3.398.0
+    "@aws-sdk/middleware-signing": 3.398.0
+    "@aws-sdk/middleware-user-agent": 3.398.0
+    "@aws-sdk/types": 3.398.0
+    "@aws-sdk/util-endpoints": 3.398.0
+    "@aws-sdk/util-user-agent-browser": 3.398.0
+    "@aws-sdk/util-user-agent-node": 3.405.0
+    "@smithy/config-resolver": ^2.0.5
+    "@smithy/fetch-http-handler": ^2.0.5
+    "@smithy/hash-node": ^2.0.5
+    "@smithy/invalid-dependency": ^2.0.5
+    "@smithy/md5-js": ^2.0.5
+    "@smithy/middleware-content-length": ^2.0.5
+    "@smithy/middleware-endpoint": ^2.0.5
+    "@smithy/middleware-retry": ^2.0.5
+    "@smithy/middleware-serde": ^2.0.5
     "@smithy/middleware-stack": ^2.0.0
-    "@smithy/node-config-provider": ^2.0.1
-    "@smithy/node-http-handler": ^2.0.1
-    "@smithy/protocol-http": ^2.0.1
-    "@smithy/smithy-client": ^2.0.1
-    "@smithy/types": ^2.0.2
-    "@smithy/url-parser": ^2.0.1
+    "@smithy/node-config-provider": ^2.0.6
+    "@smithy/node-http-handler": ^2.0.5
+    "@smithy/protocol-http": ^2.0.5
+    "@smithy/smithy-client": ^2.0.5
+    "@smithy/types": ^2.2.2
+    "@smithy/url-parser": ^2.0.5
     "@smithy/util-base64": ^2.0.0
     "@smithy/util-body-length-browser": ^2.0.0
-    "@smithy/util-body-length-node": ^2.0.0
-    "@smithy/util-defaults-mode-browser": ^2.0.1
-    "@smithy/util-defaults-mode-node": ^2.0.1
+    "@smithy/util-body-length-node": ^2.1.0
+    "@smithy/util-defaults-mode-browser": ^2.0.6
+    "@smithy/util-defaults-mode-node": ^2.0.6
     "@smithy/util-retry": ^2.0.0
     "@smithy/util-utf8": ^2.0.0
     fast-xml-parser: 4.2.5
     tslib: ^2.5.0
-  checksum: 51fb80f57b579b053156ba5c9c2fa5bcdead931ed519b8bd3ceb486c74d8881458aafb8eb9497b76581fe3d7eab9deb207bcc2925d1189b13869a8ebbb7cb6cf
+  checksum: 7618b9471cb02a47f5c7a6e1177f502712a6e532d76b814d1203989bd70a2f5e3c518e9927207fbf861b2703f241beec1f3f03e2717001245f9b456884c5b963
   languageName: node
   linkType: hard
 
-"@aws-sdk/client-sso-oidc@npm:3.382.0":
-  version: 3.382.0
-  resolution: "@aws-sdk/client-sso-oidc@npm:3.382.0"
+"@aws-sdk/client-sso@npm:3.405.0":
+  version: 3.405.0
+  resolution: "@aws-sdk/client-sso@npm:3.405.0"
   dependencies:
     "@aws-crypto/sha256-browser": 3.0.0
     "@aws-crypto/sha256-js": 3.0.0
-    "@aws-sdk/middleware-host-header": 3.379.1
-    "@aws-sdk/middleware-logger": 3.378.0
-    "@aws-sdk/middleware-recursion-detection": 3.378.0
-    "@aws-sdk/middleware-user-agent": 3.382.0
-    "@aws-sdk/types": 3.378.0
-    "@aws-sdk/util-endpoints": 3.382.0
-    "@aws-sdk/util-user-agent-browser": 3.378.0
-    "@aws-sdk/util-user-agent-node": 3.378.0
-    "@smithy/config-resolver": ^2.0.1
-    "@smithy/fetch-http-handler": ^2.0.1
-    "@smithy/hash-node": ^2.0.1
-    "@smithy/invalid-dependency": ^2.0.1
-    "@smithy/middleware-content-length": ^2.0.1
-    "@smithy/middleware-endpoint": ^2.0.1
-    "@smithy/middleware-retry": ^2.0.1
-    "@smithy/middleware-serde": ^2.0.1
+    "@aws-sdk/middleware-host-header": 3.398.0
+    "@aws-sdk/middleware-logger": 3.398.0
+    "@aws-sdk/middleware-recursion-detection": 3.398.0
+    "@aws-sdk/middleware-user-agent": 3.398.0
+    "@aws-sdk/types": 3.398.0
+    "@aws-sdk/util-endpoints": 3.398.0
+    "@aws-sdk/util-user-agent-browser": 3.398.0
+    "@aws-sdk/util-user-agent-node": 3.405.0
+    "@smithy/config-resolver": ^2.0.5
+    "@smithy/fetch-http-handler": ^2.0.5
+    "@smithy/hash-node": ^2.0.5
+    "@smithy/invalid-dependency": ^2.0.5
+    "@smithy/middleware-content-length": ^2.0.5
+    "@smithy/middleware-endpoint": ^2.0.5
+    "@smithy/middleware-retry": ^2.0.5
+    "@smithy/middleware-serde": ^2.0.5
     "@smithy/middleware-stack": ^2.0.0
-    "@smithy/node-config-provider": ^2.0.1
-    "@smithy/node-http-handler": ^2.0.1
-    "@smithy/protocol-http": ^2.0.1
-    "@smithy/smithy-client": ^2.0.1
-    "@smithy/types": ^2.0.2
-    "@smithy/url-parser": ^2.0.1
+    "@smithy/node-config-provider": ^2.0.6
+    "@smithy/node-http-handler": ^2.0.5
+    "@smithy/protocol-http": ^2.0.5
+    "@smithy/smithy-client": ^2.0.5
+    "@smithy/types": ^2.2.2
+    "@smithy/url-parser": ^2.0.5
     "@smithy/util-base64": ^2.0.0
     "@smithy/util-body-length-browser": ^2.0.0
-    "@smithy/util-body-length-node": ^2.0.0
-    "@smithy/util-defaults-mode-browser": ^2.0.1
-    "@smithy/util-defaults-mode-node": ^2.0.1
+    "@smithy/util-body-length-node": ^2.1.0
+    "@smithy/util-defaults-mode-browser": ^2.0.6
+    "@smithy/util-defaults-mode-node": ^2.0.6
     "@smithy/util-retry": ^2.0.0
     "@smithy/util-utf8": ^2.0.0
     tslib: ^2.5.0
-  checksum: 8e63db2ed9d27326d4afe897f7debbe4d7f6c2b27015d5a5e2ce0656adc3757860c313403c1f0e5bfb6790e610d63c8ef3d6ce103abaa07155b4578e4fae768d
+  checksum: ec4fd5cf3d76ef5b8fdd815c58070a924c98fffb7b8228d409d009ce9596851bd54aa7d1f9f3528972f377c596363243a2d3fed5fc62d336751b99bebfd0363f
   languageName: node
   linkType: hard
 
-"@aws-sdk/client-sso@npm:3.382.0":
-  version: 3.382.0
-  resolution: "@aws-sdk/client-sso@npm:3.382.0"
+"@aws-sdk/client-sts@npm:3.405.0, @aws-sdk/client-sts@npm:^3.350.0":
+  version: 3.405.0
+  resolution: "@aws-sdk/client-sts@npm:3.405.0"
   dependencies:
     "@aws-crypto/sha256-browser": 3.0.0
     "@aws-crypto/sha256-js": 3.0.0
-    "@aws-sdk/middleware-host-header": 3.379.1
-    "@aws-sdk/middleware-logger": 3.378.0
-    "@aws-sdk/middleware-recursion-detection": 3.378.0
-    "@aws-sdk/middleware-user-agent": 3.382.0
-    "@aws-sdk/types": 3.378.0
-    "@aws-sdk/util-endpoints": 3.382.0
-    "@aws-sdk/util-user-agent-browser": 3.378.0
-    "@aws-sdk/util-user-agent-node": 3.378.0
-    "@smithy/config-resolver": ^2.0.1
-    "@smithy/fetch-http-handler": ^2.0.1
-    "@smithy/hash-node": ^2.0.1
-    "@smithy/invalid-dependency": ^2.0.1
-    "@smithy/middleware-content-length": ^2.0.1
-    "@smithy/middleware-endpoint": ^2.0.1
-    "@smithy/middleware-retry": ^2.0.1
-    "@smithy/middleware-serde": ^2.0.1
+    "@aws-sdk/credential-provider-node": 3.405.0
+    "@aws-sdk/middleware-host-header": 3.398.0
+    "@aws-sdk/middleware-logger": 3.398.0
+    "@aws-sdk/middleware-recursion-detection": 3.398.0
+    "@aws-sdk/middleware-sdk-sts": 3.398.0
+    "@aws-sdk/middleware-signing": 3.398.0
+    "@aws-sdk/middleware-user-agent": 3.398.0
+    "@aws-sdk/types": 3.398.0
+    "@aws-sdk/util-endpoints": 3.398.0
+    "@aws-sdk/util-user-agent-browser": 3.398.0
+    "@aws-sdk/util-user-agent-node": 3.405.0
+    "@smithy/config-resolver": ^2.0.5
+    "@smithy/fetch-http-handler": ^2.0.5
+    "@smithy/hash-node": ^2.0.5
+    "@smithy/invalid-dependency": ^2.0.5
+    "@smithy/middleware-content-length": ^2.0.5
+    "@smithy/middleware-endpoint": ^2.0.5
+    "@smithy/middleware-retry": ^2.0.5
+    "@smithy/middleware-serde": ^2.0.5
     "@smithy/middleware-stack": ^2.0.0
-    "@smithy/node-config-provider": ^2.0.1
-    "@smithy/node-http-handler": ^2.0.1
-    "@smithy/protocol-http": ^2.0.1
-    "@smithy/smithy-client": ^2.0.1
-    "@smithy/types": ^2.0.2
-    "@smithy/url-parser": ^2.0.1
+    "@smithy/node-config-provider": ^2.0.6
+    "@smithy/node-http-handler": ^2.0.5
+    "@smithy/protocol-http": ^2.0.5
+    "@smithy/smithy-client": ^2.0.5
+    "@smithy/types": ^2.2.2
+    "@smithy/url-parser": ^2.0.5
     "@smithy/util-base64": ^2.0.0
     "@smithy/util-body-length-browser": ^2.0.0
-    "@smithy/util-body-length-node": ^2.0.0
-    "@smithy/util-defaults-mode-browser": ^2.0.1
-    "@smithy/util-defaults-mode-node": ^2.0.1
-    "@smithy/util-retry": ^2.0.0
-    "@smithy/util-utf8": ^2.0.0
-    tslib: ^2.5.0
-  checksum: ef6c13d334913e05d3f4e0296259312beb8e257a8ed2a7421bf3239e96b8712259e8f94c12d26dc2b3b2948dfd1ea1141bde24931916c55ab398f7556e05bb6b
-  languageName: node
-  linkType: hard
-
-"@aws-sdk/client-sts@npm:3.382.0, @aws-sdk/client-sts@npm:^3.350.0":
-  version: 3.382.0
-  resolution: "@aws-sdk/client-sts@npm:3.382.0"
-  dependencies:
-    "@aws-crypto/sha256-browser": 3.0.0
-    "@aws-crypto/sha256-js": 3.0.0
-    "@aws-sdk/credential-provider-node": 3.382.0
-    "@aws-sdk/middleware-host-header": 3.379.1
-    "@aws-sdk/middleware-logger": 3.378.0
-    "@aws-sdk/middleware-recursion-detection": 3.378.0
-    "@aws-sdk/middleware-sdk-sts": 3.379.1
-    "@aws-sdk/middleware-signing": 3.379.1
-    "@aws-sdk/middleware-user-agent": 3.382.0
-    "@aws-sdk/types": 3.378.0
-    "@aws-sdk/util-endpoints": 3.382.0
-    "@aws-sdk/util-user-agent-browser": 3.378.0
-    "@aws-sdk/util-user-agent-node": 3.378.0
-    "@smithy/config-resolver": ^2.0.1
-    "@smithy/fetch-http-handler": ^2.0.1
-    "@smithy/hash-node": ^2.0.1
-    "@smithy/invalid-dependency": ^2.0.1
-    "@smithy/middleware-content-length": ^2.0.1
-    "@smithy/middleware-endpoint": ^2.0.1
-    "@smithy/middleware-retry": ^2.0.1
-    "@smithy/middleware-serde": ^2.0.1
-    "@smithy/middleware-stack": ^2.0.0
-    "@smithy/node-config-provider": ^2.0.1
-    "@smithy/node-http-handler": ^2.0.1
-    "@smithy/protocol-http": ^2.0.1
-    "@smithy/smithy-client": ^2.0.1
-    "@smithy/types": ^2.0.2
-    "@smithy/url-parser": ^2.0.1
-    "@smithy/util-base64": ^2.0.0
-    "@smithy/util-body-length-browser": ^2.0.0
-    "@smithy/util-body-length-node": ^2.0.0
-    "@smithy/util-defaults-mode-browser": ^2.0.1
-    "@smithy/util-defaults-mode-node": ^2.0.1
+    "@smithy/util-body-length-node": ^2.1.0
+    "@smithy/util-defaults-mode-browser": ^2.0.6
+    "@smithy/util-defaults-mode-node": ^2.0.6
     "@smithy/util-retry": ^2.0.0
     "@smithy/util-utf8": ^2.0.0
     fast-xml-parser: 4.2.5
     tslib: ^2.5.0
-  checksum: e13fe8cfc271ea8fb56718e3e844a9715960165b65f6f8b226f02859d34344f1380987a4ce808530444c78853033ec37048dd4fa9c93ac0df8de89eeba71bd8e
+  checksum: f835c95a43100963afe3aea2afb0c0a124191fb9b6cd373a1b61f98287f8637efa08d2caeadb05cf5f85843a4397933e05fe8c63a1d39d0b4829341f972c41bc
   languageName: node
   linkType: hard
 
-"@aws-sdk/credential-provider-cognito-identity@npm:3.382.0":
-  version: 3.382.0
-  resolution: "@aws-sdk/credential-provider-cognito-identity@npm:3.382.0"
+"@aws-sdk/credential-provider-cognito-identity@npm:3.405.0":
+  version: 3.405.0
+  resolution: "@aws-sdk/credential-provider-cognito-identity@npm:3.405.0"
   dependencies:
-    "@aws-sdk/client-cognito-identity": 3.382.0
-    "@aws-sdk/types": 3.378.0
+    "@aws-sdk/client-cognito-identity": 3.405.0
+    "@aws-sdk/types": 3.398.0
     "@smithy/property-provider": ^2.0.0
-    "@smithy/types": ^2.0.2
+    "@smithy/types": ^2.2.2
     tslib: ^2.5.0
-  checksum: 795efad00f9de6590c24770d8599ce70907f6abaa77f8702a0f77d4631f44dfd3108ebca32fe99a59d4ff37af7e357dbac7259e18a6e9f7ba8c416dc35678762
+  checksum: 4deb3d0f401b2365f190f45a2cd68cc81db66b4c4f8ff8b3ae34e526611c272c4308b0020faaf16ad8e9f1728222271959c14643d0ae04713b495795a8fae8b6
   languageName: node
   linkType: hard
 
-"@aws-sdk/credential-provider-env@npm:3.378.0":
-  version: 3.378.0
-  resolution: "@aws-sdk/credential-provider-env@npm:3.378.0"
+"@aws-sdk/credential-provider-env@npm:3.398.0":
+  version: 3.398.0
+  resolution: "@aws-sdk/credential-provider-env@npm:3.398.0"
   dependencies:
-    "@aws-sdk/types": 3.378.0
+    "@aws-sdk/types": 3.398.0
     "@smithy/property-provider": ^2.0.0
-    "@smithy/types": ^2.0.2
+    "@smithy/types": ^2.2.2
     tslib: ^2.5.0
-  checksum: ff32e595305f93756bb8fe9b26ca9a5336ca0517ca0d62dfc4cfa36d3bb990a65ebe7b0afcebaf102e4037ddb5b03132a6dde268f421bb72cbbd4249a22715b6
+  checksum: 00c3fe0dbb0f58e6c769e447f5ae960e7d30fa9c6e5ed392ffbbe87356c526920e2ea18759a0a0cc2941109007ca950b43cfbb1764b2a1f076b4385333de89e5
   languageName: node
   linkType: hard
 
-"@aws-sdk/credential-provider-ini@npm:3.382.0":
-  version: 3.382.0
-  resolution: "@aws-sdk/credential-provider-ini@npm:3.382.0"
+"@aws-sdk/credential-provider-ini@npm:3.405.0":
+  version: 3.405.0
+  resolution: "@aws-sdk/credential-provider-ini@npm:3.405.0"
   dependencies:
-    "@aws-sdk/credential-provider-env": 3.378.0
-    "@aws-sdk/credential-provider-process": 3.378.0
-    "@aws-sdk/credential-provider-sso": 3.382.0
-    "@aws-sdk/credential-provider-web-identity": 3.378.0
-    "@aws-sdk/types": 3.378.0
+    "@aws-sdk/credential-provider-env": 3.398.0
+    "@aws-sdk/credential-provider-process": 3.405.0
+    "@aws-sdk/credential-provider-sso": 3.405.0
+    "@aws-sdk/credential-provider-web-identity": 3.398.0
+    "@aws-sdk/types": 3.398.0
     "@smithy/credential-provider-imds": ^2.0.0
     "@smithy/property-provider": ^2.0.0
-    "@smithy/shared-ini-file-loader": ^2.0.0
-    "@smithy/types": ^2.0.2
+    "@smithy/shared-ini-file-loader": ^2.0.6
+    "@smithy/types": ^2.2.2
     tslib: ^2.5.0
-  checksum: c52c431f03864d46d23e3515516c62a91af175995fba9dadb7cff4e005d7d2ed19b9b5508859768ce4d98746da260709e7caf703c7211b1a21c62a6a1606ef5d
+  checksum: 49805d3600db76c42cbaac613bb2aa541bbef923d93d9cfbea746c566c6aead370251032a016f3b615402783a2f9328c3b766022e0b143c207dfd292460dfdab
   languageName: node
   linkType: hard
 
-"@aws-sdk/credential-provider-node@npm:3.382.0, @aws-sdk/credential-provider-node@npm:^3.350.0":
-  version: 3.382.0
-  resolution: "@aws-sdk/credential-provider-node@npm:3.382.0"
+"@aws-sdk/credential-provider-node@npm:3.405.0, @aws-sdk/credential-provider-node@npm:^3.350.0":
+  version: 3.405.0
+  resolution: "@aws-sdk/credential-provider-node@npm:3.405.0"
   dependencies:
-    "@aws-sdk/credential-provider-env": 3.378.0
-    "@aws-sdk/credential-provider-ini": 3.382.0
-    "@aws-sdk/credential-provider-process": 3.378.0
-    "@aws-sdk/credential-provider-sso": 3.382.0
-    "@aws-sdk/credential-provider-web-identity": 3.378.0
-    "@aws-sdk/types": 3.378.0
+    "@aws-sdk/credential-provider-env": 3.398.0
+    "@aws-sdk/credential-provider-ini": 3.405.0
+    "@aws-sdk/credential-provider-process": 3.405.0
+    "@aws-sdk/credential-provider-sso": 3.405.0
+    "@aws-sdk/credential-provider-web-identity": 3.398.0
+    "@aws-sdk/types": 3.398.0
     "@smithy/credential-provider-imds": ^2.0.0
     "@smithy/property-provider": ^2.0.0
-    "@smithy/shared-ini-file-loader": ^2.0.0
-    "@smithy/types": ^2.0.2
+    "@smithy/shared-ini-file-loader": ^2.0.6
+    "@smithy/types": ^2.2.2
     tslib: ^2.5.0
-  checksum: 895405b84fc938b0c3e34f73c63b5426761de3bc2dcfa06e1a06f55ae0f8135d81530c0340c0b1b33b4bcb479f5048a9ec0390288503a261c692a0df2a0b933d
+  checksum: 3333ea579cc32cf4ad41d9de5e35ead4a4166fb3fc56766c3c342c39c2c51e6d292d04769a38725b742a89c9cb48cbcca150fce27d2606a305e25666c5ac4af5
   languageName: node
   linkType: hard
 
-"@aws-sdk/credential-provider-process@npm:3.378.0":
-  version: 3.378.0
-  resolution: "@aws-sdk/credential-provider-process@npm:3.378.0"
+"@aws-sdk/credential-provider-process@npm:3.405.0":
+  version: 3.405.0
+  resolution: "@aws-sdk/credential-provider-process@npm:3.405.0"
   dependencies:
-    "@aws-sdk/types": 3.378.0
+    "@aws-sdk/types": 3.398.0
     "@smithy/property-provider": ^2.0.0
-    "@smithy/shared-ini-file-loader": ^2.0.0
-    "@smithy/types": ^2.0.2
+    "@smithy/shared-ini-file-loader": ^2.0.6
+    "@smithy/types": ^2.2.2
     tslib: ^2.5.0
-  checksum: 6b8343fb9266ef490bf8e654f0d0b53585498ecf755e0e5cbee9bc93426927703637d02740050c491738a83c097a4d848244f3a66a633fd526d9339d846bdbdd
+  checksum: 54a790ececbb84c7eb37c8933158355d2fcf7a0ef8f73bdbaaa665178725532eafe2b775e7f4e17c75c7fe4bddcef92fa596880905553c0caaeb91a845995c6e
   languageName: node
   linkType: hard
 
-"@aws-sdk/credential-provider-sso@npm:3.382.0":
-  version: 3.382.0
-  resolution: "@aws-sdk/credential-provider-sso@npm:3.382.0"
+"@aws-sdk/credential-provider-sso@npm:3.405.0":
+  version: 3.405.0
+  resolution: "@aws-sdk/credential-provider-sso@npm:3.405.0"
   dependencies:
-    "@aws-sdk/client-sso": 3.382.0
-    "@aws-sdk/token-providers": 3.382.0
-    "@aws-sdk/types": 3.378.0
+    "@aws-sdk/client-sso": 3.405.0
+    "@aws-sdk/token-providers": 3.405.0
+    "@aws-sdk/types": 3.398.0
     "@smithy/property-provider": ^2.0.0
-    "@smithy/shared-ini-file-loader": ^2.0.0
-    "@smithy/types": ^2.0.2
+    "@smithy/shared-ini-file-loader": ^2.0.6
+    "@smithy/types": ^2.2.2
     tslib: ^2.5.0
-  checksum: ec0d216077a0dd5724fed30cdbc4a235b998c5b5821ba250be749e0e4c0410ce1e06c1a2531281570798b77fbe7a9ff36a0d9960853d8f6b2d98247702649d68
+  checksum: 3475919da43fbaf095034db07eb116ed9cc8ffe0e27df8ab09d2cce31e32c270444ef633a84179950f278bd5e3dd081635d520b66537baded8597f3382e4370d
   languageName: node
   linkType: hard
 
-"@aws-sdk/credential-provider-web-identity@npm:3.378.0":
-  version: 3.378.0
-  resolution: "@aws-sdk/credential-provider-web-identity@npm:3.378.0"
+"@aws-sdk/credential-provider-web-identity@npm:3.398.0":
+  version: 3.398.0
+  resolution: "@aws-sdk/credential-provider-web-identity@npm:3.398.0"
   dependencies:
-    "@aws-sdk/types": 3.378.0
+    "@aws-sdk/types": 3.398.0
     "@smithy/property-provider": ^2.0.0
-    "@smithy/types": ^2.0.2
+    "@smithy/types": ^2.2.2
     tslib: ^2.5.0
-  checksum: 22cf227f609ea654749517e25c88e9c5e7b9dd97cc781d168b1f7cedf26a692a0d1643c3933a1975a95414c0d6a7dbcef6255ca4f13a788e101f95372e17a3af
+  checksum: 85245e5818e418d555575b49bae464b088fba51a1011c66c5c3f15fcf43075ce66e60e0f45acfe0446a7e402578aa741a125ec5a396a42be2a841d9472a6dd24
   languageName: node
   linkType: hard
 
 "@aws-sdk/credential-providers@npm:^3.350.0":
-  version: 3.382.0
-  resolution: "@aws-sdk/credential-providers@npm:3.382.0"
+  version: 3.405.0
+  resolution: "@aws-sdk/credential-providers@npm:3.405.0"
   dependencies:
-    "@aws-sdk/client-cognito-identity": 3.382.0
-    "@aws-sdk/client-sso": 3.382.0
-    "@aws-sdk/client-sts": 3.382.0
-    "@aws-sdk/credential-provider-cognito-identity": 3.382.0
-    "@aws-sdk/credential-provider-env": 3.378.0
-    "@aws-sdk/credential-provider-ini": 3.382.0
-    "@aws-sdk/credential-provider-node": 3.382.0
-    "@aws-sdk/credential-provider-process": 3.378.0
-    "@aws-sdk/credential-provider-sso": 3.382.0
-    "@aws-sdk/credential-provider-web-identity": 3.378.0
-    "@aws-sdk/types": 3.378.0
+    "@aws-sdk/client-cognito-identity": 3.405.0
+    "@aws-sdk/client-sso": 3.405.0
+    "@aws-sdk/client-sts": 3.405.0
+    "@aws-sdk/credential-provider-cognito-identity": 3.405.0
+    "@aws-sdk/credential-provider-env": 3.398.0
+    "@aws-sdk/credential-provider-ini": 3.405.0
+    "@aws-sdk/credential-provider-node": 3.405.0
+    "@aws-sdk/credential-provider-process": 3.405.0
+    "@aws-sdk/credential-provider-sso": 3.405.0
+    "@aws-sdk/credential-provider-web-identity": 3.398.0
+    "@aws-sdk/types": 3.398.0
     "@smithy/credential-provider-imds": ^2.0.0
     "@smithy/property-provider": ^2.0.0
-    "@smithy/types": ^2.0.2
+    "@smithy/types": ^2.2.2
     tslib: ^2.5.0
-  checksum: 0518892179add223708eef3e3c3420a25d2ec353bee6361f4f88290dca11d1ec04737b2f67d2f6db6e194c74ae51121223997b5d5da4324b3ef346685a9dae37
+  checksum: d43e453abf49322933836ccd3d6ac68c87066ba672da543c80f2a751240b67fc679a5b5fd5554caeae2182df2cb1eb604c4cc407fbff200bf7d61631c5539135
   languageName: node
   linkType: hard
 
@@ -1086,33 +1046,33 @@ __metadata:
   linkType: hard
 
 "@aws-sdk/lib-storage@npm:^3.350.0":
-  version: 3.383.0
-  resolution: "@aws-sdk/lib-storage@npm:3.383.0"
+  version: 3.405.0
+  resolution: "@aws-sdk/lib-storage@npm:3.405.0"
   dependencies:
     "@smithy/abort-controller": ^2.0.1
-    "@smithy/middleware-endpoint": ^2.0.1
-    "@smithy/smithy-client": ^2.0.1
+    "@smithy/middleware-endpoint": ^2.0.5
+    "@smithy/smithy-client": ^2.0.5
     buffer: 5.6.0
     events: 3.3.0
     stream-browserify: 3.0.0
     tslib: ^2.5.0
   peerDependencies:
     "@aws-sdk/client-s3": ^3.0.0
-  checksum: fca3fe53d4631449e3a929151a4e1aed4b70a2b4442f9360ec1edea5db7a83c82abbe1a1eefee51b647290b903eae7341798f7f3418b15fce21e1b3243af3976
+  checksum: 817f54b492a0d4dde6417541579d6c75691d6637de372ab8167305e3a41604e3c9c39266256346d4ab10f180be0dbb6ded698dc4b8ed351e2a30134d02a6e69d
   languageName: node
   linkType: hard
 
-"@aws-sdk/middleware-bucket-endpoint@npm:3.378.0":
-  version: 3.378.0
-  resolution: "@aws-sdk/middleware-bucket-endpoint@npm:3.378.0"
+"@aws-sdk/middleware-bucket-endpoint@npm:3.405.0":
+  version: 3.405.0
+  resolution: "@aws-sdk/middleware-bucket-endpoint@npm:3.405.0"
   dependencies:
-    "@aws-sdk/types": 3.378.0
+    "@aws-sdk/types": 3.398.0
     "@aws-sdk/util-arn-parser": 3.310.0
-    "@smithy/protocol-http": ^2.0.1
-    "@smithy/types": ^2.0.2
+    "@smithy/protocol-http": ^2.0.5
+    "@smithy/types": ^2.2.2
     "@smithy/util-config-provider": ^2.0.0
     tslib: ^2.5.0
-  checksum: 7aa034b5e4abbf8a52a6dea7de61a43c744bda65f0f5d5db8967dd804206264878c321191aa9c6ce6e304e7981e711e47603e0aa0d06b9bde4991ffd1f7accba
+  checksum: 3e45507ca7d6887e289401171ba26e18a41aa2c165266ae7b9156b27930e839fab48f7cd0a26b68109f7409c768c8ff9719da0dff044a23b0d7110964d407b61
   languageName: node
   linkType: hard
 
@@ -1129,115 +1089,115 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@aws-sdk/middleware-expect-continue@npm:3.378.0":
-  version: 3.378.0
-  resolution: "@aws-sdk/middleware-expect-continue@npm:3.378.0"
+"@aws-sdk/middleware-expect-continue@npm:3.398.0":
+  version: 3.398.0
+  resolution: "@aws-sdk/middleware-expect-continue@npm:3.398.0"
   dependencies:
-    "@aws-sdk/types": 3.378.0
-    "@smithy/protocol-http": ^2.0.1
-    "@smithy/types": ^2.0.2
+    "@aws-sdk/types": 3.398.0
+    "@smithy/protocol-http": ^2.0.5
+    "@smithy/types": ^2.2.2
     tslib: ^2.5.0
-  checksum: 0935bd4cbb3ae84f2a84ed1b3526d798b69f2c81a2b94bbb6b04525b907f64891cde4518edaeb7d561bcc37bfeda44fb589c56e5a30de49c4c23a61bc801bcf0
+  checksum: 5eaa935f4478b434e4f80dc5c12822e7c6b6de96dd3fb5031e05d6736cd06ad092126b1f9ca2d413f97db33a690232ac5c2ed67d13bae1cb6f3ab1d69b8b235b
   languageName: node
   linkType: hard
 
-"@aws-sdk/middleware-flexible-checksums@npm:3.383.0":
-  version: 3.383.0
-  resolution: "@aws-sdk/middleware-flexible-checksums@npm:3.383.0"
+"@aws-sdk/middleware-flexible-checksums@npm:3.400.0":
+  version: 3.400.0
+  resolution: "@aws-sdk/middleware-flexible-checksums@npm:3.400.0"
   dependencies:
     "@aws-crypto/crc32": 3.0.0
     "@aws-crypto/crc32c": 3.0.0
-    "@aws-sdk/types": 3.378.0
+    "@aws-sdk/types": 3.398.0
     "@smithy/is-array-buffer": ^2.0.0
-    "@smithy/protocol-http": ^2.0.1
-    "@smithy/types": ^2.0.2
+    "@smithy/protocol-http": ^2.0.5
+    "@smithy/types": ^2.2.2
     "@smithy/util-utf8": ^2.0.0
     tslib: ^2.5.0
-  checksum: fc08432955bf24f4494eaebf350b3d18f0bce0fe97b5a7f0b022a21a15048094fdb9104bf7b8e45aa9c885ed18a93ab29066c6667a2f5009d02688ab14bf49cc
+  checksum: d2fab21ebf98b3a072fd1062c7ddff1b93db31d2356813b670f70690093f05518612009dde217e21493630aa0e6b8cb62a5c9fe29c81d84a66dab7ebbde6179a
   languageName: node
   linkType: hard
 
-"@aws-sdk/middleware-host-header@npm:3.379.1":
-  version: 3.379.1
-  resolution: "@aws-sdk/middleware-host-header@npm:3.379.1"
+"@aws-sdk/middleware-host-header@npm:3.398.0":
+  version: 3.398.0
+  resolution: "@aws-sdk/middleware-host-header@npm:3.398.0"
   dependencies:
-    "@aws-sdk/types": 3.378.0
-    "@smithy/protocol-http": ^2.0.1
-    "@smithy/types": ^2.0.2
+    "@aws-sdk/types": 3.398.0
+    "@smithy/protocol-http": ^2.0.5
+    "@smithy/types": ^2.2.2
     tslib: ^2.5.0
-  checksum: 32651531108e43edf745721828feab703ab7f39837da8214bb37593200daab71042336a25b58bd9b3e9b78ac647a828674a48ebbc1f5946a533f8642fb16b92d
+  checksum: 58a69bca4fa5917cfec27dfe4111fda5c4b3e1c254d8048087898081774e2a2fc695f43031134a9d6ee89f725b32284238a6e3219b3d11f2908409f020c0d717
   languageName: node
   linkType: hard
 
-"@aws-sdk/middleware-location-constraint@npm:3.379.1":
-  version: 3.379.1
-  resolution: "@aws-sdk/middleware-location-constraint@npm:3.379.1"
+"@aws-sdk/middleware-location-constraint@npm:3.398.0":
+  version: 3.398.0
+  resolution: "@aws-sdk/middleware-location-constraint@npm:3.398.0"
   dependencies:
-    "@aws-sdk/types": 3.378.0
-    "@smithy/types": ^2.0.2
+    "@aws-sdk/types": 3.398.0
+    "@smithy/types": ^2.2.2
     tslib: ^2.5.0
-  checksum: 6cc91e29e89bb8036bcf53933ac70ec0b90ef899105c10fab8293721424b4a3f4cb86996cec4073c4d7988b9a2810c5bcaab55c18e8be2a5b20646e83306f23a
+  checksum: 57c562dd12fae1a6cf2263b78981b24429a2d562d66ab6b90ec34892004c8140282357e38b993cda6779bbcf0c2c367e05ff6fb53c4cdc6c505c225bbdd58371
   languageName: node
   linkType: hard
 
-"@aws-sdk/middleware-logger@npm:3.378.0":
-  version: 3.378.0
-  resolution: "@aws-sdk/middleware-logger@npm:3.378.0"
+"@aws-sdk/middleware-logger@npm:3.398.0":
+  version: 3.398.0
+  resolution: "@aws-sdk/middleware-logger@npm:3.398.0"
   dependencies:
-    "@aws-sdk/types": 3.378.0
-    "@smithy/types": ^2.0.2
+    "@aws-sdk/types": 3.398.0
+    "@smithy/types": ^2.2.2
     tslib: ^2.5.0
-  checksum: c1c32a5ba4ae92cf988d2c0fed3a15975e1b4612cb546133ac74eb91276fc0714278e3aa30e88d0fae00596208baed76b58e97d952daafd63777b79f185a6c3f
+  checksum: 7da95e1b3550fb1523232fab758b1976cabca29450fbfe24846cea4e42a28d241665e73c567d311104a114cfa37092b8c01eac0a8dc55ddc9723b79ac9747555
   languageName: node
   linkType: hard
 
-"@aws-sdk/middleware-recursion-detection@npm:3.378.0":
-  version: 3.378.0
-  resolution: "@aws-sdk/middleware-recursion-detection@npm:3.378.0"
+"@aws-sdk/middleware-recursion-detection@npm:3.398.0":
+  version: 3.398.0
+  resolution: "@aws-sdk/middleware-recursion-detection@npm:3.398.0"
   dependencies:
-    "@aws-sdk/types": 3.378.0
-    "@smithy/protocol-http": ^2.0.1
-    "@smithy/types": ^2.0.2
+    "@aws-sdk/types": 3.398.0
+    "@smithy/protocol-http": ^2.0.5
+    "@smithy/types": ^2.2.2
     tslib: ^2.5.0
-  checksum: 2104b3834ac6674afac7a50eb4430277ef789f3fbf439d2adab9d43b6dca5dad7518f2a8cb578d3f2ff2c9883ee4e756c7fa10166c0e49f8ea307555f69b06f0
+  checksum: ada30093a7e8b529830c7f7f2880ee28a4010d216dd9ca6d7b2e8bd2beca1a9c3d875a21feb12af4eebaec0ce0bad26f03aecca00ff363f844543f586c6ea74c
   languageName: node
   linkType: hard
 
-"@aws-sdk/middleware-sdk-s3@npm:3.379.1":
-  version: 3.379.1
-  resolution: "@aws-sdk/middleware-sdk-s3@npm:3.379.1"
+"@aws-sdk/middleware-sdk-s3@npm:3.398.0":
+  version: 3.398.0
+  resolution: "@aws-sdk/middleware-sdk-s3@npm:3.398.0"
   dependencies:
-    "@aws-sdk/types": 3.378.0
+    "@aws-sdk/types": 3.398.0
     "@aws-sdk/util-arn-parser": 3.310.0
-    "@smithy/protocol-http": ^2.0.1
-    "@smithy/types": ^2.0.2
+    "@smithy/protocol-http": ^2.0.5
+    "@smithy/types": ^2.2.2
     tslib: ^2.5.0
-  checksum: 0e1ff73d9354817439434627c1fbe30ef958f7bcfafecc83cf541e6ef7c8ef623d46db6aa97b0fac2c9ff833e2a9cd55b6de001baba1edf22d2199ebc3bc1bd3
+  checksum: eeb8a210124ed6b8cb3506766a8210247ed5c5d28fa66d97f77aa4d9f6be17ca91e00d448778c8e4d455598bc4a73b7ede0d79f0a7556be57aba60cb05bb3424
   languageName: node
   linkType: hard
 
-"@aws-sdk/middleware-sdk-sqs@npm:3.378.0":
-  version: 3.378.0
-  resolution: "@aws-sdk/middleware-sdk-sqs@npm:3.378.0"
+"@aws-sdk/middleware-sdk-sqs@npm:3.398.0":
+  version: 3.398.0
+  resolution: "@aws-sdk/middleware-sdk-sqs@npm:3.398.0"
   dependencies:
-    "@aws-sdk/types": 3.378.0
-    "@smithy/types": ^2.0.2
+    "@aws-sdk/types": 3.398.0
+    "@smithy/types": ^2.2.2
     "@smithy/util-hex-encoding": ^2.0.0
     "@smithy/util-utf8": ^2.0.0
     tslib: ^2.5.0
-  checksum: 83ff0b0c3a09543ac1b298556408ef7f602a83efd2837b31d4cb4a499223ff0b10f20a03e0c59fea5342a41bbd9b36b3188ea5a2d8e5f52aa0a33f43d09ca7a1
+  checksum: 00b66081fc4f8d632773c7348c83b125f1b8c4aacd658068d0df9f1f7ec32da8cfbed84a2e2abcc2c08141b844330253f200c60f9497d6724e5b4ca9aca89720
   languageName: node
   linkType: hard
 
-"@aws-sdk/middleware-sdk-sts@npm:3.379.1":
-  version: 3.379.1
-  resolution: "@aws-sdk/middleware-sdk-sts@npm:3.379.1"
+"@aws-sdk/middleware-sdk-sts@npm:3.398.0":
+  version: 3.398.0
+  resolution: "@aws-sdk/middleware-sdk-sts@npm:3.398.0"
   dependencies:
-    "@aws-sdk/middleware-signing": 3.379.1
-    "@aws-sdk/types": 3.378.0
-    "@smithy/types": ^2.0.2
+    "@aws-sdk/middleware-signing": 3.398.0
+    "@aws-sdk/types": 3.398.0
+    "@smithy/types": ^2.2.2
     tslib: ^2.5.0
-  checksum: 22fd2f565c5270ca0de75fbd7d751e15639a8d5fb75656bd8caf62091eda8e47ea208514964a1ae211db63b4d7e98d9a8a8f6e4067953e18a74c039e1a8b9084
+  checksum: 51b1c79c71e18d118e6e885e94185abefb91cace5597706a7e6fe9cac03b5be75c7219d9b2ee3182fddb9bd270aa842c51c3073700e71e1e51585e90d8b634dc
   languageName: node
   linkType: hard
 
@@ -1251,42 +1211,42 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@aws-sdk/middleware-signing@npm:3.379.1":
-  version: 3.379.1
-  resolution: "@aws-sdk/middleware-signing@npm:3.379.1"
+"@aws-sdk/middleware-signing@npm:3.398.0":
+  version: 3.398.0
+  resolution: "@aws-sdk/middleware-signing@npm:3.398.0"
   dependencies:
-    "@aws-sdk/types": 3.378.0
+    "@aws-sdk/types": 3.398.0
     "@smithy/property-provider": ^2.0.0
-    "@smithy/protocol-http": ^2.0.1
+    "@smithy/protocol-http": ^2.0.5
     "@smithy/signature-v4": ^2.0.0
-    "@smithy/types": ^2.0.2
+    "@smithy/types": ^2.2.2
     "@smithy/util-middleware": ^2.0.0
     tslib: ^2.5.0
-  checksum: f36f6de13624f504f14db8039e02a6473d366eb11c670f555613ddeb0feac523d08f7d66a985c2a7c1eee548c66f55ac4ed7c148e79efe3fa1f5ad165af627f4
+  checksum: cba44afa280ae515285ea8b7f6c032089865696a8416bd66b4e6114ac6303ed4c4a938687f6dee20a23c003339bce95110eb854da679b107486e63cc9ead3fe6
   languageName: node
   linkType: hard
 
-"@aws-sdk/middleware-ssec@npm:3.378.0":
-  version: 3.378.0
-  resolution: "@aws-sdk/middleware-ssec@npm:3.378.0"
+"@aws-sdk/middleware-ssec@npm:3.398.0":
+  version: 3.398.0
+  resolution: "@aws-sdk/middleware-ssec@npm:3.398.0"
   dependencies:
-    "@aws-sdk/types": 3.378.0
-    "@smithy/types": ^2.0.2
+    "@aws-sdk/types": 3.398.0
+    "@smithy/types": ^2.2.2
     tslib: ^2.5.0
-  checksum: 4250668f826a5ab855983a98adb08431cf35ad68785e89e1c029c74f994db9d283c8bdcdc1f9fc60a3691b479b78a1cf48898b105f32448d5f092a2a96841e6d
+  checksum: d00514654fcb19072c36cf4ab4239e4679b2ede322b41f5d979b6924d78b4ad40d5521b926fd422ed689a78af0e0acc7e7cb4bad1b3a5541d0e57118778712a0
   languageName: node
   linkType: hard
 
-"@aws-sdk/middleware-user-agent@npm:3.382.0":
-  version: 3.382.0
-  resolution: "@aws-sdk/middleware-user-agent@npm:3.382.0"
+"@aws-sdk/middleware-user-agent@npm:3.398.0":
+  version: 3.398.0
+  resolution: "@aws-sdk/middleware-user-agent@npm:3.398.0"
   dependencies:
-    "@aws-sdk/types": 3.378.0
-    "@aws-sdk/util-endpoints": 3.382.0
-    "@smithy/protocol-http": ^2.0.1
-    "@smithy/types": ^2.0.2
+    "@aws-sdk/types": 3.398.0
+    "@aws-sdk/util-endpoints": 3.398.0
+    "@smithy/protocol-http": ^2.0.5
+    "@smithy/types": ^2.2.2
     tslib: ^2.5.0
-  checksum: e53150ecc07f408caa6fa69e6e30ebf9aa000fb59737eeb350fdf4db4789e0d2163bf14f17f4ff4223174e932ce5b71bd9ec662efc61a78a963e12891ecfed6f
+  checksum: 3113e70a1c395b565a6811d6d486941a3f159ecb412a329edf85e652509fd679556136962a303086ad913b219a6531171d1e2d427c24427d9486e66afa485952
   languageName: node
   linkType: hard
 
@@ -1334,21 +1294,21 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@aws-sdk/signature-v4-multi-region@npm:3.378.0":
-  version: 3.378.0
-  resolution: "@aws-sdk/signature-v4-multi-region@npm:3.378.0"
+"@aws-sdk/signature-v4-multi-region@npm:3.398.0":
+  version: 3.398.0
+  resolution: "@aws-sdk/signature-v4-multi-region@npm:3.398.0"
   dependencies:
-    "@aws-sdk/types": 3.378.0
-    "@smithy/protocol-http": ^2.0.1
+    "@aws-sdk/types": 3.398.0
+    "@smithy/protocol-http": ^2.0.5
     "@smithy/signature-v4": ^2.0.0
-    "@smithy/types": ^2.0.2
+    "@smithy/types": ^2.2.2
     tslib: ^2.5.0
   peerDependencies:
     "@aws-sdk/signature-v4-crt": ^3.118.0
   peerDependenciesMeta:
     "@aws-sdk/signature-v4-crt":
       optional: true
-  checksum: 0bf5e16946f6c263e14a36702de7e2be8c070c47426dd5e226e00d0fcd48d407ae6f48127386cc7250ccbad8cb17a0336bfad958236ea11c3a94d3e148244d35
+  checksum: d6acc0fa94eef3f7d6191d210cf348ff50d6df1ac0b382df5cf4a1d19284e3e093f63352db53fa43077d5dc12f20c96e5fb5092322c17705960886477f9db2b2
   languageName: node
   linkType: hard
 
@@ -1368,17 +1328,46 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@aws-sdk/token-providers@npm:3.382.0":
-  version: 3.382.0
-  resolution: "@aws-sdk/token-providers@npm:3.382.0"
+"@aws-sdk/token-providers@npm:3.405.0":
+  version: 3.405.0
+  resolution: "@aws-sdk/token-providers@npm:3.405.0"
   dependencies:
-    "@aws-sdk/client-sso-oidc": 3.382.0
-    "@aws-sdk/types": 3.378.0
+    "@aws-crypto/sha256-browser": 3.0.0
+    "@aws-crypto/sha256-js": 3.0.0
+    "@aws-sdk/middleware-host-header": 3.398.0
+    "@aws-sdk/middleware-logger": 3.398.0
+    "@aws-sdk/middleware-recursion-detection": 3.398.0
+    "@aws-sdk/middleware-user-agent": 3.398.0
+    "@aws-sdk/types": 3.398.0
+    "@aws-sdk/util-endpoints": 3.398.0
+    "@aws-sdk/util-user-agent-browser": 3.398.0
+    "@aws-sdk/util-user-agent-node": 3.405.0
+    "@smithy/config-resolver": ^2.0.5
+    "@smithy/fetch-http-handler": ^2.0.5
+    "@smithy/hash-node": ^2.0.5
+    "@smithy/invalid-dependency": ^2.0.5
+    "@smithy/middleware-content-length": ^2.0.5
+    "@smithy/middleware-endpoint": ^2.0.5
+    "@smithy/middleware-retry": ^2.0.5
+    "@smithy/middleware-serde": ^2.0.5
+    "@smithy/middleware-stack": ^2.0.0
+    "@smithy/node-config-provider": ^2.0.6
+    "@smithy/node-http-handler": ^2.0.5
     "@smithy/property-provider": ^2.0.0
-    "@smithy/shared-ini-file-loader": ^2.0.0
-    "@smithy/types": ^2.0.2
+    "@smithy/protocol-http": ^2.0.5
+    "@smithy/shared-ini-file-loader": ^2.0.6
+    "@smithy/smithy-client": ^2.0.5
+    "@smithy/types": ^2.2.2
+    "@smithy/url-parser": ^2.0.5
+    "@smithy/util-base64": ^2.0.0
+    "@smithy/util-body-length-browser": ^2.0.0
+    "@smithy/util-body-length-node": ^2.1.0
+    "@smithy/util-defaults-mode-browser": ^2.0.6
+    "@smithy/util-defaults-mode-node": ^2.0.6
+    "@smithy/util-retry": ^2.0.0
+    "@smithy/util-utf8": ^2.0.0
     tslib: ^2.5.0
-  checksum: 813dc973f616c2d7ec6f71da14e92d7c4b84c28309ac4d8426fe88d0c6bbe70006f9df0a984985cfcf232976188afc3d17ac5168e832e717ae4db41a21c6d67d
+  checksum: e7a41844ade3f9b4c94451ac71eedaaa370f5c07e982f431f96b0609a1ade1a455a7a46e1e568ba481e3462e97de04d5adff34007c516737e56fcefe93b5bb3f
   languageName: node
   linkType: hard
 
@@ -1392,13 +1381,13 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@aws-sdk/types@npm:3.378.0, @aws-sdk/types@npm:^3.222.0, @aws-sdk/types@npm:^3.347.0":
-  version: 3.378.0
-  resolution: "@aws-sdk/types@npm:3.378.0"
+"@aws-sdk/types@npm:3.398.0, @aws-sdk/types@npm:^3.222.0, @aws-sdk/types@npm:^3.347.0":
+  version: 3.398.0
+  resolution: "@aws-sdk/types@npm:3.398.0"
   dependencies:
-    "@smithy/types": ^2.0.2
+    "@smithy/types": ^2.2.2
     tslib: ^2.5.0
-  checksum: c4c7ebb48a625cb990a1288466f2dd8f0d770078cc77b60d5ee4a803b473ff41df474271dff26d3dadad151d5a016b398167738dd4926266ff1cd04585d4d8e8
+  checksum: b0c3531336e3dc0a3e2524199026a2366a29a4eee07195bffd6a9d48c778924183ac9894029b1053d0f744121cec3b7d397828f2065acf37eea79d3106af1273
   languageName: node
   linkType: hard
 
@@ -1432,13 +1421,13 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@aws-sdk/util-endpoints@npm:3.382.0":
-  version: 3.382.0
-  resolution: "@aws-sdk/util-endpoints@npm:3.382.0"
+"@aws-sdk/util-endpoints@npm:3.398.0":
+  version: 3.398.0
+  resolution: "@aws-sdk/util-endpoints@npm:3.398.0"
   dependencies:
-    "@aws-sdk/types": 3.378.0
+    "@aws-sdk/types": 3.398.0
     tslib: ^2.5.0
-  checksum: 9573e0d30ef7aafb5f51a51d7cf0416b8fe21af6456bff2c1e660a615325012177b70bf78f6591dbb6d863f4e57ac6ac3279bfa3eca2d504a9121f82edf73118
+  checksum: af7df2c99f067641a369f54baf6def9c0dd4ea433f295d80afaebad9698a73ca7b969005c9a9b38a11611618f11b5ae968de7521ddfc35e5a3fa5f1e153687e7
   languageName: node
   linkType: hard
 
@@ -1490,32 +1479,32 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@aws-sdk/util-user-agent-browser@npm:3.378.0":
-  version: 3.378.0
-  resolution: "@aws-sdk/util-user-agent-browser@npm:3.378.0"
+"@aws-sdk/util-user-agent-browser@npm:3.398.0":
+  version: 3.398.0
+  resolution: "@aws-sdk/util-user-agent-browser@npm:3.398.0"
   dependencies:
-    "@aws-sdk/types": 3.378.0
-    "@smithy/types": ^2.0.2
+    "@aws-sdk/types": 3.398.0
+    "@smithy/types": ^2.2.2
     bowser: ^2.11.0
     tslib: ^2.5.0
-  checksum: 412ef9ffdcd3d32b9e9bb62dfa252871bc9fbee19814553aeff65bffb21de6ca236199b47eb646c4af8cb326aebab3d63ef4b303050e61fb08eed0d12bb73f8c
+  checksum: 838879f9741e9c43f34bc3e4c29c60a4f43029a06808e4a91a30f943c35636bba93caf74db38f25752c206d3d2157b3ba8ef3e053d9d015e76ec76d15cacc6a8
   languageName: node
   linkType: hard
 
-"@aws-sdk/util-user-agent-node@npm:3.378.0":
-  version: 3.378.0
-  resolution: "@aws-sdk/util-user-agent-node@npm:3.378.0"
+"@aws-sdk/util-user-agent-node@npm:3.405.0":
+  version: 3.405.0
+  resolution: "@aws-sdk/util-user-agent-node@npm:3.405.0"
   dependencies:
-    "@aws-sdk/types": 3.378.0
-    "@smithy/node-config-provider": ^2.0.1
-    "@smithy/types": ^2.0.2
+    "@aws-sdk/types": 3.398.0
+    "@smithy/node-config-provider": ^2.0.6
+    "@smithy/types": ^2.2.2
     tslib: ^2.5.0
   peerDependencies:
     aws-crt: ">=1.0.0"
   peerDependenciesMeta:
     aws-crt:
       optional: true
-  checksum: b37271d56a8d91072b7af5d71351e388a822b389167638d779ce0b099a1024b412fd3b50a6b6334687a3ae0bebec89479e48a9dceed2262f8801e76e3b5f89ad
+  checksum: e4a0fc8d5fc98b4d7fa31b786541c0e04f8977c2e6236bf0581e23bcb91592598281d196f38cab857e33cc8852f37fb17ddad1d39b751c4a0551a7735a3811c9
   languageName: node
   linkType: hard
 
@@ -1583,13 +1572,14 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@azure/core-auth@npm:^1.1.4, @azure/core-auth@npm:^1.3.0, @azure/core-auth@npm:^1.4.0":
-  version: 1.4.0
-  resolution: "@azure/core-auth@npm:1.4.0"
+"@azure/core-auth@npm:^1.1.4, @azure/core-auth@npm:^1.3.0, @azure/core-auth@npm:^1.4.0, @azure/core-auth@npm:^1.5.0":
+  version: 1.5.0
+  resolution: "@azure/core-auth@npm:1.5.0"
   dependencies:
     "@azure/abort-controller": ^1.0.0
+    "@azure/core-util": ^1.1.0
     tslib: ^2.2.0
-  checksum: 1c76c296fe911ad39fc780b033c25a92c41c5a15f011b816d42c13584f627a4dd153dfb4334900ec93eb5b006e14bdda37e8412a7697c5a9636a0abaccffad39
+  checksum: 11c5ba072902693435dc2930e2fdfe2ff34836f4c2d6c87c6ac0566d48dc49157ebf49f4478cd3784dc0c4d57b502d3a12d74ea29f416725204a6e1aa937ef78
   languageName: node
   linkType: hard
 
@@ -1609,8 +1599,8 @@ __metadata:
   linkType: hard
 
 "@azure/core-http@npm:^3.0.0":
-  version: 3.0.0
-  resolution: "@azure/core-http@npm:3.0.0"
+  version: 3.0.2
+  resolution: "@azure/core-http@npm:3.0.2"
   dependencies:
     "@azure/abort-controller": ^1.0.0
     "@azure/core-auth": ^1.3.0
@@ -1625,8 +1615,8 @@ __metadata:
     tslib: ^2.2.0
     tunnel: ^0.0.6
     uuid: ^8.3.0
-    xml2js: ^0.4.19
-  checksum: 9b6885a60a8fdac924cc9544e09d66757ff4ed51ed20ce3c279321e684e21c295c091ad9d45477e02baae5255e3a92c5fbb2ac46687d261d66488c294b32846f
+    xml2js: ^0.5.0
+  checksum: 01b5a75e09533476dbb69c672dcd00d48298cf81db5015cd261c510c5be377176db8e3dc4809e6952459bfbe214f52f8a1ed84a116ac31b8a7388b2025098f66
   languageName: node
   linkType: hard
 
@@ -1688,22 +1678,22 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@azure/core-util@npm:^1.0.0, @azure/core-util@npm:^1.1.1":
-  version: 1.2.0
-  resolution: "@azure/core-util@npm:1.2.0"
+"@azure/core-util@npm:^1.0.0, @azure/core-util@npm:^1.1.0, @azure/core-util@npm:^1.1.1":
+  version: 1.4.0
+  resolution: "@azure/core-util@npm:1.4.0"
   dependencies:
     "@azure/abort-controller": ^1.0.0
     tslib: ^2.2.0
-  checksum: 58c7e3c9e9fda27242c1ab1dbfcf11eab52cc3e6459a2509fa5572a3faebf3f24c6bf9d92883cd80974119fc1e2c16c7bd2c71f20cfbe670405515c73fdb4093
+  checksum: a6f66d8b162a10c5a012f039cff1d786055e06e20aced07ad2574e5caa1956a3d88c7a2815b0a6f82e3514eb936374db075f91236b3435cea2b4c9cf5ccec7ed
   languageName: node
   linkType: hard
 
 "@azure/identity@npm:^3.2.1":
-  version: 3.2.3
-  resolution: "@azure/identity@npm:3.2.3"
+  version: 3.3.0
+  resolution: "@azure/identity@npm:3.3.0"
   dependencies:
     "@azure/abort-controller": ^1.0.0
-    "@azure/core-auth": ^1.3.0
+    "@azure/core-auth": ^1.5.0
     "@azure/core-client": ^1.4.0
     "@azure/core-rest-pipeline": ^1.1.0
     "@azure/core-tracing": ^1.0.0
@@ -1718,7 +1708,7 @@ __metadata:
     stoppable: ^1.1.0
     tslib: ^2.2.0
     uuid: ^8.3.0
-  checksum: 8f74831a358f41490056fb1978d9214542f5e7a788cc607ded3c475e1e61784da2cb6409434cb736c66291c24b755dbab42ec7b93b218ca535dce3363183c64b
+  checksum: 95c6f8761ad6bbfd3fbf8a88d1a4af17199fb6b61134a761d51a2df096cb175a5841f02ca5ae3285378c64676e72ce6cddc58143306eef5086a63459c2cef914
   languageName: node
   linkType: hard
 
@@ -1743,19 +1733,18 @@ __metadata:
   linkType: hard
 
 "@azure/ms-rest-js@npm:^2.2.0":
-  version: 2.6.2
-  resolution: "@azure/ms-rest-js@npm:2.6.2"
+  version: 2.7.0
+  resolution: "@azure/ms-rest-js@npm:2.7.0"
   dependencies:
     "@azure/core-auth": ^1.1.4
     abort-controller: ^3.0.0
     form-data: ^2.5.0
     node-fetch: ^2.6.7
-    tough-cookie: ^3.0.1
     tslib: ^1.10.0
     tunnel: 0.0.6
     uuid: ^8.3.2
-    xml2js: ^0.4.19
-  checksum: de650dfc3928a2036923fb3bf50e0324f9f36f5d320ca6d128005b1345ad80b39ab3410073ac35fb137dec4c7d799c602b1cafdf9573b3432b6b8eee8a1e39f8
+    xml2js: ^0.5.0
+  checksum: 38434010f3fc54a625f637a7758358d7ce0ad3e55ce9a6c7490bf05bbec8ea75ae95fe80041d2376beb3ef78ee6e55858bd0541477d7a88703246e368cfd59c1
   languageName: node
   linkType: hard
 
@@ -1811,378 +1800,352 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/code-frame@npm:^7.0.0, @babel/code-frame@npm:^7.10.4, @babel/code-frame@npm:^7.12.13, @babel/code-frame@npm:^7.16.0, @babel/code-frame@npm:^7.16.7, @babel/code-frame@npm:^7.18.6, @babel/code-frame@npm:^7.8.3":
-  version: 7.18.6
-  resolution: "@babel/code-frame@npm:7.18.6"
+"@babel/code-frame@npm:^7.0.0, @babel/code-frame@npm:^7.10.4, @babel/code-frame@npm:^7.12.13, @babel/code-frame@npm:^7.16.0, @babel/code-frame@npm:^7.16.7, @babel/code-frame@npm:^7.18.6, @babel/code-frame@npm:^7.22.10, @babel/code-frame@npm:^7.22.5, @babel/code-frame@npm:^7.8.3":
+  version: 7.22.10
+  resolution: "@babel/code-frame@npm:7.22.10"
   dependencies:
-    "@babel/highlight": ^7.18.6
-  checksum: 195e2be3172d7684bf95cff69ae3b7a15a9841ea9d27d3c843662d50cdd7d6470fd9c8e64be84d031117e4a4083486effba39f9aef6bbb2c89f7f21bcfba33ba
+    "@babel/highlight": ^7.22.10
+    chalk: ^2.4.2
+  checksum: 89a06534ad19759da6203a71bad120b1d7b2ddc016c8e07d4c56b35dea25e7396c6da60a754e8532a86733092b131ae7f661dbe6ba5d165ea777555daa2ed3c9
   languageName: node
   linkType: hard
 
-"@babel/compat-data@npm:^7.13.11, @babel/compat-data@npm:^7.18.8, @babel/compat-data@npm:^7.19.1":
-  version: 7.19.1
-  resolution: "@babel/compat-data@npm:7.19.1"
-  checksum: f985887ea08a140e4af87a94d3fb17af0345491eb97f5a85b1840255c2e2a97429f32a8fd12a7aae9218af5f1024f1eb12a5cd280d2d69b2337583c17ea506ba
+"@babel/compat-data@npm:^7.18.8, @babel/compat-data@npm:^7.22.6, @babel/compat-data@npm:^7.22.9":
+  version: 7.22.9
+  resolution: "@babel/compat-data@npm:7.22.9"
+  checksum: bed77d9044ce948b4327b30dd0de0779fa9f3a7ed1f2d31638714ed00229fa71fc4d1617ae0eb1fad419338d3658d0e9a5a083297451e09e73e078d0347ff808
   languageName: node
   linkType: hard
 
-"@babel/core@npm:^7.11.6, @babel/core@npm:^7.12.3, @babel/core@npm:^7.13.16, @babel/core@npm:^7.14.0, @babel/core@npm:^7.18.5":
-  version: 7.19.1
-  resolution: "@babel/core@npm:7.19.1"
+"@babel/core@npm:^7.11.6, @babel/core@npm:^7.12.3, @babel/core@npm:^7.13.16, @babel/core@npm:^7.14.0, @babel/core@npm:^7.19.6":
+  version: 7.22.11
+  resolution: "@babel/core@npm:7.22.11"
   dependencies:
-    "@ampproject/remapping": ^2.1.0
-    "@babel/code-frame": ^7.18.6
-    "@babel/generator": ^7.19.0
-    "@babel/helper-compilation-targets": ^7.19.1
-    "@babel/helper-module-transforms": ^7.19.0
-    "@babel/helpers": ^7.19.0
-    "@babel/parser": ^7.19.1
-    "@babel/template": ^7.18.10
-    "@babel/traverse": ^7.19.1
-    "@babel/types": ^7.19.0
+    "@ampproject/remapping": ^2.2.0
+    "@babel/code-frame": ^7.22.10
+    "@babel/generator": ^7.22.10
+    "@babel/helper-compilation-targets": ^7.22.10
+    "@babel/helper-module-transforms": ^7.22.9
+    "@babel/helpers": ^7.22.11
+    "@babel/parser": ^7.22.11
+    "@babel/template": ^7.22.5
+    "@babel/traverse": ^7.22.11
+    "@babel/types": ^7.22.11
     convert-source-map: ^1.7.0
     debug: ^4.1.0
     gensync: ^1.0.0-beta.2
-    json5: ^2.2.1
-    semver: ^6.3.0
-  checksum: 941c8c119b80bdba5fafc80bbaa424d51146b6d3c30b8fae35879358dd37c11d3d0926bc7e970a0861229656eedaa8c884d4a3a25cc904086eb73b827a2f1168
+    json5: ^2.2.3
+    semver: ^6.3.1
+  checksum: f258b2539ea2e5bfe55a708c2f3e1093a1b4744f12becc35abeb896037b66210de9a8ad6296a706046d5dc3a24e564362b73a9b814e5bfe500c8baab60c22d2e
   languageName: node
   linkType: hard
 
-"@babel/generator@npm:^7.14.0, @babel/generator@npm:^7.18.13, @babel/generator@npm:^7.19.0, @babel/generator@npm:^7.7.2":
-  version: 7.19.3
-  resolution: "@babel/generator@npm:7.19.3"
+"@babel/generator@npm:^7.14.0, @babel/generator@npm:^7.18.13, @babel/generator@npm:^7.22.10, @babel/generator@npm:^7.7.2":
+  version: 7.22.10
+  resolution: "@babel/generator@npm:7.22.10"
   dependencies:
-    "@babel/types": ^7.19.3
+    "@babel/types": ^7.22.10
     "@jridgewell/gen-mapping": ^0.3.2
+    "@jridgewell/trace-mapping": ^0.3.17
     jsesc: ^2.5.1
-  checksum: b1585e398f6c37f442a2fdac964a326b348fbc8fb99a6aaf4f72bbe993adb0ca792bc0a9c65e59930b2a2e55eb5aa3aab360ceb678d3d40692eb0cda2b7b6aa6
+  checksum: 59a79730abdff9070692834bd3af179e7a9413fa2ff7f83dff3eb888765aeaeb2bfc7b0238a49613ed56e1af05956eff303cc139f2407eda8df974813e486074
   languageName: node
   linkType: hard
 
-"@babel/helper-annotate-as-pure@npm:^7.16.0, @babel/helper-annotate-as-pure@npm:^7.18.6":
-  version: 7.18.6
-  resolution: "@babel/helper-annotate-as-pure@npm:7.18.6"
+"@babel/helper-annotate-as-pure@npm:^7.16.0, @babel/helper-annotate-as-pure@npm:^7.22.5":
+  version: 7.22.5
+  resolution: "@babel/helper-annotate-as-pure@npm:7.22.5"
   dependencies:
-    "@babel/types": ^7.18.6
-  checksum: 88ccd15ced475ef2243fdd3b2916a29ea54c5db3cd0cfabf9d1d29ff6e63b7f7cd1c27264137d7a40ac2e978b9b9a542c332e78f40eb72abe737a7400788fc1b
+    "@babel/types": ^7.22.5
+  checksum: 53da330f1835c46f26b7bf4da31f7a496dee9fd8696cca12366b94ba19d97421ce519a74a837f687749318f94d1a37f8d1abcbf35e8ed22c32d16373b2f6198d
   languageName: node
   linkType: hard
 
-"@babel/helper-builder-binary-assignment-operator-visitor@npm:^7.18.6":
-  version: 7.18.9
-  resolution: "@babel/helper-builder-binary-assignment-operator-visitor@npm:7.18.9"
+"@babel/helper-builder-binary-assignment-operator-visitor@npm:^7.22.5":
+  version: 7.22.10
+  resolution: "@babel/helper-builder-binary-assignment-operator-visitor@npm:7.22.10"
   dependencies:
-    "@babel/helper-explode-assignable-expression": ^7.18.6
-    "@babel/types": ^7.18.9
-  checksum: b4bc214cb56329daff6cc18a7f7a26aeafb55a1242e5362f3d47fe3808421f8c7cd91fff95d6b9b7ccb67e14e5a67d944e49dbe026942bfcbfda19b1c72a8e72
+    "@babel/types": ^7.22.10
+  checksum: 6de4a1f30e6244f9a1efdfcbe89df39923df3d165be606da5ad11319f8a11c12c72c60d9dc5fb696363281e2d6f741444c1af51f525fc7cf1d2a90fe23370bd9
   languageName: node
   linkType: hard
 
-"@babel/helper-compilation-targets@npm:^7.13.0, @babel/helper-compilation-targets@npm:^7.18.9, @babel/helper-compilation-targets@npm:^7.19.1":
-  version: 7.19.1
-  resolution: "@babel/helper-compilation-targets@npm:7.19.1"
+"@babel/helper-compilation-targets@npm:^7.18.9, @babel/helper-compilation-targets@npm:^7.22.10, @babel/helper-compilation-targets@npm:^7.22.5, @babel/helper-compilation-targets@npm:^7.22.6":
+  version: 7.22.10
+  resolution: "@babel/helper-compilation-targets@npm:7.22.10"
   dependencies:
-    "@babel/compat-data": ^7.19.1
-    "@babel/helper-validator-option": ^7.18.6
-    browserslist: ^4.21.3
-    semver: ^6.3.0
+    "@babel/compat-data": ^7.22.9
+    "@babel/helper-validator-option": ^7.22.5
+    browserslist: ^4.21.9
+    lru-cache: ^5.1.1
+    semver: ^6.3.1
+  checksum: f6f1896816392bcff671bbe6e277307729aee53befb4a66ea126e2a91eda78d819a70d06fa384c74ef46c1595544b94dca50bef6c78438d9ffd31776dafbd435
+  languageName: node
+  linkType: hard
+
+"@babel/helper-create-class-features-plugin@npm:^7.18.6, @babel/helper-create-class-features-plugin@npm:^7.22.11, @babel/helper-create-class-features-plugin@npm:^7.22.5":
+  version: 7.22.11
+  resolution: "@babel/helper-create-class-features-plugin@npm:7.22.11"
+  dependencies:
+    "@babel/helper-annotate-as-pure": ^7.22.5
+    "@babel/helper-environment-visitor": ^7.22.5
+    "@babel/helper-function-name": ^7.22.5
+    "@babel/helper-member-expression-to-functions": ^7.22.5
+    "@babel/helper-optimise-call-expression": ^7.22.5
+    "@babel/helper-replace-supers": ^7.22.9
+    "@babel/helper-skip-transparent-expression-wrappers": ^7.22.5
+    "@babel/helper-split-export-declaration": ^7.22.6
+    semver: ^6.3.1
   peerDependencies:
     "@babel/core": ^7.0.0
-  checksum: c2d3039265e498b341a6b597f855f2fcef02659050fefedf36ad4e6815e6aafe1011a761214cc80d98260ed07ab15a8cbe959a0458e97bec5f05a450e1b1741b
+  checksum: b7aeb22e29aba5327616328576363522b3b186918faeda605e300822af4a5f29416eb34b5bd825d07ab496550e271d02d7634f0022a62b5b8cbf0eb6389bc3fa
   languageName: node
   linkType: hard
 
-"@babel/helper-create-class-features-plugin@npm:^7.18.6":
-  version: 7.18.9
-  resolution: "@babel/helper-create-class-features-plugin@npm:7.18.9"
+"@babel/helper-create-regexp-features-plugin@npm:^7.18.6, @babel/helper-create-regexp-features-plugin@npm:^7.22.5":
+  version: 7.22.9
+  resolution: "@babel/helper-create-regexp-features-plugin@npm:7.22.9"
   dependencies:
-    "@babel/helper-annotate-as-pure": ^7.18.6
-    "@babel/helper-environment-visitor": ^7.18.9
-    "@babel/helper-function-name": ^7.18.9
-    "@babel/helper-member-expression-to-functions": ^7.18.9
-    "@babel/helper-optimise-call-expression": ^7.18.6
-    "@babel/helper-replace-supers": ^7.18.9
-    "@babel/helper-split-export-declaration": ^7.18.6
+    "@babel/helper-annotate-as-pure": ^7.22.5
+    regexpu-core: ^5.3.1
+    semver: ^6.3.1
   peerDependencies:
     "@babel/core": ^7.0.0
-  checksum: 020dba79b92ee9a98520dad81dddb47d75b34b7b4392672cbefc59db6f5e89a96c5eb95bb1cc46b2fddf913ef63dfe6d17168f56b059af5c6965bb37b6ce1d82
+  checksum: 87cb48a7ee898ab205374274364c3adc70b87b08c7bd07f51019ae4562c0170d7148e654d591f825dee14b5fe11666a0e7966872dfdbfa0d1b94b861ecf0e4e1
   languageName: node
   linkType: hard
 
-"@babel/helper-create-regexp-features-plugin@npm:^7.18.6":
-  version: 7.18.6
-  resolution: "@babel/helper-create-regexp-features-plugin@npm:7.18.6"
+"@babel/helper-define-polyfill-provider@npm:^0.4.2":
+  version: 0.4.2
+  resolution: "@babel/helper-define-polyfill-provider@npm:0.4.2"
   dependencies:
-    "@babel/helper-annotate-as-pure": ^7.18.6
-    regexpu-core: ^5.1.0
-  peerDependencies:
-    "@babel/core": ^7.0.0
-  checksum: 2d76e660cbfd0bfcb01ca9f177f0e9091c871a6b99f68ece6bcf4ab4a9df073485bdc2d87ecdfbde44b7f3723b26d13085d0f92082adb3ae80d31b246099f10a
-  languageName: node
-  linkType: hard
-
-"@babel/helper-define-polyfill-provider@npm:^0.3.1":
-  version: 0.3.1
-  resolution: "@babel/helper-define-polyfill-provider@npm:0.3.1"
-  dependencies:
-    "@babel/helper-compilation-targets": ^7.13.0
-    "@babel/helper-module-imports": ^7.12.13
-    "@babel/helper-plugin-utils": ^7.13.0
-    "@babel/traverse": ^7.13.0
+    "@babel/helper-compilation-targets": ^7.22.6
+    "@babel/helper-plugin-utils": ^7.22.5
     debug: ^4.1.1
     lodash.debounce: ^4.0.8
     resolve: ^1.14.2
-    semver: ^6.1.2
   peerDependencies:
-    "@babel/core": ^7.4.0-0
-  checksum: e3e93cb22febfc0449a210cdafb278e5e1a038af2ca2b02f5dee71c7a49e8ba26e469d631ee11a4243885961a62bb2e5b0a4deb3ec1d7918a33c953d05c3e584
+    "@babel/core": ^7.4.0 || ^8.0.0-0 <8.0.0
+  checksum: 1f6dec0c5d0876d278fe15b71238eccc5f74c4e2efa2c78aaafa8bc2cc96336b8e68d94cd1a78497356c96e8b91b8c1f4452179820624d1702aee2f9832e6569
   languageName: node
   linkType: hard
 
-"@babel/helper-environment-visitor@npm:^7.18.6, @babel/helper-environment-visitor@npm:^7.18.9":
-  version: 7.18.9
-  resolution: "@babel/helper-environment-visitor@npm:7.18.9"
-  checksum: b25101f6162ddca2d12da73942c08ad203d7668e06663df685634a8fde54a98bc015f6f62938e8554457a592a024108d45b8f3e651fd6dcdb877275b73cc4420
+"@babel/helper-environment-visitor@npm:^7.22.5":
+  version: 7.22.5
+  resolution: "@babel/helper-environment-visitor@npm:7.22.5"
+  checksum: 248532077d732a34cd0844eb7b078ff917c3a8ec81a7f133593f71a860a582f05b60f818dc5049c2212e5baa12289c27889a4b81d56ef409b4863db49646c4b1
   languageName: node
   linkType: hard
 
-"@babel/helper-explode-assignable-expression@npm:^7.18.6":
-  version: 7.18.6
-  resolution: "@babel/helper-explode-assignable-expression@npm:7.18.6"
+"@babel/helper-function-name@npm:^7.22.5":
+  version: 7.22.5
+  resolution: "@babel/helper-function-name@npm:7.22.5"
   dependencies:
-    "@babel/types": ^7.18.6
-  checksum: 225cfcc3376a8799023d15dc95000609e9d4e7547b29528c7f7111a0e05493ffb12c15d70d379a0bb32d42752f340233c4115bded6d299bc0c3ab7a12be3d30f
+    "@babel/template": ^7.22.5
+    "@babel/types": ^7.22.5
+  checksum: 6b1f6ce1b1f4e513bf2c8385a557ea0dd7fa37971b9002ad19268ca4384bbe90c09681fe4c076013f33deabc63a53b341ed91e792de741b4b35e01c00238177a
   languageName: node
   linkType: hard
 
-"@babel/helper-function-name@npm:^7.18.9, @babel/helper-function-name@npm:^7.19.0":
-  version: 7.19.0
-  resolution: "@babel/helper-function-name@npm:7.19.0"
+"@babel/helper-hoist-variables@npm:^7.22.5":
+  version: 7.22.5
+  resolution: "@babel/helper-hoist-variables@npm:7.22.5"
   dependencies:
-    "@babel/template": ^7.18.10
-    "@babel/types": ^7.19.0
-  checksum: eac1f5db428ba546270c2b8d750c24eb528b8fcfe50c81de2e0bdebf0e20f24bec688d4331533b782e4a907fad435244621ca2193cfcf80a86731299840e0f6e
+    "@babel/types": ^7.22.5
+  checksum: 394ca191b4ac908a76e7c50ab52102669efe3a1c277033e49467913c7ed6f7c64d7eacbeabf3bed39ea1f41731e22993f763b1edce0f74ff8563fd1f380d92cc
   languageName: node
   linkType: hard
 
-"@babel/helper-hoist-variables@npm:^7.18.6":
-  version: 7.18.6
-  resolution: "@babel/helper-hoist-variables@npm:7.18.6"
+"@babel/helper-member-expression-to-functions@npm:^7.22.5":
+  version: 7.22.5
+  resolution: "@babel/helper-member-expression-to-functions@npm:7.22.5"
   dependencies:
-    "@babel/types": ^7.18.6
-  checksum: fd9c35bb435fda802bf9ff7b6f2df06308a21277c6dec2120a35b09f9de68f68a33972e2c15505c1a1a04b36ec64c9ace97d4a9e26d6097b76b4396b7c5fa20f
+    "@babel/types": ^7.22.5
+  checksum: 4bd5791529c280c00743e8bdc669ef0d4cd1620d6e3d35e0d42b862f8262bc2364973e5968007f960780344c539a4b9cf92ab41f5b4f94560a9620f536de2a39
   languageName: node
   linkType: hard
 
-"@babel/helper-member-expression-to-functions@npm:^7.18.9":
-  version: 7.18.9
-  resolution: "@babel/helper-member-expression-to-functions@npm:7.18.9"
+"@babel/helper-module-imports@npm:^7.0.0, @babel/helper-module-imports@npm:^7.16.0, @babel/helper-module-imports@npm:^7.16.7, @babel/helper-module-imports@npm:^7.22.5":
+  version: 7.22.5
+  resolution: "@babel/helper-module-imports@npm:7.22.5"
   dependencies:
-    "@babel/types": ^7.18.9
-  checksum: fcf8184e3b55051c4286b2cbedf0eccc781d0f3c9b5cbaba582eca19bf0e8d87806cdb7efc8554fcb969ceaf2b187d5ea748d40022d06ec7739fbb18c1b19a7a
+    "@babel/types": ^7.22.5
+  checksum: 9ac2b0404fa38b80bdf2653fbeaf8e8a43ccb41bd505f9741d820ed95d3c4e037c62a1bcdcb6c9527d7798d2e595924c4d025daed73283badc180ada2c9c49ad
   languageName: node
   linkType: hard
 
-"@babel/helper-module-imports@npm:^7.0.0, @babel/helper-module-imports@npm:^7.12.13, @babel/helper-module-imports@npm:^7.16.0, @babel/helper-module-imports@npm:^7.16.7, @babel/helper-module-imports@npm:^7.18.6":
-  version: 7.18.6
-  resolution: "@babel/helper-module-imports@npm:7.18.6"
+"@babel/helper-module-transforms@npm:^7.22.5, @babel/helper-module-transforms@npm:^7.22.9":
+  version: 7.22.9
+  resolution: "@babel/helper-module-transforms@npm:7.22.9"
   dependencies:
-    "@babel/types": ^7.18.6
-  checksum: f393f8a3b3304b1b7a288a38c10989de754f01d29caf62ce7c4e5835daf0a27b81f3ac687d9d2780d39685aae7b55267324b512150e7b2be967b0c493b6a1def
-  languageName: node
-  linkType: hard
-
-"@babel/helper-module-transforms@npm:^7.18.6, @babel/helper-module-transforms@npm:^7.18.9, @babel/helper-module-transforms@npm:^7.19.0":
-  version: 7.19.0
-  resolution: "@babel/helper-module-transforms@npm:7.19.0"
-  dependencies:
-    "@babel/helper-environment-visitor": ^7.18.9
-    "@babel/helper-module-imports": ^7.18.6
-    "@babel/helper-simple-access": ^7.18.6
-    "@babel/helper-split-export-declaration": ^7.18.6
-    "@babel/helper-validator-identifier": ^7.18.6
-    "@babel/template": ^7.18.10
-    "@babel/traverse": ^7.19.0
-    "@babel/types": ^7.19.0
-  checksum: 4483276c66f56cf3b5b063634092ad9438c2593725de5c143ba277dda82f1501e6d73b311c1b28036f181dbe36eaeff29f24726cde37a599d4e735af294e5359
-  languageName: node
-  linkType: hard
-
-"@babel/helper-optimise-call-expression@npm:^7.18.6":
-  version: 7.18.6
-  resolution: "@babel/helper-optimise-call-expression@npm:7.18.6"
-  dependencies:
-    "@babel/types": ^7.18.6
-  checksum: e518fe8418571405e21644cfb39cf694f30b6c47b10b006609a92469ae8b8775cbff56f0b19732343e2ea910641091c5a2dc73b56ceba04e116a33b0f8bd2fbd
-  languageName: node
-  linkType: hard
-
-"@babel/helper-plugin-utils@npm:^7.0.0, @babel/helper-plugin-utils@npm:^7.10.4, @babel/helper-plugin-utils@npm:^7.12.13, @babel/helper-plugin-utils@npm:^7.13.0, @babel/helper-plugin-utils@npm:^7.14.5, @babel/helper-plugin-utils@npm:^7.16.7, @babel/helper-plugin-utils@npm:^7.18.6, @babel/helper-plugin-utils@npm:^7.18.9, @babel/helper-plugin-utils@npm:^7.19.0, @babel/helper-plugin-utils@npm:^7.8.0, @babel/helper-plugin-utils@npm:^7.8.3":
-  version: 7.20.2
-  resolution: "@babel/helper-plugin-utils@npm:7.20.2"
-  checksum: f6cae53b7fdb1bf3abd50fa61b10b4470985b400cc794d92635da1e7077bb19729f626adc0741b69403d9b6e411cddddb9c0157a709cc7c4eeb41e663be5d74b
-  languageName: node
-  linkType: hard
-
-"@babel/helper-remap-async-to-generator@npm:^7.18.6":
-  version: 7.18.9
-  resolution: "@babel/helper-remap-async-to-generator@npm:7.18.9"
-  dependencies:
-    "@babel/helper-annotate-as-pure": ^7.18.6
-    "@babel/helper-environment-visitor": ^7.18.9
-    "@babel/helper-wrap-function": ^7.18.9
-    "@babel/types": ^7.18.9
+    "@babel/helper-environment-visitor": ^7.22.5
+    "@babel/helper-module-imports": ^7.22.5
+    "@babel/helper-simple-access": ^7.22.5
+    "@babel/helper-split-export-declaration": ^7.22.6
+    "@babel/helper-validator-identifier": ^7.22.5
   peerDependencies:
     "@babel/core": ^7.0.0
-  checksum: 4be6076192308671b046245899b703ba090dbe7ad03e0bea897bb2944ae5b88e5e85853c9d1f83f643474b54c578d8ac0800b80341a86e8538264a725fbbefec
+  checksum: 2751f77660518cf4ff027514d6f4794f04598c6393be7b04b8e46c6e21606e11c19f3f57ab6129a9c21bacdf8b3ffe3af87bb401d972f34af2d0ffde02ac3001
   languageName: node
   linkType: hard
 
-"@babel/helper-replace-supers@npm:^7.18.6, @babel/helper-replace-supers@npm:^7.18.9":
-  version: 7.18.9
-  resolution: "@babel/helper-replace-supers@npm:7.18.9"
+"@babel/helper-optimise-call-expression@npm:^7.22.5":
+  version: 7.22.5
+  resolution: "@babel/helper-optimise-call-expression@npm:7.22.5"
   dependencies:
-    "@babel/helper-environment-visitor": ^7.18.9
-    "@babel/helper-member-expression-to-functions": ^7.18.9
-    "@babel/helper-optimise-call-expression": ^7.18.6
-    "@babel/traverse": ^7.18.9
-    "@babel/types": ^7.18.9
-  checksum: 2de8b29cc4bfa4e241da2de16abd5571709f6eb394206dc16e3a7816976d1691635dd4bc930881e9d798f44b48a5f1849dc7f51a62946f3e8270452be1ec5352
+    "@babel/types": ^7.22.5
+  checksum: c70ef6cc6b6ed32eeeec4482127e8be5451d0e5282d5495d5d569d39eb04d7f1d66ec99b327f45d1d5842a9ad8c22d48567e93fc502003a47de78d122e355f7c
   languageName: node
   linkType: hard
 
-"@babel/helper-simple-access@npm:^7.18.6":
-  version: 7.18.6
-  resolution: "@babel/helper-simple-access@npm:7.18.6"
+"@babel/helper-plugin-utils@npm:^7.0.0, @babel/helper-plugin-utils@npm:^7.10.4, @babel/helper-plugin-utils@npm:^7.12.13, @babel/helper-plugin-utils@npm:^7.14.5, @babel/helper-plugin-utils@npm:^7.16.7, @babel/helper-plugin-utils@npm:^7.18.6, @babel/helper-plugin-utils@npm:^7.18.9, @babel/helper-plugin-utils@npm:^7.19.0, @babel/helper-plugin-utils@npm:^7.22.5, @babel/helper-plugin-utils@npm:^7.8.0, @babel/helper-plugin-utils@npm:^7.8.3":
+  version: 7.22.5
+  resolution: "@babel/helper-plugin-utils@npm:7.22.5"
+  checksum: c0fc7227076b6041acd2f0e818145d2e8c41968cc52fb5ca70eed48e21b8fe6dd88a0a91cbddf4951e33647336eb5ae184747ca706817ca3bef5e9e905151ff5
+  languageName: node
+  linkType: hard
+
+"@babel/helper-remap-async-to-generator@npm:^7.22.5, @babel/helper-remap-async-to-generator@npm:^7.22.9":
+  version: 7.22.9
+  resolution: "@babel/helper-remap-async-to-generator@npm:7.22.9"
   dependencies:
-    "@babel/types": ^7.18.6
-  checksum: 37cd36eef199e0517845763c1e6ff6ea5e7876d6d707a6f59c9267c547a50aa0e84260ba9285d49acfaf2cfa0a74a772d92967f32ac1024c961517d40b6c16a5
+    "@babel/helper-annotate-as-pure": ^7.22.5
+    "@babel/helper-environment-visitor": ^7.22.5
+    "@babel/helper-wrap-function": ^7.22.9
+  peerDependencies:
+    "@babel/core": ^7.0.0
+  checksum: 05538079447829b13512157491cc77f9cf1ea7e1680e15cff0682c3ed9ee162de0c4862ece20a6d6b2df28177a1520bcfe45993fbeccf2747a81795a7c3f6290
   languageName: node
   linkType: hard
 
-"@babel/helper-skip-transparent-expression-wrappers@npm:^7.18.9":
-  version: 7.18.9
-  resolution: "@babel/helper-skip-transparent-expression-wrappers@npm:7.18.9"
+"@babel/helper-replace-supers@npm:^7.22.5, @babel/helper-replace-supers@npm:^7.22.9":
+  version: 7.22.9
+  resolution: "@babel/helper-replace-supers@npm:7.22.9"
   dependencies:
-    "@babel/types": ^7.18.9
-  checksum: 6e93ccd10248293082606a4b3e30eed32c6f796d378f6b662796c88f462f348aa368aadeb48eb410cfcc8250db93b2d6627c2e55662530f08fc25397e588d68a
+    "@babel/helper-environment-visitor": ^7.22.5
+    "@babel/helper-member-expression-to-functions": ^7.22.5
+    "@babel/helper-optimise-call-expression": ^7.22.5
+  peerDependencies:
+    "@babel/core": ^7.0.0
+  checksum: d41471f56ff2616459d35a5df1900d5f0756ae78b1027040365325ef332d66e08e3be02a9489756d870887585ff222403a228546e93dd7019e19e59c0c0fe586
   languageName: node
   linkType: hard
 
-"@babel/helper-split-export-declaration@npm:^7.18.6":
-  version: 7.18.6
-  resolution: "@babel/helper-split-export-declaration@npm:7.18.6"
+"@babel/helper-simple-access@npm:^7.22.5":
+  version: 7.22.5
+  resolution: "@babel/helper-simple-access@npm:7.22.5"
   dependencies:
-    "@babel/types": ^7.18.6
-  checksum: c6d3dede53878f6be1d869e03e9ffbbb36f4897c7cc1527dc96c56d127d834ffe4520a6f7e467f5b6f3c2843ea0e81a7819d66ae02f707f6ac057f3d57943a2b
+    "@babel/types": ^7.22.5
+  checksum: fe9686714caf7d70aedb46c3cce090f8b915b206e09225f1e4dbc416786c2fdbbee40b38b23c268b7ccef749dd2db35f255338fb4f2444429874d900dede5ad2
   languageName: node
   linkType: hard
 
-"@babel/helper-string-parser@npm:^7.18.10":
-  version: 7.18.10
-  resolution: "@babel/helper-string-parser@npm:7.18.10"
-  checksum: d554a4393365b624916b5c00a4cc21c990c6617e7f3fe30be7d9731f107f12c33229a7a3db9d829bfa110d2eb9f04790745d421640e3bd245bb412dc0ea123c1
-  languageName: node
-  linkType: hard
-
-"@babel/helper-validator-identifier@npm:^7.18.6, @babel/helper-validator-identifier@npm:^7.19.1":
-  version: 7.19.1
-  resolution: "@babel/helper-validator-identifier@npm:7.19.1"
-  checksum: 0eca5e86a729162af569b46c6c41a63e18b43dbe09fda1d2a3c8924f7d617116af39cac5e4cd5d431bb760b4dca3c0970e0c444789b1db42bcf1fa41fbad0a3a
-  languageName: node
-  linkType: hard
-
-"@babel/helper-validator-option@npm:^7.16.7, @babel/helper-validator-option@npm:^7.18.6":
-  version: 7.18.6
-  resolution: "@babel/helper-validator-option@npm:7.18.6"
-  checksum: f9cc6eb7cc5d759c5abf006402180f8d5e4251e9198197428a97e05d65eb2f8ae5a0ce73b1dfd2d35af41d0eb780627a64edf98a4e71f064eeeacef8de58f2cf
-  languageName: node
-  linkType: hard
-
-"@babel/helper-wrap-function@npm:^7.18.9":
-  version: 7.18.9
-  resolution: "@babel/helper-wrap-function@npm:7.18.9"
+"@babel/helper-skip-transparent-expression-wrappers@npm:^7.18.9, @babel/helper-skip-transparent-expression-wrappers@npm:^7.22.5":
+  version: 7.22.5
+  resolution: "@babel/helper-skip-transparent-expression-wrappers@npm:7.22.5"
   dependencies:
-    "@babel/helper-function-name": ^7.18.9
-    "@babel/template": ^7.18.6
-    "@babel/traverse": ^7.18.9
-    "@babel/types": ^7.18.9
-  checksum: da818e519b48bbaa748a4fa87b0ba681bc627c9eb9557008d5307d42d3f536fe435b775163088dd9639b0120c8ea1ae1021777f48806f9f83397f4df622b88d3
+    "@babel/types": ^7.22.5
+  checksum: 1012ef2295eb12dc073f2b9edf3425661e9b8432a3387e62a8bc27c42963f1f216ab3124228015c748770b2257b4f1fda882ca8fa34c0bf485e929ae5bc45244
   languageName: node
   linkType: hard
 
-"@babel/helpers@npm:^7.19.0":
-  version: 7.19.0
-  resolution: "@babel/helpers@npm:7.19.0"
+"@babel/helper-split-export-declaration@npm:^7.22.6":
+  version: 7.22.6
+  resolution: "@babel/helper-split-export-declaration@npm:7.22.6"
   dependencies:
-    "@babel/template": ^7.18.10
-    "@babel/traverse": ^7.19.0
-    "@babel/types": ^7.19.0
-  checksum: e50e78e0dbb0435075fa3f85021a6bcae529589800bca0292721afd7f7c874bea54508d6dc57eca16e5b8224f8142c6b0e32e3b0140029dc09865da747da4623
+    "@babel/types": ^7.22.5
+  checksum: e141cace583b19d9195f9c2b8e17a3ae913b7ee9b8120246d0f9ca349ca6f03cb2c001fd5ec57488c544347c0bb584afec66c936511e447fd20a360e591ac921
   languageName: node
   linkType: hard
 
-"@babel/highlight@npm:^7.0.0, @babel/highlight@npm:^7.18.6":
-  version: 7.18.6
-  resolution: "@babel/highlight@npm:7.18.6"
+"@babel/helper-string-parser@npm:^7.22.5":
+  version: 7.22.5
+  resolution: "@babel/helper-string-parser@npm:7.22.5"
+  checksum: 836851ca5ec813077bbb303acc992d75a360267aa3b5de7134d220411c852a6f17de7c0d0b8c8dcc0f567f67874c00f4528672b2a4f1bc978a3ada64c8c78467
+  languageName: node
+  linkType: hard
+
+"@babel/helper-validator-identifier@npm:^7.22.5":
+  version: 7.22.5
+  resolution: "@babel/helper-validator-identifier@npm:7.22.5"
+  checksum: 7f0f30113474a28298c12161763b49de5018732290ca4de13cdaefd4fd0d635a6fe3f6686c37a02905fb1e64f21a5ee2b55140cf7b070e729f1bd66866506aea
+  languageName: node
+  linkType: hard
+
+"@babel/helper-validator-option@npm:^7.16.7, @babel/helper-validator-option@npm:^7.22.5":
+  version: 7.22.5
+  resolution: "@babel/helper-validator-option@npm:7.22.5"
+  checksum: bbeca8a85ee86990215c0424997438b388b8d642d69b9f86c375a174d3cdeb270efafd1ff128bc7a1d370923d13b6e45829ba8581c027620e83e3a80c5c414b3
+  languageName: node
+  linkType: hard
+
+"@babel/helper-wrap-function@npm:^7.22.9":
+  version: 7.22.10
+  resolution: "@babel/helper-wrap-function@npm:7.22.10"
   dependencies:
-    "@babel/helper-validator-identifier": ^7.18.6
-    chalk: ^2.0.0
+    "@babel/helper-function-name": ^7.22.5
+    "@babel/template": ^7.22.5
+    "@babel/types": ^7.22.10
+  checksum: 854bd85fc1de1d4c633f04aa1f5b6b022fbc013b47d012b6a11a7a9125a1f4a2a4f13a3e0d7a7056fe7eda8a9ecd1ea3daf8af685685a2d1b16578768cfdd28f
+  languageName: node
+  linkType: hard
+
+"@babel/helpers@npm:^7.22.11":
+  version: 7.22.11
+  resolution: "@babel/helpers@npm:7.22.11"
+  dependencies:
+    "@babel/template": ^7.22.5
+    "@babel/traverse": ^7.22.11
+    "@babel/types": ^7.22.11
+  checksum: 93186544228b5e371486466ec3b86a77cce91beeff24a5670ca8ec46d50328f7700dab82d532351286e9d68624dc51d6d71589b051dd9535e44be077a43ec013
+  languageName: node
+  linkType: hard
+
+"@babel/highlight@npm:^7.0.0, @babel/highlight@npm:^7.22.10":
+  version: 7.22.10
+  resolution: "@babel/highlight@npm:7.22.10"
+  dependencies:
+    "@babel/helper-validator-identifier": ^7.22.5
+    chalk: ^2.4.2
     js-tokens: ^4.0.0
-  checksum: 92d8ee61549de5ff5120e945e774728e5ccd57fd3b2ed6eace020ec744823d4a98e242be1453d21764a30a14769ecd62170fba28539b211799bbaf232bbb2789
+  checksum: f714a1e1a72dd9d72f6383f4f30fd342e21a8df32d984a4ea8f5eab691bb6ba6db2f8823d4b4cf135d98869e7a98925b81306aa32ee3c429f8cfa52c75889e1b
   languageName: node
   linkType: hard
 
-"@babel/parser@npm:^7.1.0, @babel/parser@npm:^7.13.16, @babel/parser@npm:^7.14.0, @babel/parser@npm:^7.14.7, @babel/parser@npm:^7.16.8, @babel/parser@npm:^7.18.10, @babel/parser@npm:^7.19.1, @babel/parser@npm:^7.20.15":
-  version: 7.20.15
-  resolution: "@babel/parser@npm:7.20.15"
+"@babel/parser@npm:^7.1.0, @babel/parser@npm:^7.13.16, @babel/parser@npm:^7.14.0, @babel/parser@npm:^7.14.7, @babel/parser@npm:^7.16.8, @babel/parser@npm:^7.20.15, @babel/parser@npm:^7.22.11, @babel/parser@npm:^7.22.5":
+  version: 7.22.11
+  resolution: "@babel/parser@npm:7.22.11"
   bin:
     parser: ./bin/babel-parser.js
-  checksum: 1d0f47ca67ff2652f1c0ff1570bed8deccbc4b53509e7cd73476af9cc7ed23480c99f1179bd6d0be01612368b92b39e206d330ad6054009d699934848a89298b
+  checksum: 332079ed09794d3685343e9fc39c6a12dcb6ea589119f2135952cdef2424296786bb609a33f6dfa9be271797bbf8339f1865118418ea50b32a0c701734c96664
   languageName: node
   linkType: hard
 
-"@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@npm:^7.18.6":
-  version: 7.18.6
-  resolution: "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@npm:7.18.6"
+"@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@npm:^7.22.5":
+  version: 7.22.5
+  resolution: "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@npm:7.22.5"
   dependencies:
-    "@babel/helper-plugin-utils": ^7.18.6
+    "@babel/helper-plugin-utils": ^7.22.5
   peerDependencies:
     "@babel/core": ^7.0.0
-  checksum: 845bd280c55a6a91d232cfa54eaf9708ec71e594676fe705794f494bb8b711d833b752b59d1a5c154695225880c23dbc9cab0e53af16fd57807976cd3ff41b8d
+  checksum: 1e353a060fb2cd8f1256d28cd768f16fb02513f905b9b6d656fb0242c96c341a196fa188b27c2701506a6e27515359fbcc1a5ca7fa8b9b530cf88fbd137baefc
   languageName: node
   linkType: hard
 
-"@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining@npm:^7.18.9":
-  version: 7.18.9
-  resolution: "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining@npm:7.18.9"
+"@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining@npm:^7.22.5":
+  version: 7.22.5
+  resolution: "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining@npm:7.22.5"
   dependencies:
-    "@babel/helper-plugin-utils": ^7.18.9
-    "@babel/helper-skip-transparent-expression-wrappers": ^7.18.9
-    "@babel/plugin-proposal-optional-chaining": ^7.18.9
+    "@babel/helper-plugin-utils": ^7.22.5
+    "@babel/helper-skip-transparent-expression-wrappers": ^7.22.5
+    "@babel/plugin-transform-optional-chaining": ^7.22.5
   peerDependencies:
     "@babel/core": ^7.13.0
-  checksum: 93abb5cb179a13db171bfc2cdf79489598f43c50cc174f97a2b7bb1d44d24ade7109665a20cf4e317ad6c1c730f036f06478f7c7e789b4240be1abdb60d6452f
+  checksum: 16e7a5f3bf2f2ac0ca032a70bf0ebd7e886d84dbb712b55c0643c04c495f0f221fbcbca14b5f8f8027fa6c87a3dafae0934022ad2b409384af6c5c356495b7bd
   languageName: node
   linkType: hard
 
-"@babel/plugin-proposal-async-generator-functions@npm:^7.18.6":
-  version: 7.18.6
-  resolution: "@babel/plugin-proposal-async-generator-functions@npm:7.18.6"
-  dependencies:
-    "@babel/helper-environment-visitor": ^7.18.6
-    "@babel/helper-plugin-utils": ^7.18.6
-    "@babel/helper-remap-async-to-generator": ^7.18.6
-    "@babel/plugin-syntax-async-generators": ^7.8.4
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: 3f708808ba6f8a9bd18805b1b22ab90ec0b362d949111a776e0bade5391f143f55479dcc444b2cec25fc89ac21035ee92e9a5ec37c02c610639197a0c2f7dcb0
-  languageName: node
-  linkType: hard
-
-"@babel/plugin-proposal-class-properties@npm:^7.0.0, @babel/plugin-proposal-class-properties@npm:^7.13.0, @babel/plugin-proposal-class-properties@npm:^7.18.6":
+"@babel/plugin-proposal-class-properties@npm:^7.0.0, @babel/plugin-proposal-class-properties@npm:^7.13.0":
   version: 7.18.6
   resolution: "@babel/plugin-proposal-class-properties@npm:7.18.6"
   dependencies:
@@ -2194,68 +2157,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/plugin-proposal-class-static-block@npm:^7.18.6":
-  version: 7.18.6
-  resolution: "@babel/plugin-proposal-class-static-block@npm:7.18.6"
-  dependencies:
-    "@babel/helper-create-class-features-plugin": ^7.18.6
-    "@babel/helper-plugin-utils": ^7.18.6
-    "@babel/plugin-syntax-class-static-block": ^7.14.5
-  peerDependencies:
-    "@babel/core": ^7.12.0
-  checksum: b8d7ae99ed5ad784f39e7820e3ac03841f91d6ed60ab4a98c61d6112253da36013e12807bae4ffed0ef3cb318e47debac112ed614e03b403fb8b075b09a828ee
-  languageName: node
-  linkType: hard
-
-"@babel/plugin-proposal-dynamic-import@npm:^7.18.6":
-  version: 7.18.6
-  resolution: "@babel/plugin-proposal-dynamic-import@npm:7.18.6"
-  dependencies:
-    "@babel/helper-plugin-utils": ^7.18.6
-    "@babel/plugin-syntax-dynamic-import": ^7.8.3
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: 96b1c8a8ad8171d39e9ab106be33bde37ae09b22fb2c449afee9a5edf3c537933d79d963dcdc2694d10677cb96da739cdf1b53454e6a5deab9801f28a818bb2f
-  languageName: node
-  linkType: hard
-
-"@babel/plugin-proposal-export-namespace-from@npm:^7.18.9":
-  version: 7.18.9
-  resolution: "@babel/plugin-proposal-export-namespace-from@npm:7.18.9"
-  dependencies:
-    "@babel/helper-plugin-utils": ^7.18.9
-    "@babel/plugin-syntax-export-namespace-from": ^7.8.3
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: 84ff22bacc5d30918a849bfb7e0e90ae4c5b8d8b65f2ac881803d1cf9068dffbe53bd657b0e4bc4c20b4db301b1c85f1e74183cf29a0dd31e964bd4e97c363ef
-  languageName: node
-  linkType: hard
-
-"@babel/plugin-proposal-json-strings@npm:^7.18.6":
-  version: 7.18.6
-  resolution: "@babel/plugin-proposal-json-strings@npm:7.18.6"
-  dependencies:
-    "@babel/helper-plugin-utils": ^7.18.6
-    "@babel/plugin-syntax-json-strings": ^7.8.3
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: 25ba0e6b9d6115174f51f7c6787e96214c90dd4026e266976b248a2ed417fe50fddae72843ffb3cbe324014a18632ce5648dfac77f089da858022b49fd608cb3
-  languageName: node
-  linkType: hard
-
-"@babel/plugin-proposal-logical-assignment-operators@npm:^7.18.9":
-  version: 7.18.9
-  resolution: "@babel/plugin-proposal-logical-assignment-operators@npm:7.18.9"
-  dependencies:
-    "@babel/helper-plugin-utils": ^7.18.9
-    "@babel/plugin-syntax-logical-assignment-operators": ^7.10.4
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: dd87fa4a48c6408c5e85dbd6405a65cc8fe909e3090030df46df90df64cdf3e74007381a58ed87608778ee597eff7395d215274009bb3f5d8964b2db5557754f
-  languageName: node
-  linkType: hard
-
-"@babel/plugin-proposal-nullish-coalescing-operator@npm:^7.13.8, @babel/plugin-proposal-nullish-coalescing-operator@npm:^7.18.6":
+"@babel/plugin-proposal-nullish-coalescing-operator@npm:^7.13.8":
   version: 7.18.6
   resolution: "@babel/plugin-proposal-nullish-coalescing-operator@npm:7.18.6"
   dependencies:
@@ -2267,19 +2169,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/plugin-proposal-numeric-separator@npm:^7.18.6":
-  version: 7.18.6
-  resolution: "@babel/plugin-proposal-numeric-separator@npm:7.18.6"
-  dependencies:
-    "@babel/helper-plugin-utils": ^7.18.6
-    "@babel/plugin-syntax-numeric-separator": ^7.10.4
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: f370ea584c55bf4040e1f78c80b4eeb1ce2e6aaa74f87d1a48266493c33931d0b6222d8cee3a082383d6bb648ab8d6b7147a06f974d3296ef3bc39c7851683ec
-  languageName: node
-  linkType: hard
-
-"@babel/plugin-proposal-object-rest-spread@npm:^7.0.0, @babel/plugin-proposal-object-rest-spread@npm:^7.18.9":
+"@babel/plugin-proposal-object-rest-spread@npm:^7.0.0":
   version: 7.18.9
   resolution: "@babel/plugin-proposal-object-rest-spread@npm:7.18.9"
   dependencies:
@@ -2294,19 +2184,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/plugin-proposal-optional-catch-binding@npm:^7.18.6":
-  version: 7.18.6
-  resolution: "@babel/plugin-proposal-optional-catch-binding@npm:7.18.6"
-  dependencies:
-    "@babel/helper-plugin-utils": ^7.18.6
-    "@babel/plugin-syntax-optional-catch-binding": ^7.8.3
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: 7b5b39fb5d8d6d14faad6cb68ece5eeb2fd550fb66b5af7d7582402f974f5bc3684641f7c192a5a57e0f59acfae4aada6786be1eba030881ddc590666eff4d1e
-  languageName: node
-  linkType: hard
-
-"@babel/plugin-proposal-optional-chaining@npm:^7.13.12, @babel/plugin-proposal-optional-chaining@npm:^7.18.9":
+"@babel/plugin-proposal-optional-chaining@npm:^7.13.12":
   version: 7.18.9
   resolution: "@babel/plugin-proposal-optional-chaining@npm:7.18.9"
   dependencies:
@@ -2319,41 +2197,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/plugin-proposal-private-methods@npm:^7.18.6":
-  version: 7.18.6
-  resolution: "@babel/plugin-proposal-private-methods@npm:7.18.6"
-  dependencies:
-    "@babel/helper-create-class-features-plugin": ^7.18.6
-    "@babel/helper-plugin-utils": ^7.18.6
+"@babel/plugin-proposal-private-property-in-object@npm:7.21.0-placeholder-for-preset-env.2":
+  version: 7.21.0-placeholder-for-preset-env.2
+  resolution: "@babel/plugin-proposal-private-property-in-object@npm:7.21.0-placeholder-for-preset-env.2"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 22d8502ee96bca99ad2c8393e8493e2b8d4507576dd054490fd8201a36824373440106f5b098b6d821b026c7e72b0424ff4aeca69ed5f42e48f029d3a156d5ad
-  languageName: node
-  linkType: hard
-
-"@babel/plugin-proposal-private-property-in-object@npm:^7.18.6":
-  version: 7.18.6
-  resolution: "@babel/plugin-proposal-private-property-in-object@npm:7.18.6"
-  dependencies:
-    "@babel/helper-annotate-as-pure": ^7.18.6
-    "@babel/helper-create-class-features-plugin": ^7.18.6
-    "@babel/helper-plugin-utils": ^7.18.6
-    "@babel/plugin-syntax-private-property-in-object": ^7.14.5
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: c8e56a972930730345f39f2384916fd8e711b3f4b4eae2ca9740e99958980118120d5cc9b6ac150f0965a5a35f825910e2c3013d90be3e9993ab6111df444569
-  languageName: node
-  linkType: hard
-
-"@babel/plugin-proposal-unicode-property-regex@npm:^7.18.6, @babel/plugin-proposal-unicode-property-regex@npm:^7.4.4":
-  version: 7.18.6
-  resolution: "@babel/plugin-proposal-unicode-property-regex@npm:7.18.6"
-  dependencies:
-    "@babel/helper-create-regexp-features-plugin": ^7.18.6
-    "@babel/helper-plugin-utils": ^7.18.6
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: a8575ecb7ff24bf6c6e94808d5c84bb5a0c6dd7892b54f09f4646711ba0ee1e1668032b3c43e3e1dfec2c5716c302e851ac756c1645e15882d73df6ad21ae951
+  checksum: d97745d098b835d55033ff3a7fb2b895b9c5295b08a5759e4f20df325aa385a3e0bc9bd5ad8f2ec554a44d4e6525acfc257b8c5848a1345cb40f26a30e277e91
   languageName: node
   linkType: hard
 
@@ -2434,7 +2283,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/plugin-syntax-import-assertions@npm:7.20.0, @babel/plugin-syntax-import-assertions@npm:^7.18.6":
+"@babel/plugin-syntax-import-assertions@npm:7.20.0":
   version: 7.20.0
   resolution: "@babel/plugin-syntax-import-assertions@npm:7.20.0"
   dependencies:
@@ -2445,7 +2294,29 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/plugin-syntax-import-meta@npm:^7.8.3":
+"@babel/plugin-syntax-import-assertions@npm:^7.22.5":
+  version: 7.22.5
+  resolution: "@babel/plugin-syntax-import-assertions@npm:7.22.5"
+  dependencies:
+    "@babel/helper-plugin-utils": ^7.22.5
+  peerDependencies:
+    "@babel/core": ^7.0.0-0
+  checksum: 2b8b5572db04a7bef1e6cd20debf447e4eef7cb012616f5eceb8fa3e23ce469b8f76ee74fd6d1e158ba17a8f58b0aec579d092fb67c5a30e83ccfbc5754916c1
+  languageName: node
+  linkType: hard
+
+"@babel/plugin-syntax-import-attributes@npm:^7.22.5":
+  version: 7.22.5
+  resolution: "@babel/plugin-syntax-import-attributes@npm:7.22.5"
+  dependencies:
+    "@babel/helper-plugin-utils": ^7.22.5
+  peerDependencies:
+    "@babel/core": ^7.0.0-0
+  checksum: 197b3c5ea2a9649347f033342cb222ab47f4645633695205c0250c6bf2af29e643753b8bb24a2db39948bef08e7c540babfd365591eb57fc110cb30b425ffc47
+  languageName: node
+  linkType: hard
+
+"@babel/plugin-syntax-import-meta@npm:^7.10.4, @babel/plugin-syntax-import-meta@npm:^7.8.3":
   version: 7.10.4
   resolution: "@babel/plugin-syntax-import-meta@npm:7.10.4"
   dependencies:
@@ -2467,14 +2338,14 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/plugin-syntax-jsx@npm:^7.0.0, @babel/plugin-syntax-jsx@npm:^7.17.12, @babel/plugin-syntax-jsx@npm:^7.18.6, @babel/plugin-syntax-jsx@npm:^7.7.2":
-  version: 7.18.6
-  resolution: "@babel/plugin-syntax-jsx@npm:7.18.6"
+"@babel/plugin-syntax-jsx@npm:^7.0.0, @babel/plugin-syntax-jsx@npm:^7.22.5, @babel/plugin-syntax-jsx@npm:^7.7.2":
+  version: 7.22.5
+  resolution: "@babel/plugin-syntax-jsx@npm:7.22.5"
   dependencies:
-    "@babel/helper-plugin-utils": ^7.18.6
+    "@babel/helper-plugin-utils": ^7.22.5
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 6d37ea972970195f1ffe1a54745ce2ae456e0ac6145fae9aa1480f297248b262ea6ebb93010eddb86ebfacb94f57c05a1fc5d232b9a67325b09060299d515c67
+  checksum: 8829d30c2617ab31393d99cec2978e41f014f4ac6f01a1cecf4c4dd8320c3ec12fdc3ce121126b2d8d32f6887e99ca1a0bad53dedb1e6ad165640b92b24980ce
   languageName: node
   linkType: hard
 
@@ -2566,135 +2437,212 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/plugin-syntax-typescript@npm:^7.18.6, @babel/plugin-syntax-typescript@npm:^7.7.2":
+"@babel/plugin-syntax-typescript@npm:^7.22.5, @babel/plugin-syntax-typescript@npm:^7.7.2":
+  version: 7.22.5
+  resolution: "@babel/plugin-syntax-typescript@npm:7.22.5"
+  dependencies:
+    "@babel/helper-plugin-utils": ^7.22.5
+  peerDependencies:
+    "@babel/core": ^7.0.0-0
+  checksum: 8ab7718fbb026d64da93681a57797d60326097fd7cb930380c8bffd9eb101689e90142c760a14b51e8e69c88a73ba3da956cb4520a3b0c65743aee5c71ef360a
+  languageName: node
+  linkType: hard
+
+"@babel/plugin-syntax-unicode-sets-regex@npm:^7.18.6":
   version: 7.18.6
-  resolution: "@babel/plugin-syntax-typescript@npm:7.18.6"
-  dependencies:
-    "@babel/helper-plugin-utils": ^7.18.6
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: 2cde73725ec51118ebf410bf02d78781c03fa4d3185993fcc9d253b97443381b621c44810084c5dd68b92eb8bdfae0e5b163e91b32bebbb33852383d1815c05d
-  languageName: node
-  linkType: hard
-
-"@babel/plugin-transform-arrow-functions@npm:^7.0.0, @babel/plugin-transform-arrow-functions@npm:^7.18.6":
-  version: 7.18.6
-  resolution: "@babel/plugin-transform-arrow-functions@npm:7.18.6"
-  dependencies:
-    "@babel/helper-plugin-utils": ^7.18.6
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: 900f5c695755062b91eec74da6f9092f40b8fada099058b92576f1e23c55e9813ec437051893a9b3c05cefe39e8ac06303d4a91b384e1c03dd8dc1581ea11602
-  languageName: node
-  linkType: hard
-
-"@babel/plugin-transform-async-to-generator@npm:^7.18.6":
-  version: 7.18.6
-  resolution: "@babel/plugin-transform-async-to-generator@npm:7.18.6"
-  dependencies:
-    "@babel/helper-module-imports": ^7.18.6
-    "@babel/helper-plugin-utils": ^7.18.6
-    "@babel/helper-remap-async-to-generator": ^7.18.6
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: c2cca47468cf1aeefdc7ec35d670e195c86cee4de28a1970648c46a88ce6bd1806ef0bab27251b9e7fb791bb28a64dcd543770efd899f28ee5f7854e64e873d3
-  languageName: node
-  linkType: hard
-
-"@babel/plugin-transform-block-scoped-functions@npm:^7.0.0, @babel/plugin-transform-block-scoped-functions@npm:^7.18.6":
-  version: 7.18.6
-  resolution: "@babel/plugin-transform-block-scoped-functions@npm:7.18.6"
-  dependencies:
-    "@babel/helper-plugin-utils": ^7.18.6
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: 0a0df61f94601e3666bf39f2cc26f5f7b22a94450fb93081edbed967bd752ce3f81d1227fefd3799f5ee2722171b5e28db61379234d1bb85b6ec689589f99d7e
-  languageName: node
-  linkType: hard
-
-"@babel/plugin-transform-block-scoping@npm:^7.0.0, @babel/plugin-transform-block-scoping@npm:^7.18.9":
-  version: 7.18.9
-  resolution: "@babel/plugin-transform-block-scoping@npm:7.18.9"
-  dependencies:
-    "@babel/helper-plugin-utils": ^7.18.9
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: f8064ea431eb7aa349dc5b6be87a650f912b48cd65afde917e8644f6f840d7f9d2ce4795f2aa3955aa5b23a73d4ad38abd03386ae109b4b8702b746c6d35bda3
-  languageName: node
-  linkType: hard
-
-"@babel/plugin-transform-classes@npm:^7.0.0, @babel/plugin-transform-classes@npm:^7.18.9":
-  version: 7.18.9
-  resolution: "@babel/plugin-transform-classes@npm:7.18.9"
-  dependencies:
-    "@babel/helper-annotate-as-pure": ^7.18.6
-    "@babel/helper-environment-visitor": ^7.18.9
-    "@babel/helper-function-name": ^7.18.9
-    "@babel/helper-optimise-call-expression": ^7.18.6
-    "@babel/helper-plugin-utils": ^7.18.9
-    "@babel/helper-replace-supers": ^7.18.9
-    "@babel/helper-split-export-declaration": ^7.18.6
-    globals: ^11.1.0
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: d7e953c0cf32af64e75db1277d2556c04635f32691ef462436897840be6f8021d4f85ee96134cb796a12dda549cf53346fedf96b671885f881bc4037c9d120ad
-  languageName: node
-  linkType: hard
-
-"@babel/plugin-transform-computed-properties@npm:^7.0.0, @babel/plugin-transform-computed-properties@npm:^7.18.9":
-  version: 7.18.9
-  resolution: "@babel/plugin-transform-computed-properties@npm:7.18.9"
-  dependencies:
-    "@babel/helper-plugin-utils": ^7.18.9
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: a6bfbea207827d77592628973c0e8cc3319db636506bdc6e81e21582de2e767890e6975b382d0511e9ec3773b9f43691185df90832883bbf9251f688d27fbc1d
-  languageName: node
-  linkType: hard
-
-"@babel/plugin-transform-destructuring@npm:^7.0.0, @babel/plugin-transform-destructuring@npm:^7.18.9":
-  version: 7.18.9
-  resolution: "@babel/plugin-transform-destructuring@npm:7.18.9"
-  dependencies:
-    "@babel/helper-plugin-utils": ^7.18.9
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: 1a9b85dff67fd248fa8a2488ef59df3eb4dd4ca6007ff7db9f780c7873630a13bc16cfb2ad8f4c4ca966e42978410d1e4b306545941fe62769f2683f34973acd
-  languageName: node
-  linkType: hard
-
-"@babel/plugin-transform-dotall-regex@npm:^7.18.6, @babel/plugin-transform-dotall-regex@npm:^7.4.4":
-  version: 7.18.6
-  resolution: "@babel/plugin-transform-dotall-regex@npm:7.18.6"
+  resolution: "@babel/plugin-syntax-unicode-sets-regex@npm:7.18.6"
   dependencies:
     "@babel/helper-create-regexp-features-plugin": ^7.18.6
     "@babel/helper-plugin-utils": ^7.18.6
   peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: cbe5d7063eb8f8cca24cd4827bc97f5641166509e58781a5f8aa47fb3d2d786ce4506a30fca2e01f61f18792783a5cb5d96bf5434c3dd1ad0de8c9cc625a53da
+    "@babel/core": ^7.0.0
+  checksum: a651d700fe63ff0ddfd7186f4ebc24447ca734f114433139e3c027bc94a900d013cf1ef2e2db8430425ba542e39ae160c3b05f06b59fd4656273a3df97679e9c
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-duplicate-keys@npm:^7.18.9":
-  version: 7.18.9
-  resolution: "@babel/plugin-transform-duplicate-keys@npm:7.18.9"
+"@babel/plugin-transform-arrow-functions@npm:^7.0.0, @babel/plugin-transform-arrow-functions@npm:^7.22.5":
+  version: 7.22.5
+  resolution: "@babel/plugin-transform-arrow-functions@npm:7.22.5"
   dependencies:
-    "@babel/helper-plugin-utils": ^7.18.9
+    "@babel/helper-plugin-utils": ^7.22.5
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 220bf4a9fec5c4d4a7b1de38810350260e8ea08481bf78332a464a21256a95f0df8cd56025f346238f09b04f8e86d4158fafc9f4af57abaef31637e3b58bd4fe
+  checksum: 35abb6c57062802c7ce8bd96b2ef2883e3124370c688bbd67609f7d2453802fb73944df8808f893b6c67de978eb2bcf87bbfe325e46d6f39b5fcb09ece11d01a
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-exponentiation-operator@npm:^7.18.6":
-  version: 7.18.6
-  resolution: "@babel/plugin-transform-exponentiation-operator@npm:7.18.6"
+"@babel/plugin-transform-async-generator-functions@npm:^7.22.10":
+  version: 7.22.11
+  resolution: "@babel/plugin-transform-async-generator-functions@npm:7.22.11"
   dependencies:
-    "@babel/helper-builder-binary-assignment-operator-visitor": ^7.18.6
-    "@babel/helper-plugin-utils": ^7.18.6
+    "@babel/helper-environment-visitor": ^7.22.5
+    "@babel/helper-plugin-utils": ^7.22.5
+    "@babel/helper-remap-async-to-generator": ^7.22.9
+    "@babel/plugin-syntax-async-generators": ^7.8.4
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 7f70222f6829c82a36005508d34ddbe6fd0974ae190683a8670dd6ff08669aaf51fef2209d7403f9bd543cb2d12b18458016c99a6ed0332ccedb3ea127b01229
+  checksum: f11227a1d2831972a7fe28ed54a618ee251547632dc384b2f291f9d8d6aae1177a68c6bbd7709ab78275fa84e757ae795ec08061d94f6f01826f02a35ee875d4
+  languageName: node
+  linkType: hard
+
+"@babel/plugin-transform-async-to-generator@npm:^7.22.5":
+  version: 7.22.5
+  resolution: "@babel/plugin-transform-async-to-generator@npm:7.22.5"
+  dependencies:
+    "@babel/helper-module-imports": ^7.22.5
+    "@babel/helper-plugin-utils": ^7.22.5
+    "@babel/helper-remap-async-to-generator": ^7.22.5
+  peerDependencies:
+    "@babel/core": ^7.0.0-0
+  checksum: b95f23f99dcb379a9f0a1c2a3bbea3f8dc0e1b16dc1ac8b484fe378370169290a7a63d520959a9ba1232837cf74a80e23f6facbe14fd42a3cda6d3c2d7168e62
+  languageName: node
+  linkType: hard
+
+"@babel/plugin-transform-block-scoped-functions@npm:^7.0.0, @babel/plugin-transform-block-scoped-functions@npm:^7.22.5":
+  version: 7.22.5
+  resolution: "@babel/plugin-transform-block-scoped-functions@npm:7.22.5"
+  dependencies:
+    "@babel/helper-plugin-utils": ^7.22.5
+  peerDependencies:
+    "@babel/core": ^7.0.0-0
+  checksum: 416b1341858e8ca4e524dee66044735956ced5f478b2c3b9bc11ec2285b0c25d7dbb96d79887169eb938084c95d0a89338c8b2fe70d473bd9dc92e5d9db1732c
+  languageName: node
+  linkType: hard
+
+"@babel/plugin-transform-block-scoping@npm:^7.0.0, @babel/plugin-transform-block-scoping@npm:^7.22.10":
+  version: 7.22.10
+  resolution: "@babel/plugin-transform-block-scoping@npm:7.22.10"
+  dependencies:
+    "@babel/helper-plugin-utils": ^7.22.5
+  peerDependencies:
+    "@babel/core": ^7.0.0-0
+  checksum: b1d06f358dedcb748a57e5feea4b9285c60593fb2912b921f22898c57c552c78fe18128678c8f84dd4ea1d4e5aebede8783830b24cd63f22c30261156d78bc77
+  languageName: node
+  linkType: hard
+
+"@babel/plugin-transform-class-properties@npm:^7.22.5":
+  version: 7.22.5
+  resolution: "@babel/plugin-transform-class-properties@npm:7.22.5"
+  dependencies:
+    "@babel/helper-create-class-features-plugin": ^7.22.5
+    "@babel/helper-plugin-utils": ^7.22.5
+  peerDependencies:
+    "@babel/core": ^7.0.0-0
+  checksum: b830152dfc2ff2f647f0abe76e6251babdfbef54d18c4b2c73a6bf76b1a00050a5d998dac80dc901a48514e95604324943a9dd39317073fe0928b559e0e0c579
+  languageName: node
+  linkType: hard
+
+"@babel/plugin-transform-class-static-block@npm:^7.22.5":
+  version: 7.22.11
+  resolution: "@babel/plugin-transform-class-static-block@npm:7.22.11"
+  dependencies:
+    "@babel/helper-create-class-features-plugin": ^7.22.11
+    "@babel/helper-plugin-utils": ^7.22.5
+    "@babel/plugin-syntax-class-static-block": ^7.14.5
+  peerDependencies:
+    "@babel/core": ^7.12.0
+  checksum: 69f040506fad66f1c6918d288d0e0edbc5c8a07c8b4462c1184ad2f9f08995d68b057126c213871c0853ae0c72afc60ec87492049dfacb20902e32346a448bcb
+  languageName: node
+  linkType: hard
+
+"@babel/plugin-transform-classes@npm:^7.0.0, @babel/plugin-transform-classes@npm:^7.22.6":
+  version: 7.22.6
+  resolution: "@babel/plugin-transform-classes@npm:7.22.6"
+  dependencies:
+    "@babel/helper-annotate-as-pure": ^7.22.5
+    "@babel/helper-compilation-targets": ^7.22.6
+    "@babel/helper-environment-visitor": ^7.22.5
+    "@babel/helper-function-name": ^7.22.5
+    "@babel/helper-optimise-call-expression": ^7.22.5
+    "@babel/helper-plugin-utils": ^7.22.5
+    "@babel/helper-replace-supers": ^7.22.5
+    "@babel/helper-split-export-declaration": ^7.22.6
+    globals: ^11.1.0
+  peerDependencies:
+    "@babel/core": ^7.0.0-0
+  checksum: 8380e855c01033dbc7460d9acfbc1fc37c880350fa798c2de8c594ef818ade0e4c96173ec72f05f2a4549d8d37135e18cb62548352d51557b45a0fb4388d2f3f
+  languageName: node
+  linkType: hard
+
+"@babel/plugin-transform-computed-properties@npm:^7.0.0, @babel/plugin-transform-computed-properties@npm:^7.22.5":
+  version: 7.22.5
+  resolution: "@babel/plugin-transform-computed-properties@npm:7.22.5"
+  dependencies:
+    "@babel/helper-plugin-utils": ^7.22.5
+    "@babel/template": ^7.22.5
+  peerDependencies:
+    "@babel/core": ^7.0.0-0
+  checksum: c2a77a0f94ec71efbc569109ec14ea2aa925b333289272ced8b33c6108bdbb02caf01830ffc7e49486b62dec51911924d13f3a76f1149f40daace1898009e131
+  languageName: node
+  linkType: hard
+
+"@babel/plugin-transform-destructuring@npm:^7.0.0, @babel/plugin-transform-destructuring@npm:^7.22.10":
+  version: 7.22.10
+  resolution: "@babel/plugin-transform-destructuring@npm:7.22.10"
+  dependencies:
+    "@babel/helper-plugin-utils": ^7.22.5
+  peerDependencies:
+    "@babel/core": ^7.0.0-0
+  checksum: 011707801bd0029fd4f0523d24d06fdc0cbe8c9da280d75728f76713d639c4dc976e1b56a1ba7bff25468f86867efb71c9b4cac81140adbdd0abf2324b19a8bb
+  languageName: node
+  linkType: hard
+
+"@babel/plugin-transform-dotall-regex@npm:^7.22.5":
+  version: 7.22.5
+  resolution: "@babel/plugin-transform-dotall-regex@npm:7.22.5"
+  dependencies:
+    "@babel/helper-create-regexp-features-plugin": ^7.22.5
+    "@babel/helper-plugin-utils": ^7.22.5
+  peerDependencies:
+    "@babel/core": ^7.0.0-0
+  checksum: 409b658d11e3082c8f69e9cdef2d96e4d6d11256f005772425fb230cc48fd05945edbfbcb709dab293a1a2f01f9c8a5bb7b4131e632b23264039d9f95864b453
+  languageName: node
+  linkType: hard
+
+"@babel/plugin-transform-duplicate-keys@npm:^7.22.5":
+  version: 7.22.5
+  resolution: "@babel/plugin-transform-duplicate-keys@npm:7.22.5"
+  dependencies:
+    "@babel/helper-plugin-utils": ^7.22.5
+  peerDependencies:
+    "@babel/core": ^7.0.0-0
+  checksum: bb1280fbabaab6fab2ede585df34900712698210a3bd413f4df5bae6d8c24be36b496c92722ae676a7a67d060a4624f4d6c23b923485f906bfba8773c69f55b4
+  languageName: node
+  linkType: hard
+
+"@babel/plugin-transform-dynamic-import@npm:^7.22.5":
+  version: 7.22.11
+  resolution: "@babel/plugin-transform-dynamic-import@npm:7.22.11"
+  dependencies:
+    "@babel/helper-plugin-utils": ^7.22.5
+    "@babel/plugin-syntax-dynamic-import": ^7.8.3
+  peerDependencies:
+    "@babel/core": ^7.0.0-0
+  checksum: 78fc9c532210bf9e8f231747f542318568ac360ee6c27e80853962c984283c73da3f8f8aebe83c2096090a435b356b092ed85de617a156cbe0729d847632be45
+  languageName: node
+  linkType: hard
+
+"@babel/plugin-transform-exponentiation-operator@npm:^7.22.5":
+  version: 7.22.5
+  resolution: "@babel/plugin-transform-exponentiation-operator@npm:7.22.5"
+  dependencies:
+    "@babel/helper-builder-binary-assignment-operator-visitor": ^7.22.5
+    "@babel/helper-plugin-utils": ^7.22.5
+  peerDependencies:
+    "@babel/core": ^7.0.0-0
+  checksum: f2d660c1b1d51ad5fec1cd5ad426a52187204068c4158f8c4aa977b31535c61b66898d532603eef21c15756827be8277f724c869b888d560f26d7fe848bb5eae
+  languageName: node
+  linkType: hard
+
+"@babel/plugin-transform-export-namespace-from@npm:^7.22.5":
+  version: 7.22.11
+  resolution: "@babel/plugin-transform-export-namespace-from@npm:7.22.11"
+  dependencies:
+    "@babel/helper-plugin-utils": ^7.22.5
+    "@babel/plugin-syntax-export-namespace-from": ^7.8.3
+  peerDependencies:
+    "@babel/core": ^7.0.0-0
+  checksum: 73af5883a321ed56a4bfd43c8a7de0164faebe619287706896fc6ee2f7a4e69042adaa1338c0b8b4bdb9f7e5fdceb016fb1d40694cb43ca3b8827429e8aac4bf
   languageName: node
   linkType: hard
 
@@ -2710,369 +2658,493 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-for-of@npm:^7.0.0, @babel/plugin-transform-for-of@npm:^7.18.8":
-  version: 7.18.8
-  resolution: "@babel/plugin-transform-for-of@npm:7.18.8"
+"@babel/plugin-transform-for-of@npm:^7.0.0, @babel/plugin-transform-for-of@npm:^7.22.5":
+  version: 7.22.5
+  resolution: "@babel/plugin-transform-for-of@npm:7.22.5"
   dependencies:
-    "@babel/helper-plugin-utils": ^7.18.6
+    "@babel/helper-plugin-utils": ^7.22.5
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: ca64c623cf0c7a80ab6f07ebd3e6e4ade95e2ae806696f70b43eafe6394fa8ce21f2b1ffdd15df2067f7363d2ecfe26472a97c6c774403d2163fa05f50c98f17
+  checksum: d7b8d4db010bce7273674caa95c4e6abd909362866ce297e86a2ecaa9ae636e05d525415811db9b3c942155df7f3651d19b91dd6c41f142f7308a97c7cb06023
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-function-name@npm:^7.0.0, @babel/plugin-transform-function-name@npm:^7.18.9":
-  version: 7.18.9
-  resolution: "@babel/plugin-transform-function-name@npm:7.18.9"
+"@babel/plugin-transform-function-name@npm:^7.0.0, @babel/plugin-transform-function-name@npm:^7.22.5":
+  version: 7.22.5
+  resolution: "@babel/plugin-transform-function-name@npm:7.22.5"
   dependencies:
-    "@babel/helper-compilation-targets": ^7.18.9
-    "@babel/helper-function-name": ^7.18.9
-    "@babel/helper-plugin-utils": ^7.18.9
+    "@babel/helper-compilation-targets": ^7.22.5
+    "@babel/helper-function-name": ^7.22.5
+    "@babel/helper-plugin-utils": ^7.22.5
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 62dd9c6cdc9714704efe15545e782ee52d74dc73916bf954b4d3bee088fb0ec9e3c8f52e751252433656c09f744b27b757fc06ed99bcde28e8a21600a1d8e597
+  checksum: cff3b876357999cb8ae30e439c3ec6b0491a53b0aa6f722920a4675a6dd5b53af97a833051df4b34791fe5b3dd326ccf769d5c8e45b322aa50ee11a660b17845
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-literals@npm:^7.0.0, @babel/plugin-transform-literals@npm:^7.18.9":
-  version: 7.18.9
-  resolution: "@babel/plugin-transform-literals@npm:7.18.9"
+"@babel/plugin-transform-json-strings@npm:^7.22.5":
+  version: 7.22.11
+  resolution: "@babel/plugin-transform-json-strings@npm:7.22.11"
   dependencies:
-    "@babel/helper-plugin-utils": ^7.18.9
+    "@babel/helper-plugin-utils": ^7.22.5
+    "@babel/plugin-syntax-json-strings": ^7.8.3
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 3458dd2f1a47ac51d9d607aa18f3d321cbfa8560a985199185bed5a906bb0c61ba85575d386460bac9aed43fdd98940041fae5a67dff286f6f967707cff489f8
+  checksum: 50665e5979e66358c50e90a26db53c55917f78175127ac2fa05c7888d156d418ffb930ec0a109353db0a7c5f57c756ce01bfc9825d24cbfd2b3ec453f2ed8cba
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-member-expression-literals@npm:^7.0.0, @babel/plugin-transform-member-expression-literals@npm:^7.18.6":
-  version: 7.18.6
-  resolution: "@babel/plugin-transform-member-expression-literals@npm:7.18.6"
+"@babel/plugin-transform-literals@npm:^7.0.0, @babel/plugin-transform-literals@npm:^7.22.5":
+  version: 7.22.5
+  resolution: "@babel/plugin-transform-literals@npm:7.22.5"
   dependencies:
-    "@babel/helper-plugin-utils": ^7.18.6
+    "@babel/helper-plugin-utils": ^7.22.5
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 35a3d04f6693bc6b298c05453d85ee6e41cc806538acb6928427e0e97ae06059f97d2f07d21495fcf5f70d3c13a242e2ecbd09d5c1fcb1b1a73ff528dcb0b695
+  checksum: ec37cc2ffb32667af935ab32fe28f00920ec8a1eb999aa6dc6602f2bebd8ba205a558aeedcdccdebf334381d5c57106c61f52332045730393e73410892a9735b
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-modules-amd@npm:^7.18.6":
-  version: 7.18.6
-  resolution: "@babel/plugin-transform-modules-amd@npm:7.18.6"
+"@babel/plugin-transform-logical-assignment-operators@npm:^7.22.5":
+  version: 7.22.11
+  resolution: "@babel/plugin-transform-logical-assignment-operators@npm:7.22.11"
   dependencies:
-    "@babel/helper-module-transforms": ^7.18.6
-    "@babel/helper-plugin-utils": ^7.18.6
-    babel-plugin-dynamic-import-node: ^2.3.3
+    "@babel/helper-plugin-utils": ^7.22.5
+    "@babel/plugin-syntax-logical-assignment-operators": ^7.10.4
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: f60c4c4e0eaec41e42c003cbab44305da7a8e05b2c9bdfc2b3fe0f9e1d7441c959ff5248aa03e350abe530e354028cbf3aa20bf07067b11510997dad8dd39be0
+  checksum: c664e9798e85afa7f92f07b867682dee7392046181d82f5d21bae6f2ca26dfe9c8375cdc52b7483c3fc09a983c1989f60eff9fbc4f373b0c0a74090553d05739
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-modules-commonjs@npm:^7.0.0, @babel/plugin-transform-modules-commonjs@npm:^7.13.8, @babel/plugin-transform-modules-commonjs@npm:^7.18.6":
-  version: 7.18.6
-  resolution: "@babel/plugin-transform-modules-commonjs@npm:7.18.6"
+"@babel/plugin-transform-member-expression-literals@npm:^7.0.0, @babel/plugin-transform-member-expression-literals@npm:^7.22.5":
+  version: 7.22.5
+  resolution: "@babel/plugin-transform-member-expression-literals@npm:7.22.5"
   dependencies:
-    "@babel/helper-module-transforms": ^7.18.6
-    "@babel/helper-plugin-utils": ^7.18.6
-    "@babel/helper-simple-access": ^7.18.6
-    babel-plugin-dynamic-import-node: ^2.3.3
+    "@babel/helper-plugin-utils": ^7.22.5
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 7e356e3df8a6a8542cced7491ec5b1cc1093a88d216a59e63a5d2b9fe9d193cbea864f680a41429e41a4f9ecec930aa5b0b8f57e2b17b3b4d27923bb12ba5d14
+  checksum: ec4b0e07915ddd4fda0142fd104ee61015c208608a84cfa13643a95d18760b1dc1ceb6c6e0548898b8c49e5959a994e46367260176dbabc4467f729b21868504
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-modules-systemjs@npm:^7.18.9":
-  version: 7.18.9
-  resolution: "@babel/plugin-transform-modules-systemjs@npm:7.18.9"
+"@babel/plugin-transform-modules-amd@npm:^7.22.5":
+  version: 7.22.5
+  resolution: "@babel/plugin-transform-modules-amd@npm:7.22.5"
   dependencies:
-    "@babel/helper-hoist-variables": ^7.18.6
-    "@babel/helper-module-transforms": ^7.18.9
-    "@babel/helper-plugin-utils": ^7.18.9
-    "@babel/helper-validator-identifier": ^7.18.6
-    babel-plugin-dynamic-import-node: ^2.3.3
+    "@babel/helper-module-transforms": ^7.22.5
+    "@babel/helper-plugin-utils": ^7.22.5
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 6122d9901ed5dc56d9db843efc9249fe20d769a11989bbbf5a806ed4f086def949185198aa767888481babf70fc52b6b3e297a991e2b02b4f34ffb03d998d1e3
+  checksum: 7da4c4ebbbcf7d182abb59b2046b22d86eee340caf8a22a39ef6a727da2d8acfec1f714fcdcd5054110b280e4934f735e80a6848d192b6834c5d4459a014f04d
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-modules-umd@npm:^7.18.6":
-  version: 7.18.6
-  resolution: "@babel/plugin-transform-modules-umd@npm:7.18.6"
+"@babel/plugin-transform-modules-commonjs@npm:^7.0.0, @babel/plugin-transform-modules-commonjs@npm:^7.13.8, @babel/plugin-transform-modules-commonjs@npm:^7.22.11, @babel/plugin-transform-modules-commonjs@npm:^7.22.5":
+  version: 7.22.11
+  resolution: "@babel/plugin-transform-modules-commonjs@npm:7.22.11"
   dependencies:
-    "@babel/helper-module-transforms": ^7.18.6
-    "@babel/helper-plugin-utils": ^7.18.6
+    "@babel/helper-module-transforms": ^7.22.9
+    "@babel/helper-plugin-utils": ^7.22.5
+    "@babel/helper-simple-access": ^7.22.5
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: c3b6796c6f4579f1ba5ab0cdcc73910c1e9c8e1e773c507c8bb4da33072b3ae5df73c6d68f9126dab6e99c24ea8571e1563f8710d7c421fac1cde1e434c20153
+  checksum: c15ad7f1234a930cab214224bb85f6b3a3f301fa1d4d15bef193e5c11c614ce369551e5cbb708fde8d3f7e1cb84b05e9798a3647a11b56c3d67580e362a712d4
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-named-capturing-groups-regex@npm:^7.18.6":
-  version: 7.18.6
-  resolution: "@babel/plugin-transform-named-capturing-groups-regex@npm:7.18.6"
+"@babel/plugin-transform-modules-systemjs@npm:^7.22.5":
+  version: 7.22.11
+  resolution: "@babel/plugin-transform-modules-systemjs@npm:7.22.11"
   dependencies:
-    "@babel/helper-create-regexp-features-plugin": ^7.18.6
-    "@babel/helper-plugin-utils": ^7.18.6
+    "@babel/helper-hoist-variables": ^7.22.5
+    "@babel/helper-module-transforms": ^7.22.9
+    "@babel/helper-plugin-utils": ^7.22.5
+    "@babel/helper-validator-identifier": ^7.22.5
+  peerDependencies:
+    "@babel/core": ^7.0.0-0
+  checksum: d0991e4bdc3352b6a9f4d12b6662e3645d892cd5c3c005ba5f14e65f1e218c6a8f7f4497e64a51d82a046e507aaa7db3143b800b0270dca1824cbd214ff3363d
+  languageName: node
+  linkType: hard
+
+"@babel/plugin-transform-modules-umd@npm:^7.22.5":
+  version: 7.22.5
+  resolution: "@babel/plugin-transform-modules-umd@npm:7.22.5"
+  dependencies:
+    "@babel/helper-module-transforms": ^7.22.5
+    "@babel/helper-plugin-utils": ^7.22.5
+  peerDependencies:
+    "@babel/core": ^7.0.0-0
+  checksum: 46622834c54c551b231963b867adbc80854881b3e516ff29984a8da989bd81665bd70e8cba6710345248e97166689310f544aee1a5773e262845a8f1b3e5b8b4
+  languageName: node
+  linkType: hard
+
+"@babel/plugin-transform-named-capturing-groups-regex@npm:^7.22.5":
+  version: 7.22.5
+  resolution: "@babel/plugin-transform-named-capturing-groups-regex@npm:7.22.5"
+  dependencies:
+    "@babel/helper-create-regexp-features-plugin": ^7.22.5
+    "@babel/helper-plugin-utils": ^7.22.5
   peerDependencies:
     "@babel/core": ^7.0.0
-  checksum: 6ef64aa3dad68df139eeaa7b6e9bb626be8f738ed5ed4db765d516944b1456d513b6bad3bb60fff22babe73de26436fd814a4228705b2d3d2fdb272c31da35e2
+  checksum: 3ee564ddee620c035b928fdc942c5d17e9c4b98329b76f9cefac65c111135d925eb94ed324064cd7556d4f5123beec79abea1d4b97d1c8a2a5c748887a2eb623
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-new-target@npm:^7.18.6":
-  version: 7.18.6
-  resolution: "@babel/plugin-transform-new-target@npm:7.18.6"
+"@babel/plugin-transform-new-target@npm:^7.22.5":
+  version: 7.22.5
+  resolution: "@babel/plugin-transform-new-target@npm:7.22.5"
   dependencies:
-    "@babel/helper-plugin-utils": ^7.18.6
+    "@babel/helper-plugin-utils": ^7.22.5
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: bd780e14f46af55d0ae8503b3cb81ca86dcc73ed782f177e74f498fff934754f9e9911df1f8f3bd123777eed7c1c1af4d66abab87c8daae5403e7719a6b845d1
+  checksum: 6b72112773487a881a1d6ffa680afde08bad699252020e86122180ee7a88854d5da3f15d9bca3331cf2e025df045604494a8208a2e63b486266b07c14e2ffbf3
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-object-super@npm:^7.0.0, @babel/plugin-transform-object-super@npm:^7.18.6":
-  version: 7.18.6
-  resolution: "@babel/plugin-transform-object-super@npm:7.18.6"
+"@babel/plugin-transform-nullish-coalescing-operator@npm:^7.22.5":
+  version: 7.22.11
+  resolution: "@babel/plugin-transform-nullish-coalescing-operator@npm:7.22.11"
   dependencies:
-    "@babel/helper-plugin-utils": ^7.18.6
-    "@babel/helper-replace-supers": ^7.18.6
+    "@babel/helper-plugin-utils": ^7.22.5
+    "@babel/plugin-syntax-nullish-coalescing-operator": ^7.8.3
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 0fcb04e15deea96ae047c21cb403607d49f06b23b4589055993365ebd7a7d7541334f06bf9642e90075e66efce6ebaf1eb0ef066fbbab802d21d714f1aac3aef
+  checksum: 167babecc8b8fe70796a7b7d34af667ebbf43da166c21689502e5e8cc93180b7a85979c77c9f64b7cce431b36718bd0a6df9e5e0ffea4ae22afb22cfef886372
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-parameters@npm:^7.0.0, @babel/plugin-transform-parameters@npm:^7.18.8":
-  version: 7.18.8
-  resolution: "@babel/plugin-transform-parameters@npm:7.18.8"
+"@babel/plugin-transform-numeric-separator@npm:^7.22.5":
+  version: 7.22.11
+  resolution: "@babel/plugin-transform-numeric-separator@npm:7.22.11"
   dependencies:
-    "@babel/helper-plugin-utils": ^7.18.6
+    "@babel/helper-plugin-utils": ^7.22.5
+    "@babel/plugin-syntax-numeric-separator": ^7.10.4
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 2b5863300da60face8a250d91da16294333bd5626e9721b13a3ba2078bd2a5a190e32c6e7a1323d5f547f579aeb2804ff49a62a55fcad2b1d099e55a55b788ea
+  checksum: af064d06a4a041767ec396a5f258103f64785df290e038bba9f0ef454e6c914f2ac45d862bbdad8fac2c7ad47fa4e95356f29053c60c100a0160b02a995fe2a3
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-property-literals@npm:^7.0.0, @babel/plugin-transform-property-literals@npm:^7.18.6":
-  version: 7.18.6
-  resolution: "@babel/plugin-transform-property-literals@npm:7.18.6"
+"@babel/plugin-transform-object-rest-spread@npm:^7.22.5":
+  version: 7.22.11
+  resolution: "@babel/plugin-transform-object-rest-spread@npm:7.22.11"
   dependencies:
-    "@babel/helper-plugin-utils": ^7.18.6
+    "@babel/compat-data": ^7.22.9
+    "@babel/helper-compilation-targets": ^7.22.10
+    "@babel/helper-plugin-utils": ^7.22.5
+    "@babel/plugin-syntax-object-rest-spread": ^7.8.3
+    "@babel/plugin-transform-parameters": ^7.22.5
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 1c16e64de554703f4b547541de2edda6c01346dd3031d4d29e881aa7733785cd26d53611a4ccf5353f4d3e69097bb0111c0a93ace9e683edd94fea28c4484144
+  checksum: b9c9ed8df8d6d7563eb42844d8e3e6748ba8f7568998230f7317bc49304db65828df48fc4b93bf4421772a6c9f7b389f3dd1c4e84379c17dd9ee223fb3fc5245
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-react-constant-elements@npm:^7.17.12":
-  version: 7.18.9
-  resolution: "@babel/plugin-transform-react-constant-elements@npm:7.18.9"
+"@babel/plugin-transform-object-super@npm:^7.0.0, @babel/plugin-transform-object-super@npm:^7.22.5":
+  version: 7.22.5
+  resolution: "@babel/plugin-transform-object-super@npm:7.22.5"
   dependencies:
-    "@babel/helper-plugin-utils": ^7.18.9
+    "@babel/helper-plugin-utils": ^7.22.5
+    "@babel/helper-replace-supers": ^7.22.5
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: bbdc4bc38317e62bb729d6d2b48bfac4cca52cb476a1a537a6fe693610852a6f2c3b3f616e1c73f17fb4b0dae551b1c96f898b7867a02ff2fbe3e858a346c767
+  checksum: b71887877d74cb64dbccb5c0324fa67e31171e6a5311991f626650e44a4083e5436a1eaa89da78c0474fb095d4ec322d63ee778b202d33aa2e4194e1ed8e62d7
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-react-display-name@npm:^7.0.0, @babel/plugin-transform-react-display-name@npm:^7.18.6":
-  version: 7.18.6
-  resolution: "@babel/plugin-transform-react-display-name@npm:7.18.6"
+"@babel/plugin-transform-optional-catch-binding@npm:^7.22.5":
+  version: 7.22.11
+  resolution: "@babel/plugin-transform-optional-catch-binding@npm:7.22.11"
   dependencies:
-    "@babel/helper-plugin-utils": ^7.18.6
+    "@babel/helper-plugin-utils": ^7.22.5
+    "@babel/plugin-syntax-optional-catch-binding": ^7.8.3
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 51c087ab9e41ef71a29335587da28417536c6f816c292e092ffc0e0985d2f032656801d4dd502213ce32481f4ba6c69402993ffa67f0818a07606ff811e4be49
+  checksum: f17abd90e1de67c84d63afea29c8021c74abb2794d3a6eeafb0bbe7372d3db32aefca386e392116ec63884537a4a2815d090d26264d259bacc08f6e3ed05294c
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-react-jsx-development@npm:^7.18.6":
-  version: 7.18.6
-  resolution: "@babel/plugin-transform-react-jsx-development@npm:7.18.6"
+"@babel/plugin-transform-optional-chaining@npm:^7.22.10, @babel/plugin-transform-optional-chaining@npm:^7.22.5":
+  version: 7.22.12
+  resolution: "@babel/plugin-transform-optional-chaining@npm:7.22.12"
   dependencies:
-    "@babel/plugin-transform-react-jsx": ^7.18.6
+    "@babel/helper-plugin-utils": ^7.22.5
+    "@babel/helper-skip-transparent-expression-wrappers": ^7.22.5
+    "@babel/plugin-syntax-optional-chaining": ^7.8.3
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: ec9fa65db66f938b75c45e99584367779ac3e0af8afc589187262e1337c7c4205ea312877813ae4df9fb93d766627b8968d74ac2ba702e4883b1dbbe4953ecee
+  checksum: 47065439bb721a0967cdcc83895700bb7b18b146b2ef27e43449d7b5a7130a2497afadddc42c616253858cac6732546646b9f0c581f4bb8a3d362baeb4c30bbb
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-react-jsx@npm:^7.0.0, @babel/plugin-transform-react-jsx@npm:^7.18.6":
-  version: 7.18.6
-  resolution: "@babel/plugin-transform-react-jsx@npm:7.18.6"
+"@babel/plugin-transform-parameters@npm:^7.0.0, @babel/plugin-transform-parameters@npm:^7.18.8, @babel/plugin-transform-parameters@npm:^7.22.5":
+  version: 7.22.5
+  resolution: "@babel/plugin-transform-parameters@npm:7.22.5"
   dependencies:
-    "@babel/helper-annotate-as-pure": ^7.18.6
-    "@babel/helper-module-imports": ^7.18.6
-    "@babel/helper-plugin-utils": ^7.18.6
-    "@babel/plugin-syntax-jsx": ^7.18.6
-    "@babel/types": ^7.18.6
+    "@babel/helper-plugin-utils": ^7.22.5
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 46129eaf1ab7a7a73e3e8c9d9859b630f5b381c5e19fb1559e2db7b943a7825b6715ad950623fb03fe7bd31ed618ce1d0bd539b13fa030a50c39d5a873a5ba00
+  checksum: b44f89cf97daf23903776ba27c2ab13b439d80d8c8a95be5c476ab65023b1e0c0e94c28d3745f3b60a58edc4e590fa0cd4287a0293e51401ca7d29a2ddb13b8e
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-react-pure-annotations@npm:^7.18.6":
-  version: 7.18.6
-  resolution: "@babel/plugin-transform-react-pure-annotations@npm:7.18.6"
+"@babel/plugin-transform-private-methods@npm:^7.22.5":
+  version: 7.22.5
+  resolution: "@babel/plugin-transform-private-methods@npm:7.22.5"
   dependencies:
-    "@babel/helper-annotate-as-pure": ^7.18.6
-    "@babel/helper-plugin-utils": ^7.18.6
+    "@babel/helper-create-class-features-plugin": ^7.22.5
+    "@babel/helper-plugin-utils": ^7.22.5
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 97c4873d409088f437f9084d084615948198dd87fc6723ada0e7e29c5a03623c2f3e03df3f52e7e7d4d23be32a08ea00818bff302812e48713c706713bd06219
+  checksum: 321479b4fcb6d3b3ef622ab22fd24001e43d46e680e8e41324c033d5810c84646e470f81b44cbcbef5c22e99030784f7cac92f1829974da7a47a60a7139082c3
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-regenerator@npm:^7.18.6":
-  version: 7.18.6
-  resolution: "@babel/plugin-transform-regenerator@npm:7.18.6"
+"@babel/plugin-transform-private-property-in-object@npm:^7.22.5":
+  version: 7.22.11
+  resolution: "@babel/plugin-transform-private-property-in-object@npm:7.22.11"
   dependencies:
-    "@babel/helper-plugin-utils": ^7.18.6
-    regenerator-transform: ^0.15.0
+    "@babel/helper-annotate-as-pure": ^7.22.5
+    "@babel/helper-create-class-features-plugin": ^7.22.11
+    "@babel/helper-plugin-utils": ^7.22.5
+    "@babel/plugin-syntax-private-property-in-object": ^7.14.5
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 60bd482cb0343c714f85c3e19a13b3b5fa05ee336c079974091c0b35e263307f4e661f4555dff90707a87d5efe19b1d51835db44455405444ac1813e268ad750
+  checksum: 4d029d84901e53c46dead7a46e2990a7bc62470f4e4ca58a0d063394f86652fd58fe4eea1eb941da3669cd536b559b9d058b342b59300026346b7a2a51badac8
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-reserved-words@npm:^7.18.6":
-  version: 7.18.6
-  resolution: "@babel/plugin-transform-reserved-words@npm:7.18.6"
+"@babel/plugin-transform-property-literals@npm:^7.0.0, @babel/plugin-transform-property-literals@npm:^7.22.5":
+  version: 7.22.5
+  resolution: "@babel/plugin-transform-property-literals@npm:7.22.5"
   dependencies:
-    "@babel/helper-plugin-utils": ^7.18.6
+    "@babel/helper-plugin-utils": ^7.22.5
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 0738cdc30abdae07c8ec4b233b30c31f68b3ff0eaa40eddb45ae607c066127f5fa99ddad3c0177d8e2832e3a7d3ad115775c62b431ebd6189c40a951b867a80c
+  checksum: 796176a3176106f77fcb8cd04eb34a8475ce82d6d03a88db089531b8f0453a2fb8b0c6ec9a52c27948bc0ea478becec449893741fc546dfc3930ab927e3f9f2e
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-shorthand-properties@npm:^7.0.0, @babel/plugin-transform-shorthand-properties@npm:^7.18.6":
-  version: 7.18.6
-  resolution: "@babel/plugin-transform-shorthand-properties@npm:7.18.6"
+"@babel/plugin-transform-react-constant-elements@npm:^7.18.12":
+  version: 7.22.5
+  resolution: "@babel/plugin-transform-react-constant-elements@npm:7.22.5"
   dependencies:
-    "@babel/helper-plugin-utils": ^7.18.6
+    "@babel/helper-plugin-utils": ^7.22.5
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: b8e4e8acc2700d1e0d7d5dbfd4fdfb935651913de6be36e6afb7e739d8f9ca539a5150075a0f9b79c88be25ddf45abb912fe7abf525f0b80f5b9d9860de685d7
+  checksum: 596db90e37174dd703f4859fef3c86156a7c8564d8351168ac6fdca79c912ef8b8746ae04516ac3909d2cc750702d58d451badacb3c54ea998938ad05d99f9d2
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-spread@npm:^7.0.0, @babel/plugin-transform-spread@npm:^7.18.9":
-  version: 7.18.9
-  resolution: "@babel/plugin-transform-spread@npm:7.18.9"
+"@babel/plugin-transform-react-display-name@npm:^7.0.0, @babel/plugin-transform-react-display-name@npm:^7.22.5":
+  version: 7.22.5
+  resolution: "@babel/plugin-transform-react-display-name@npm:7.22.5"
   dependencies:
-    "@babel/helper-plugin-utils": ^7.18.9
-    "@babel/helper-skip-transparent-expression-wrappers": ^7.18.9
+    "@babel/helper-plugin-utils": ^7.22.5
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 59489dd6212bd21debdf77746d9fa02dfe36f7062dc08742b8841d04312a26ea37bc0d71c71a6e37c3ab81dce744faa7f23fa94b0915593458f6adc35c087766
+  checksum: a12bfd1e4e93055efca3ace3c34722571bda59d9740dca364d225d9c6e3ca874f134694d21715c42cc63d79efd46db9665bd4a022998767f9245f1e29d5d204d
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-sticky-regex@npm:^7.18.6":
-  version: 7.18.6
-  resolution: "@babel/plugin-transform-sticky-regex@npm:7.18.6"
+"@babel/plugin-transform-react-jsx-development@npm:^7.22.5":
+  version: 7.22.5
+  resolution: "@babel/plugin-transform-react-jsx-development@npm:7.22.5"
   dependencies:
-    "@babel/helper-plugin-utils": ^7.18.6
+    "@babel/plugin-transform-react-jsx": ^7.22.5
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 68ea18884ae9723443ffa975eb736c8c0d751265859cd3955691253f7fee37d7a0f7efea96c8a062876af49a257a18ea0ed5fea0d95a7b3611ce40f7ee23aee3
+  checksum: 36bc3ff0b96bb0ef4723070a50cfdf2e72cfd903a59eba448f9fe92fea47574d6f22efd99364413719e1f3fb3c51b6c9b2990b87af088f8486a84b2a5f9e4560
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-template-literals@npm:^7.0.0, @babel/plugin-transform-template-literals@npm:^7.18.9":
-  version: 7.18.9
-  resolution: "@babel/plugin-transform-template-literals@npm:7.18.9"
+"@babel/plugin-transform-react-jsx@npm:^7.0.0, @babel/plugin-transform-react-jsx@npm:^7.22.5":
+  version: 7.22.5
+  resolution: "@babel/plugin-transform-react-jsx@npm:7.22.5"
   dependencies:
-    "@babel/helper-plugin-utils": ^7.18.9
+    "@babel/helper-annotate-as-pure": ^7.22.5
+    "@babel/helper-module-imports": ^7.22.5
+    "@babel/helper-plugin-utils": ^7.22.5
+    "@babel/plugin-syntax-jsx": ^7.22.5
+    "@babel/types": ^7.22.5
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 3d2fcd79b7c345917f69b92a85bdc3ddd68ce2c87dc70c7d61a8373546ccd1f5cb8adc8540b49dfba08e1b82bb7b3bbe23a19efdb2b9c994db2db42906ca9fb2
+  checksum: c8f93f29f32cf79683ca2b8958fd62f38155674846ef27a7d4b6fbeb8713c37257418391731b58ff8024ec37b888bed5960e615a3f552e28245d2082e7f2a2df
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-typeof-symbol@npm:^7.18.9":
-  version: 7.18.9
-  resolution: "@babel/plugin-transform-typeof-symbol@npm:7.18.9"
+"@babel/plugin-transform-react-pure-annotations@npm:^7.22.5":
+  version: 7.22.5
+  resolution: "@babel/plugin-transform-react-pure-annotations@npm:7.22.5"
   dependencies:
-    "@babel/helper-plugin-utils": ^7.18.9
+    "@babel/helper-annotate-as-pure": ^7.22.5
+    "@babel/helper-plugin-utils": ^7.22.5
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: e754e0d8b8a028c52e10c148088606e3f7a9942c57bd648fc0438e5b4868db73c386a5ed47ab6d6f0594aae29ee5ffc2ffc0f7ebee7fae560a066d6dea811cd4
+  checksum: 092021c4f404e267002099ec20b3f12dd730cb90b0d83c5feed3dc00dbe43b9c42c795a18e7c6c7d7bddea20c7dd56221b146aec81b37f2e7eb5137331c61120
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-typescript@npm:^7.18.6":
-  version: 7.18.8
-  resolution: "@babel/plugin-transform-typescript@npm:7.18.8"
+"@babel/plugin-transform-regenerator@npm:^7.22.10":
+  version: 7.22.10
+  resolution: "@babel/plugin-transform-regenerator@npm:7.22.10"
   dependencies:
-    "@babel/helper-create-class-features-plugin": ^7.18.6
-    "@babel/helper-plugin-utils": ^7.18.6
-    "@babel/plugin-syntax-typescript": ^7.18.6
+    "@babel/helper-plugin-utils": ^7.22.5
+    regenerator-transform: ^0.15.2
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 627211f1658870274fcabf38a71bb08ae219e3ac672423083574fabe2c857f28d39243cb7279adada8468c912a7beebc0622770ed66885a1e33b84ccc8bfd7df
+  checksum: e13678d62d6fa96f11cb8b863f00e8693491e7adc88bfca3f2820f80cbac8336e7dec3a596eee6a1c4663b7ececc3564f2cd7fb44ed6d4ce84ac2bb7f39ecc6e
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-unicode-escapes@npm:^7.18.6":
-  version: 7.18.6
-  resolution: "@babel/plugin-transform-unicode-escapes@npm:7.18.6"
+"@babel/plugin-transform-reserved-words@npm:^7.22.5":
+  version: 7.22.5
+  resolution: "@babel/plugin-transform-reserved-words@npm:7.22.5"
   dependencies:
-    "@babel/helper-plugin-utils": ^7.18.6
+    "@babel/helper-plugin-utils": ^7.22.5
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 297a03706723164a777263f76a8d89bccfb1d3fbc5e1075079dfd84372a5416d579da7d44c650abf935a1150a995bfce0e61966447b657f958e51c4ea45b72dc
+  checksum: 3ffd7dbc425fe8132bfec118b9817572799cab1473113a635d25ab606c1f5a2341a636c04cf6b22df3813320365ed5a965b5eeb3192320a10e4cc2c137bd8bfc
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-unicode-regex@npm:^7.18.6":
-  version: 7.18.6
-  resolution: "@babel/plugin-transform-unicode-regex@npm:7.18.6"
+"@babel/plugin-transform-shorthand-properties@npm:^7.0.0, @babel/plugin-transform-shorthand-properties@npm:^7.22.5":
+  version: 7.22.5
+  resolution: "@babel/plugin-transform-shorthand-properties@npm:7.22.5"
   dependencies:
-    "@babel/helper-create-regexp-features-plugin": ^7.18.6
-    "@babel/helper-plugin-utils": ^7.18.6
+    "@babel/helper-plugin-utils": ^7.22.5
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: d9e18d57536a2d317fb0b7c04f8f55347f3cfacb75e636b4c6fa2080ab13a3542771b5120e726b598b815891fc606d1472ac02b749c69fd527b03847f22dc25e
+  checksum: a5ac902c56ea8effa99f681340ee61bac21094588f7aef0bc01dff98246651702e677552fa6d10e548c4ac22a3ffad047dd2f8c8f0540b68316c2c203e56818b
   languageName: node
   linkType: hard
 
-"@babel/preset-env@npm:^7.18.2":
-  version: 7.18.9
-  resolution: "@babel/preset-env@npm:7.18.9"
+"@babel/plugin-transform-spread@npm:^7.0.0, @babel/plugin-transform-spread@npm:^7.22.5":
+  version: 7.22.5
+  resolution: "@babel/plugin-transform-spread@npm:7.22.5"
   dependencies:
-    "@babel/compat-data": ^7.18.8
-    "@babel/helper-compilation-targets": ^7.18.9
-    "@babel/helper-plugin-utils": ^7.18.9
-    "@babel/helper-validator-option": ^7.18.6
-    "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": ^7.18.6
-    "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": ^7.18.9
-    "@babel/plugin-proposal-async-generator-functions": ^7.18.6
-    "@babel/plugin-proposal-class-properties": ^7.18.6
-    "@babel/plugin-proposal-class-static-block": ^7.18.6
-    "@babel/plugin-proposal-dynamic-import": ^7.18.6
-    "@babel/plugin-proposal-export-namespace-from": ^7.18.9
-    "@babel/plugin-proposal-json-strings": ^7.18.6
-    "@babel/plugin-proposal-logical-assignment-operators": ^7.18.9
-    "@babel/plugin-proposal-nullish-coalescing-operator": ^7.18.6
-    "@babel/plugin-proposal-numeric-separator": ^7.18.6
-    "@babel/plugin-proposal-object-rest-spread": ^7.18.9
-    "@babel/plugin-proposal-optional-catch-binding": ^7.18.6
-    "@babel/plugin-proposal-optional-chaining": ^7.18.9
-    "@babel/plugin-proposal-private-methods": ^7.18.6
-    "@babel/plugin-proposal-private-property-in-object": ^7.18.6
-    "@babel/plugin-proposal-unicode-property-regex": ^7.18.6
+    "@babel/helper-plugin-utils": ^7.22.5
+    "@babel/helper-skip-transparent-expression-wrappers": ^7.22.5
+  peerDependencies:
+    "@babel/core": ^7.0.0-0
+  checksum: 5587f0deb60b3dfc9b274e269031cc45ec75facccf1933ea2ea71ced9fd3ce98ed91bb36d6cd26817c14474b90ed998c5078415f0eab531caf301496ce24c95c
+  languageName: node
+  linkType: hard
+
+"@babel/plugin-transform-sticky-regex@npm:^7.22.5":
+  version: 7.22.5
+  resolution: "@babel/plugin-transform-sticky-regex@npm:7.22.5"
+  dependencies:
+    "@babel/helper-plugin-utils": ^7.22.5
+  peerDependencies:
+    "@babel/core": ^7.0.0-0
+  checksum: 63b2c575e3e7f96c32d52ed45ee098fb7d354b35c2223b8c8e76840b32cc529ee0c0ceb5742fd082e56e91e3d82842a367ce177e82b05039af3d602c9627a729
+  languageName: node
+  linkType: hard
+
+"@babel/plugin-transform-template-literals@npm:^7.0.0, @babel/plugin-transform-template-literals@npm:^7.22.5":
+  version: 7.22.5
+  resolution: "@babel/plugin-transform-template-literals@npm:7.22.5"
+  dependencies:
+    "@babel/helper-plugin-utils": ^7.22.5
+  peerDependencies:
+    "@babel/core": ^7.0.0-0
+  checksum: 27e9bb030654cb425381c69754be4abe6a7c75b45cd7f962cd8d604b841b2f0fb7b024f2efc1c25cc53f5b16d79d5e8cfc47cacbdaa983895b3aeefa3e7e24ff
+  languageName: node
+  linkType: hard
+
+"@babel/plugin-transform-typeof-symbol@npm:^7.22.5":
+  version: 7.22.5
+  resolution: "@babel/plugin-transform-typeof-symbol@npm:7.22.5"
+  dependencies:
+    "@babel/helper-plugin-utils": ^7.22.5
+  peerDependencies:
+    "@babel/core": ^7.0.0-0
+  checksum: 82a53a63ffc3010b689ca9a54e5f53b2718b9f4b4a9818f36f9b7dba234f38a01876680553d2716a645a61920b5e6e4aaf8d4a0064add379b27ca0b403049512
+  languageName: node
+  linkType: hard
+
+"@babel/plugin-transform-typescript@npm:^7.22.11":
+  version: 7.22.11
+  resolution: "@babel/plugin-transform-typescript@npm:7.22.11"
+  dependencies:
+    "@babel/helper-annotate-as-pure": ^7.22.5
+    "@babel/helper-create-class-features-plugin": ^7.22.11
+    "@babel/helper-plugin-utils": ^7.22.5
+    "@babel/plugin-syntax-typescript": ^7.22.5
+  peerDependencies:
+    "@babel/core": ^7.0.0-0
+  checksum: a0dc3c2427b55602944705c9a91b4c074524badd5ea87edb603ddeabe7fae531bcbe68475106d7a00079b67bb422dbf2e9f50e15c25ac24d7e9fe77f37ebcfb4
+  languageName: node
+  linkType: hard
+
+"@babel/plugin-transform-unicode-escapes@npm:^7.22.10":
+  version: 7.22.10
+  resolution: "@babel/plugin-transform-unicode-escapes@npm:7.22.10"
+  dependencies:
+    "@babel/helper-plugin-utils": ^7.22.5
+  peerDependencies:
+    "@babel/core": ^7.0.0-0
+  checksum: 807f40ed1324c8cb107c45358f1903384ca3f0ef1d01c5a3c5c9b271c8d8eec66936a3dcc8d75ddfceea9421420368c2e77ae3adef0a50557e778dfe296bf382
+  languageName: node
+  linkType: hard
+
+"@babel/plugin-transform-unicode-property-regex@npm:^7.22.5":
+  version: 7.22.5
+  resolution: "@babel/plugin-transform-unicode-property-regex@npm:7.22.5"
+  dependencies:
+    "@babel/helper-create-regexp-features-plugin": ^7.22.5
+    "@babel/helper-plugin-utils": ^7.22.5
+  peerDependencies:
+    "@babel/core": ^7.0.0-0
+  checksum: 2495e5f663cb388e3d888b4ba3df419ac436a5012144ac170b622ddfc221f9ea9bdba839fa2bc0185cb776b578030666406452ec7791cbf0e7a3d4c88ae9574c
+  languageName: node
+  linkType: hard
+
+"@babel/plugin-transform-unicode-regex@npm:^7.22.5":
+  version: 7.22.5
+  resolution: "@babel/plugin-transform-unicode-regex@npm:7.22.5"
+  dependencies:
+    "@babel/helper-create-regexp-features-plugin": ^7.22.5
+    "@babel/helper-plugin-utils": ^7.22.5
+  peerDependencies:
+    "@babel/core": ^7.0.0-0
+  checksum: 6b5d1404c8c623b0ec9bd436c00d885a17d6a34f3f2597996343ddb9d94f6379705b21582dfd4cec2c47fd34068872e74ab6b9580116c0566b3f9447e2a7fa06
+  languageName: node
+  linkType: hard
+
+"@babel/plugin-transform-unicode-sets-regex@npm:^7.22.5":
+  version: 7.22.5
+  resolution: "@babel/plugin-transform-unicode-sets-regex@npm:7.22.5"
+  dependencies:
+    "@babel/helper-create-regexp-features-plugin": ^7.22.5
+    "@babel/helper-plugin-utils": ^7.22.5
+  peerDependencies:
+    "@babel/core": ^7.0.0
+  checksum: c042070f980b139547f8b0179efbc049ac5930abec7fc26ed7a41d89a048d8ab17d362200e204b6f71c3c20d6991a0e74415e1a412a49adc8131c2a40c04822e
+  languageName: node
+  linkType: hard
+
+"@babel/preset-env@npm:^7.19.4":
+  version: 7.22.10
+  resolution: "@babel/preset-env@npm:7.22.10"
+  dependencies:
+    "@babel/compat-data": ^7.22.9
+    "@babel/helper-compilation-targets": ^7.22.10
+    "@babel/helper-plugin-utils": ^7.22.5
+    "@babel/helper-validator-option": ^7.22.5
+    "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": ^7.22.5
+    "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": ^7.22.5
+    "@babel/plugin-proposal-private-property-in-object": 7.21.0-placeholder-for-preset-env.2
     "@babel/plugin-syntax-async-generators": ^7.8.4
     "@babel/plugin-syntax-class-properties": ^7.12.13
     "@babel/plugin-syntax-class-static-block": ^7.14.5
     "@babel/plugin-syntax-dynamic-import": ^7.8.3
     "@babel/plugin-syntax-export-namespace-from": ^7.8.3
-    "@babel/plugin-syntax-import-assertions": ^7.18.6
+    "@babel/plugin-syntax-import-assertions": ^7.22.5
+    "@babel/plugin-syntax-import-attributes": ^7.22.5
+    "@babel/plugin-syntax-import-meta": ^7.10.4
     "@babel/plugin-syntax-json-strings": ^7.8.3
     "@babel/plugin-syntax-logical-assignment-operators": ^7.10.4
     "@babel/plugin-syntax-nullish-coalescing-operator": ^7.8.3
@@ -3082,48 +3154,65 @@ __metadata:
     "@babel/plugin-syntax-optional-chaining": ^7.8.3
     "@babel/plugin-syntax-private-property-in-object": ^7.14.5
     "@babel/plugin-syntax-top-level-await": ^7.14.5
-    "@babel/plugin-transform-arrow-functions": ^7.18.6
-    "@babel/plugin-transform-async-to-generator": ^7.18.6
-    "@babel/plugin-transform-block-scoped-functions": ^7.18.6
-    "@babel/plugin-transform-block-scoping": ^7.18.9
-    "@babel/plugin-transform-classes": ^7.18.9
-    "@babel/plugin-transform-computed-properties": ^7.18.9
-    "@babel/plugin-transform-destructuring": ^7.18.9
-    "@babel/plugin-transform-dotall-regex": ^7.18.6
-    "@babel/plugin-transform-duplicate-keys": ^7.18.9
-    "@babel/plugin-transform-exponentiation-operator": ^7.18.6
-    "@babel/plugin-transform-for-of": ^7.18.8
-    "@babel/plugin-transform-function-name": ^7.18.9
-    "@babel/plugin-transform-literals": ^7.18.9
-    "@babel/plugin-transform-member-expression-literals": ^7.18.6
-    "@babel/plugin-transform-modules-amd": ^7.18.6
-    "@babel/plugin-transform-modules-commonjs": ^7.18.6
-    "@babel/plugin-transform-modules-systemjs": ^7.18.9
-    "@babel/plugin-transform-modules-umd": ^7.18.6
-    "@babel/plugin-transform-named-capturing-groups-regex": ^7.18.6
-    "@babel/plugin-transform-new-target": ^7.18.6
-    "@babel/plugin-transform-object-super": ^7.18.6
-    "@babel/plugin-transform-parameters": ^7.18.8
-    "@babel/plugin-transform-property-literals": ^7.18.6
-    "@babel/plugin-transform-regenerator": ^7.18.6
-    "@babel/plugin-transform-reserved-words": ^7.18.6
-    "@babel/plugin-transform-shorthand-properties": ^7.18.6
-    "@babel/plugin-transform-spread": ^7.18.9
-    "@babel/plugin-transform-sticky-regex": ^7.18.6
-    "@babel/plugin-transform-template-literals": ^7.18.9
-    "@babel/plugin-transform-typeof-symbol": ^7.18.9
-    "@babel/plugin-transform-unicode-escapes": ^7.18.6
-    "@babel/plugin-transform-unicode-regex": ^7.18.6
-    "@babel/preset-modules": ^0.1.5
-    "@babel/types": ^7.18.9
-    babel-plugin-polyfill-corejs2: ^0.3.1
-    babel-plugin-polyfill-corejs3: ^0.5.2
-    babel-plugin-polyfill-regenerator: ^0.3.1
-    core-js-compat: ^3.22.1
-    semver: ^6.3.0
+    "@babel/plugin-syntax-unicode-sets-regex": ^7.18.6
+    "@babel/plugin-transform-arrow-functions": ^7.22.5
+    "@babel/plugin-transform-async-generator-functions": ^7.22.10
+    "@babel/plugin-transform-async-to-generator": ^7.22.5
+    "@babel/plugin-transform-block-scoped-functions": ^7.22.5
+    "@babel/plugin-transform-block-scoping": ^7.22.10
+    "@babel/plugin-transform-class-properties": ^7.22.5
+    "@babel/plugin-transform-class-static-block": ^7.22.5
+    "@babel/plugin-transform-classes": ^7.22.6
+    "@babel/plugin-transform-computed-properties": ^7.22.5
+    "@babel/plugin-transform-destructuring": ^7.22.10
+    "@babel/plugin-transform-dotall-regex": ^7.22.5
+    "@babel/plugin-transform-duplicate-keys": ^7.22.5
+    "@babel/plugin-transform-dynamic-import": ^7.22.5
+    "@babel/plugin-transform-exponentiation-operator": ^7.22.5
+    "@babel/plugin-transform-export-namespace-from": ^7.22.5
+    "@babel/plugin-transform-for-of": ^7.22.5
+    "@babel/plugin-transform-function-name": ^7.22.5
+    "@babel/plugin-transform-json-strings": ^7.22.5
+    "@babel/plugin-transform-literals": ^7.22.5
+    "@babel/plugin-transform-logical-assignment-operators": ^7.22.5
+    "@babel/plugin-transform-member-expression-literals": ^7.22.5
+    "@babel/plugin-transform-modules-amd": ^7.22.5
+    "@babel/plugin-transform-modules-commonjs": ^7.22.5
+    "@babel/plugin-transform-modules-systemjs": ^7.22.5
+    "@babel/plugin-transform-modules-umd": ^7.22.5
+    "@babel/plugin-transform-named-capturing-groups-regex": ^7.22.5
+    "@babel/plugin-transform-new-target": ^7.22.5
+    "@babel/plugin-transform-nullish-coalescing-operator": ^7.22.5
+    "@babel/plugin-transform-numeric-separator": ^7.22.5
+    "@babel/plugin-transform-object-rest-spread": ^7.22.5
+    "@babel/plugin-transform-object-super": ^7.22.5
+    "@babel/plugin-transform-optional-catch-binding": ^7.22.5
+    "@babel/plugin-transform-optional-chaining": ^7.22.10
+    "@babel/plugin-transform-parameters": ^7.22.5
+    "@babel/plugin-transform-private-methods": ^7.22.5
+    "@babel/plugin-transform-private-property-in-object": ^7.22.5
+    "@babel/plugin-transform-property-literals": ^7.22.5
+    "@babel/plugin-transform-regenerator": ^7.22.10
+    "@babel/plugin-transform-reserved-words": ^7.22.5
+    "@babel/plugin-transform-shorthand-properties": ^7.22.5
+    "@babel/plugin-transform-spread": ^7.22.5
+    "@babel/plugin-transform-sticky-regex": ^7.22.5
+    "@babel/plugin-transform-template-literals": ^7.22.5
+    "@babel/plugin-transform-typeof-symbol": ^7.22.5
+    "@babel/plugin-transform-unicode-escapes": ^7.22.10
+    "@babel/plugin-transform-unicode-property-regex": ^7.22.5
+    "@babel/plugin-transform-unicode-regex": ^7.22.5
+    "@babel/plugin-transform-unicode-sets-regex": ^7.22.5
+    "@babel/preset-modules": 0.1.6-no-external-plugins
+    "@babel/types": ^7.22.10
+    babel-plugin-polyfill-corejs2: ^0.4.5
+    babel-plugin-polyfill-corejs3: ^0.8.3
+    babel-plugin-polyfill-regenerator: ^0.5.2
+    core-js-compat: ^3.31.0
+    semver: ^6.3.1
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 311002b9255d1aa261afe712ab73a93687652437804e2f44e6cc55438f8b199463f53bb2b8e0912b0034f208a42eee664a9e126a6061ca504a792ede97dd027e
+  checksum: 4145a660a7b05e21e6d8b6cdf348c6931238abb15282a258bdb5e04cd3cca9356dc120ecfe0d1b977819ade4aac50163127c86db2300227ff60392d24daa0b7c
   languageName: node
   linkType: hard
 
@@ -3140,47 +3229,47 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/preset-modules@npm:^0.1.5":
-  version: 0.1.5
-  resolution: "@babel/preset-modules@npm:0.1.5"
+"@babel/preset-modules@npm:0.1.6-no-external-plugins":
+  version: 0.1.6-no-external-plugins
+  resolution: "@babel/preset-modules@npm:0.1.6-no-external-plugins"
   dependencies:
     "@babel/helper-plugin-utils": ^7.0.0
-    "@babel/plugin-proposal-unicode-property-regex": ^7.4.4
-    "@babel/plugin-transform-dotall-regex": ^7.4.4
     "@babel/types": ^7.4.4
     esutils: ^2.0.2
   peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: 8430e0e9e9d520b53e22e8c4c6a5a080a12b63af6eabe559c2310b187bd62ae113f3da82ba33e9d1d0f3230930ca702843aae9dd226dec51f7d7114dc1f51c10
+    "@babel/core": ^7.0.0-0 || ^8.0.0-0 <8.0.0
+  checksum: 4855e799bc50f2449fb5210f78ea9e8fd46cf4f242243f1e2ed838e2bd702e25e73e822e7f8447722a5f4baa5e67a8f7a0e403f3e7ce04540ff743a9c411c375
   languageName: node
   linkType: hard
 
-"@babel/preset-react@npm:^7.17.12":
-  version: 7.18.6
-  resolution: "@babel/preset-react@npm:7.18.6"
+"@babel/preset-react@npm:^7.18.6":
+  version: 7.22.5
+  resolution: "@babel/preset-react@npm:7.22.5"
   dependencies:
-    "@babel/helper-plugin-utils": ^7.18.6
-    "@babel/helper-validator-option": ^7.18.6
-    "@babel/plugin-transform-react-display-name": ^7.18.6
-    "@babel/plugin-transform-react-jsx": ^7.18.6
-    "@babel/plugin-transform-react-jsx-development": ^7.18.6
-    "@babel/plugin-transform-react-pure-annotations": ^7.18.6
+    "@babel/helper-plugin-utils": ^7.22.5
+    "@babel/helper-validator-option": ^7.22.5
+    "@babel/plugin-transform-react-display-name": ^7.22.5
+    "@babel/plugin-transform-react-jsx": ^7.22.5
+    "@babel/plugin-transform-react-jsx-development": ^7.22.5
+    "@babel/plugin-transform-react-pure-annotations": ^7.22.5
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 540d9cf0a0cc0bb07e6879994e6fb7152f87dafbac880b56b65e2f528134c7ba33e0cd140b58700c77b2ebf4c81fa6468fed0ba391462d75efc7f8c1699bb4c3
+  checksum: b977c7ee83e93f62d77e61929ca3d97e5291e026e2f025a1b8b7ac9186486ed56c7d5bc36f0becabe0c24e8c42a4e4f2243a3cf841384cfafc3204c5d3e6c619
   languageName: node
   linkType: hard
 
-"@babel/preset-typescript@npm:^7.13.0, @babel/preset-typescript@npm:^7.17.12":
-  version: 7.18.6
-  resolution: "@babel/preset-typescript@npm:7.18.6"
+"@babel/preset-typescript@npm:^7.13.0, @babel/preset-typescript@npm:^7.18.6":
+  version: 7.22.11
+  resolution: "@babel/preset-typescript@npm:7.22.11"
   dependencies:
-    "@babel/helper-plugin-utils": ^7.18.6
-    "@babel/helper-validator-option": ^7.18.6
-    "@babel/plugin-transform-typescript": ^7.18.6
+    "@babel/helper-plugin-utils": ^7.22.5
+    "@babel/helper-validator-option": ^7.22.5
+    "@babel/plugin-syntax-jsx": ^7.22.5
+    "@babel/plugin-transform-modules-commonjs": ^7.22.11
+    "@babel/plugin-transform-typescript": ^7.22.11
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 7fe0da5103eb72d3cf39cf3e138a794c8cdd19c0b38e3e101507eef519c46a87a0d6d0e8bc9e28a13ea2364001ebe7430b9d75758aab4c3c3a8db9a487b9dc7c
+  checksum: 8ae7162c31db896f5eeecd6f67ab2e58555fdc06fe84e95fe4a3f60b64cd6f782d2d7dfbde0c0eac04b55dac18222752d91dd8786245cccedd7e42f080e07233
   languageName: node
   linkType: hard
 
@@ -3199,62 +3288,69 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/runtime-corejs3@npm:^7.20.13, @babel/runtime-corejs3@npm:^7.20.7, @babel/runtime-corejs3@npm:^7.22.5":
-  version: 7.22.5
-  resolution: "@babel/runtime-corejs3@npm:7.22.5"
+"@babel/regjsgen@npm:^0.8.0":
+  version: 0.8.0
+  resolution: "@babel/regjsgen@npm:0.8.0"
+  checksum: 89c338fee774770e5a487382170711014d49a68eb281e74f2b5eac88f38300a4ad545516a7786a8dd5702e9cf009c94c2f582d200f077ac5decd74c56b973730
+  languageName: node
+  linkType: hard
+
+"@babel/runtime-corejs3@npm:^7.20.13, @babel/runtime-corejs3@npm:^7.20.7, @babel/runtime-corejs3@npm:^7.22.11":
+  version: 7.22.15
+  resolution: "@babel/runtime-corejs3@npm:7.22.15"
   dependencies:
     core-js-pure: ^3.30.2
-    regenerator-runtime: ^0.13.11
-  checksum: cdeabaa6858cedb0ec47c1245195a09a8fd2de06f4545614acb574d150a81d0e27eb9c08d69787b2c1ad4a1fc57919a3f0599f60d14914227c200563cd595503
+    regenerator-runtime: ^0.14.0
+  checksum: 6e27ca3890282612316aa87a9cd60fc19888ac26c802af926b4488ad67b3b06929086884974e9237fa550f48a5fe22c9c5e5be229bba9c4c017cfb2374835518
   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.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.3, @babel/runtime@npm:^7.18.6, @babel/runtime@npm:^7.2.0, @babel/runtime@npm:^7.20.1, @babel/runtime@npm:^7.20.13, @babel/runtime@npm:^7.20.7, @babel/runtime@npm:^7.21.0, @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.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.21.0
-  resolution: "@babel/runtime@npm:7.21.0"
+"@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.3, @babel/runtime@npm:^7.18.6, @babel/runtime@npm:^7.19.4, @babel/runtime@npm:^7.2.0, @babel/runtime@npm:^7.20.1, @babel/runtime@npm:^7.20.13, @babel/runtime@npm:^7.20.6, @babel/runtime@npm:^7.20.7, @babel/runtime@npm:^7.21.0, @babel/runtime@npm:^7.22.10, @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.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.22.11
+  resolution: "@babel/runtime@npm:7.22.11"
   dependencies:
-    regenerator-runtime: ^0.13.11
-  checksum: 7b33e25bfa9e0e1b9e8828bb61b2d32bdd46b41b07ba7cb43319ad08efc6fda8eb89445193e67d6541814627df0ca59122c0ea795e412b99c5183a0540d338ab
+    regenerator-runtime: ^0.14.0
+  checksum: a5cd6683a8fcdb8065cb1677f221e22f6c67ec8f15ad1d273b180b93ab3bd86c66da2c48f500d4e72d8d2cfa85ff4872a3f350e5aa3855630036af5da765c001
   languageName: node
   linkType: hard
 
-"@babel/template@npm:^7.18.10, @babel/template@npm:^7.18.6, @babel/template@npm:^7.3.3":
-  version: 7.18.10
-  resolution: "@babel/template@npm:7.18.10"
+"@babel/template@npm:^7.18.10, @babel/template@npm:^7.22.5, @babel/template@npm:^7.3.3":
+  version: 7.22.5
+  resolution: "@babel/template@npm:7.22.5"
   dependencies:
-    "@babel/code-frame": ^7.18.6
-    "@babel/parser": ^7.18.10
-    "@babel/types": ^7.18.10
-  checksum: 93a6aa094af5f355a72bd55f67fa1828a046c70e46f01b1606e6118fa1802b6df535ca06be83cc5a5e834022be95c7b714f0a268b5f20af984465a71e28f1473
+    "@babel/code-frame": ^7.22.5
+    "@babel/parser": ^7.22.5
+    "@babel/types": ^7.22.5
+  checksum: c5746410164039aca61829cdb42e9a55410f43cace6f51ca443313f3d0bdfa9a5a330d0b0df73dc17ef885c72104234ae05efede37c1cc8a72dc9f93425977a3
   languageName: node
   linkType: hard
 
-"@babel/traverse@npm:^7.13.0, @babel/traverse@npm:^7.14.0, @babel/traverse@npm:^7.16.8, @babel/traverse@npm:^7.18.9, @babel/traverse@npm:^7.19.0, @babel/traverse@npm:^7.19.1, @babel/traverse@npm:^7.4.5, @babel/traverse@npm:^7.7.2":
-  version: 7.19.1
-  resolution: "@babel/traverse@npm:7.19.1"
+"@babel/traverse@npm:^7.14.0, @babel/traverse@npm:^7.16.8, @babel/traverse@npm:^7.22.11, @babel/traverse@npm:^7.4.5, @babel/traverse@npm:^7.7.2":
+  version: 7.22.11
+  resolution: "@babel/traverse@npm:7.22.11"
   dependencies:
-    "@babel/code-frame": ^7.18.6
-    "@babel/generator": ^7.19.0
-    "@babel/helper-environment-visitor": ^7.18.9
-    "@babel/helper-function-name": ^7.19.0
-    "@babel/helper-hoist-variables": ^7.18.6
-    "@babel/helper-split-export-declaration": ^7.18.6
-    "@babel/parser": ^7.19.1
-    "@babel/types": ^7.19.0
+    "@babel/code-frame": ^7.22.10
+    "@babel/generator": ^7.22.10
+    "@babel/helper-environment-visitor": ^7.22.5
+    "@babel/helper-function-name": ^7.22.5
+    "@babel/helper-hoist-variables": ^7.22.5
+    "@babel/helper-split-export-declaration": ^7.22.6
+    "@babel/parser": ^7.22.11
+    "@babel/types": ^7.22.11
     debug: ^4.1.0
     globals: ^11.1.0
-  checksum: 9d782b5089ebc989e54c2406814ed1206cb745ed2734e6602dee3e23d4b6ebbb703ff86e536276630f8de83fda6cde99f0634e3c3d847ddb40572d0303ba8800
+  checksum: 4ad62d548ca8b95dbf45bae16cc167428f174f3c837d55a5878b1f17bdbc8b384d6df741dc7c461b62c04d881cf25644d3ab885909ba46e3ac43224e2b15b504
   languageName: node
   linkType: hard
 
-"@babel/types@npm:^7.0.0, @babel/types@npm:^7.16.8, @babel/types@npm:^7.18.10, @babel/types@npm:^7.18.13, @babel/types@npm:^7.18.4, @babel/types@npm:^7.18.6, @babel/types@npm:^7.18.9, @babel/types@npm:^7.19.0, @babel/types@npm:^7.19.3, @babel/types@npm:^7.3.0, @babel/types@npm:^7.3.3, @babel/types@npm:^7.4.4, @babel/types@npm:^7.8.3":
-  version: 7.19.3
-  resolution: "@babel/types@npm:7.19.3"
+"@babel/types@npm:^7.0.0, @babel/types@npm:^7.16.8, @babel/types@npm:^7.18.13, @babel/types@npm:^7.20.0, @babel/types@npm:^7.22.10, @babel/types@npm:^7.22.11, @babel/types@npm:^7.22.5, @babel/types@npm:^7.3.0, @babel/types@npm:^7.3.3, @babel/types@npm:^7.4.4, @babel/types@npm:^7.8.3":
+  version: 7.22.11
+  resolution: "@babel/types@npm:7.22.11"
   dependencies:
-    "@babel/helper-string-parser": ^7.18.10
-    "@babel/helper-validator-identifier": ^7.19.1
+    "@babel/helper-string-parser": ^7.22.5
+    "@babel/helper-validator-identifier": ^7.22.5
     to-fast-properties: ^2.0.0
-  checksum: 34a5b3db3b99a1a80ec2a784c2bb0e48769a38f1526dc377a5753a3ac5e5704663c405a393117ecc7a9df9da07b01625be7c4c3fee43ae46aba23b0c40928d77
+  checksum: 431a6446896adb62c876d0fe75263835735d3c974aae05356a87eb55f087c20a777028cf08eadcace7993e058bbafe3b21ce2119363222c6cef9eedd7a204810
   languageName: node
   linkType: hard
 
@@ -3273,7 +3369,6 @@ __metadata:
     "@material-ui/icons": ^4.9.1
     "@testing-library/jest-dom": ^5.10.1
     "@testing-library/react": ^12.1.3
-    "@types/node": ^16.11.26
     "@types/react": ^16.13.1 || ^17.0.0
   peerDependencies:
     react: ^16.13.1 || ^17.0.0
@@ -3292,6 +3387,7 @@ __metadata:
     "@backstage/backend-test-utils": "workspace:^"
     "@backstage/cli": "workspace:^"
     "@backstage/cli-common": "workspace:^"
+    "@backstage/cli-node": "workspace:^"
     "@backstage/config": "workspace:^"
     "@backstage/config-loader": "workspace:^"
     "@backstage/errors": "workspace:^"
@@ -3319,6 +3415,7 @@ __metadata:
     logform: ^2.3.2
     minimatch: ^5.0.0
     minimist: ^1.2.5
+    mock-fs: ^5.2.0
     morgan: ^1.10.0
     node-forge: ^1.3.1
     selfsigned: ^2.0.0
@@ -3480,6 +3577,41 @@ __metadata:
   languageName: unknown
   linkType: soft
 
+"@backstage/backend-plugin-manager@workspace:packages/backend-plugin-manager":
+  version: 0.0.0-use.local
+  resolution: "@backstage/backend-plugin-manager@workspace:packages/backend-plugin-manager"
+  dependencies:
+    "@backstage/backend-app-api": "workspace:^"
+    "@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/cli-node": "workspace:^"
+    "@backstage/config": "workspace:^"
+    "@backstage/config-loader": "workspace:^"
+    "@backstage/errors": "workspace:^"
+    "@backstage/plugin-auth-node": "workspace:^"
+    "@backstage/plugin-catalog-backend": "workspace:^"
+    "@backstage/plugin-events-backend": "workspace:^"
+    "@backstage/plugin-events-node": "workspace:^"
+    "@backstage/plugin-permission-common": "workspace:^"
+    "@backstage/plugin-permission-node": "workspace:^"
+    "@backstage/plugin-scaffolder-node": "workspace:^"
+    "@backstage/plugin-search-backend-node": "workspace:^"
+    "@backstage/plugin-search-common": "workspace:^"
+    "@backstage/types": "workspace:^"
+    "@types/express": ^4.17.6
+    chokidar: ^3.5.3
+    express: ^4.17.1
+    lodash: ^4.17.21
+    mock-fs: ^5.2.0
+    wait-for-expect: ^3.0.2
+    winston: ^3.2.1
+  languageName: unknown
+  linkType: soft
+
 "@backstage/backend-tasks@workspace:^, @backstage/backend-tasks@workspace:packages/backend-tasks":
   version: 0.0.0-use.local
   resolution: "@backstage/backend-tasks@workspace:packages/backend-tasks"
@@ -3524,10 +3656,23 @@ __metadata:
     supertest: ^6.1.3
     testcontainers: ^8.1.2
     uuid: ^8.0.0
+  peerDependencies:
+    "@types/jest": "*"
   languageName: unknown
   linkType: soft
 
-"@backstage/catalog-client@^1.4.3, @backstage/catalog-client@workspace:^, @backstage/catalog-client@workspace:packages/catalog-client":
+"@backstage/catalog-client@npm:^1.4.3":
+  version: 1.4.3
+  resolution: "@backstage/catalog-client@npm:1.4.3"
+  dependencies:
+    "@backstage/catalog-model": ^1.4.1
+    "@backstage/errors": ^1.2.1
+    cross-fetch: ^3.1.5
+  checksum: 0115c630e3c0438ffbbc3a87f7bd1ff557f2c1c2f5d072dd587bff153931ece83cbce64a8ca3fb26a017c2634a3399145d14e94c319df5c6e1889a2c3b915829
+  languageName: node
+  linkType: hard
+
+"@backstage/catalog-client@workspace:^, @backstage/catalog-client@workspace:packages/catalog-client":
   version: 0.0.0-use.local
   resolution: "@backstage/catalog-client@workspace:packages/catalog-client"
   dependencies:
@@ -3539,7 +3684,22 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@backstage/catalog-model@^1.1.5, @backstage/catalog-model@^1.4.0, @backstage/catalog-model@^1.4.1, @backstage/catalog-model@workspace:^, @backstage/catalog-model@workspace:packages/catalog-model":
+"@backstage/catalog-model@npm:^1.1.5, @backstage/catalog-model@npm:^1.4.1":
+  version: 1.4.1
+  resolution: "@backstage/catalog-model@npm:1.4.1"
+  dependencies:
+    "@backstage/config": ^1.0.8
+    "@backstage/errors": ^1.2.1
+    "@backstage/types": ^1.1.0
+    ajv: ^8.10.0
+    json-schema: ^0.4.0
+    lodash: ^4.17.21
+    uuid: ^8.0.0
+  checksum: 5fd839bf8f10dc8ccd25a2714513440fb3cd982a8c6963adbffc5cefa732456b832f039a44d0ac9103b25327a311810b1e33b12117775df4a7cec0a21c9743b4
+  languageName: node
+  linkType: hard
+
+"@backstage/catalog-model@workspace:^, @backstage/catalog-model@workspace:packages/catalog-model":
   version: 0.0.0-use.local
   resolution: "@backstage/catalog-model@workspace:packages/catalog-model"
   dependencies:
@@ -3588,6 +3748,8 @@ __metadata:
   resolution: "@backstage/cli@workspace:packages/cli"
   dependencies:
     "@backstage/backend-common": "workspace:^"
+    "@backstage/backend-plugin-api": "workspace:^"
+    "@backstage/backend-test-utils": "workspace:^"
     "@backstage/catalog-model": "workspace:^"
     "@backstage/cli-common": "workspace:^"
     "@backstage/cli-node": "workspace:^"
@@ -3605,6 +3767,7 @@ __metadata:
     "@backstage/theme": "workspace:^"
     "@backstage/types": "workspace:^"
     "@esbuild-kit/cjs-loader": ^2.4.1
+    "@esbuild-kit/esm-loader": ^2.5.5
     "@manypkg/get-packages": ^1.1.3
     "@octokit/graphql": ^5.0.0
     "@octokit/graphql-schema": ^13.7.0
@@ -3660,7 +3823,7 @@ __metadata:
     css-loader: ^6.5.1
     del: ^7.0.0
     diff: ^5.0.0
-    esbuild: ^0.18.0
+    esbuild: ^0.19.0
     esbuild-loader: ^2.18.0
     eslint: ^8.6.0
     eslint-config-prettier: ^8.3.0
@@ -3693,7 +3856,7 @@ __metadata:
     msw: ^1.0.0
     node-fetch: ^2.6.7
     node-libs-browser: ^2.2.1
-    nodemon: ^2.0.2
+    nodemon: ^3.0.1
     npm-packlist: ^5.0.0
     ora: ^5.3.0
     postcss: ^8.1.0
@@ -3707,7 +3870,7 @@ __metadata:
     rollup-plugin-esbuild: ^4.7.2
     rollup-plugin-postcss: ^4.0.0
     rollup-pluginutils: ^2.8.2
-    run-script-webpack-plugin: ^0.1.0
+    run-script-webpack-plugin: ^0.2.0
     semver: ^7.5.3
     style-loader: ^3.3.1
     sucrase: ^3.20.2
@@ -3765,7 +3928,6 @@ __metadata:
     "@types/json-schema": ^7.0.6
     "@types/json-schema-merge-allof": ^0.6.0
     "@types/mock-fs": ^4.10.0
-    "@types/node": ^16.11.26
     "@types/yup": ^0.29.13
     ajv: ^8.10.0
     chokidar: ^3.5.2
@@ -3785,14 +3947,24 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@backstage/config@^1.0.6, @backstage/config@^1.0.7, @backstage/config@^1.0.8, @backstage/config@workspace:^, @backstage/config@workspace:packages/config":
+"@backstage/config@npm:^1.0.6, @backstage/config@npm:^1.0.7, @backstage/config@npm:^1.0.8":
+  version: 1.0.8
+  resolution: "@backstage/config@npm:1.0.8"
+  dependencies:
+    "@backstage/types": ^1.1.0
+    lodash: ^4.17.21
+  checksum: 78c38207d52de65bf83c1b9281c83fc89e0cda9869c680c39e69bffed5200e5d35035cd850816b57fd979a2ea24132f96ee938b1cddacaf96a43d0385930da9a
+  languageName: node
+  linkType: hard
+
+"@backstage/config@workspace:^, @backstage/config@workspace:packages/config":
   version: 0.0.0-use.local
   resolution: "@backstage/config@workspace:packages/config"
   dependencies:
     "@backstage/cli": "workspace:^"
+    "@backstage/errors": "workspace:^"
     "@backstage/test-utils": "workspace:^"
     "@backstage/types": "workspace:^"
-    "@types/node": ^16.0.0
     lodash: ^4.17.21
   languageName: unknown
   linkType: soft
@@ -3812,13 +3984,15 @@ __metadata:
     "@testing-library/react": ^12.1.3
     "@testing-library/react-hooks": ^8.0.0
     "@testing-library/user-event": ^14.0.0
-    "@types/node": ^16.11.26
     "@types/prop-types": ^15.7.3
     "@types/react": ^16.13.1 || ^17.0.0
     "@types/zen-observable": ^0.8.0
     history: ^5.0.0
+    i18next: ^22.4.15
+    i18next-browser-languagedetector: ^7.0.2
     msw: ^1.0.0
     prop-types: ^15.7.2
+    react-i18next: ^12.3.1
     react-router-beta: "npm:react-router@6.0.0-beta.0"
     react-router-dom-beta: "npm:react-router-dom@6.0.0-beta.0"
     react-router-dom-stable: "npm:react-router-dom@^6.3.0"
@@ -3883,9 +4057,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@backstage/core-components@npm:^0.13.2, @backstage/core-components@npm:^0.13.3":
-  version: 0.13.3
-  resolution: "@backstage/core-components@npm:0.13.3"
+"@backstage/core-components@npm:^0.13.4":
+  version: 0.13.4
+  resolution: "@backstage/core-components@npm:0.13.4"
   dependencies:
     "@backstage/config": ^1.0.8
     "@backstage/core-plugin-api": ^1.5.3
@@ -3932,7 +4106,7 @@ __metadata:
     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: ef1010b048697c051654d52a88f0e22d2a82bad33bb14c0ee5e11e86930ccfca71dc0cf0946440cc92e439d4b3a97281fbe6e1c1f78553dbd03f1118e2c2ad6a
+  checksum: cb3f1f0c91a37c401e3e5dc1304414e02205d5eb6e9fd8a8de8f1f7796f105b44f7926d61c95d2331fe2887612b9c44483683c7df6ffcf826e438fd1beffcd74
   languageName: node
   linkType: hard
 
@@ -3966,7 +4140,6 @@ __metadata:
     "@types/d3-zoom": ^3.0.1
     "@types/dagre": ^0.7.44
     "@types/google-protobuf": ^3.7.2
-    "@types/node": ^16.11.26
     "@types/react": ^16.13.1 || ^17.0.0
     "@types/react-helmet": ^6.1.0
     "@types/react-sparklines": ^1.7.0
@@ -3990,7 +4163,7 @@ __metadata:
     pluralize: ^8.0.0
     prop-types: ^15.7.2
     qs: ^6.9.4
-    rc-progress: 3.4.2
+    rc-progress: 3.5.1
     react-helmet: 6.1.0
     react-hook-form: ^7.12.2
     react-markdown: ^8.0.0
@@ -4010,7 +4183,26 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@backstage/core-plugin-api@^1.3.0, @backstage/core-plugin-api@^1.5.0, @backstage/core-plugin-api@^1.5.2, @backstage/core-plugin-api@^1.5.3, @backstage/core-plugin-api@workspace:^, @backstage/core-plugin-api@workspace:packages/core-plugin-api":
+"@backstage/core-plugin-api@npm:^1.3.0, @backstage/core-plugin-api@npm:^1.5.0, @backstage/core-plugin-api@npm:^1.5.3":
+  version: 1.5.3
+  resolution: "@backstage/core-plugin-api@npm:1.5.3"
+  dependencies:
+    "@backstage/config": ^1.0.8
+    "@backstage/types": ^1.1.0
+    "@backstage/version-bridge": ^1.0.4
+    "@types/react": ^16.13.1 || ^17.0.0
+    history: ^5.0.0
+    prop-types: ^15.7.2
+    zen-observable: ^0.10.0
+  peerDependencies:
+    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: d272b5af4f22cf8f2b91fb85d0fc860cc70220a596e4f03544a996493b045fd09663fc1d79044916ffd86303bfdd47795398dd86d66987d8514bade3dcbaad37
+  languageName: node
+  linkType: hard
+
+"@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:
@@ -4025,13 +4217,14 @@ __metadata:
     "@testing-library/react": ^12.1.3
     "@testing-library/react-hooks": ^8.0.0
     "@testing-library/user-event": ^14.0.0
-    "@types/node": ^16.11.26
     "@types/prop-types": ^15.7.3
     "@types/react": ^16.13.1 || ^17.0.0
     "@types/zen-observable": ^0.8.0
     history: ^5.0.0
+    i18next: ^22.4.15
     msw: ^1.0.0
     prop-types: ^15.7.2
+    react-i18next: ^12.3.1
     zen-observable: ^0.10.0
   peerDependencies:
     react: ^16.13.1 || ^17.0.0
@@ -4057,7 +4250,7 @@ __metadata:
     handlebars: ^4.7.3
     inquirer: ^8.2.0
     mock-fs: ^5.1.1
-    nodemon: ^2.0.2
+    nodemon: ^3.0.1
     ora: ^5.3.0
     recursive-readdir: ^2.2.2
     ts-node: ^10.0.0
@@ -4086,7 +4279,6 @@ __metadata:
     "@testing-library/jest-dom": ^5.10.1
     "@testing-library/react": ^12.1.3
     "@testing-library/user-event": ^14.0.0
-    "@types/node": ^16.0.0
     "@types/react": ^16.13.1 || ^17.0.0
     react-use: ^17.2.4
     zen-observable: ^0.10.0
@@ -4119,6 +4311,45 @@ __metadata:
   languageName: unknown
   linkType: soft
 
+"@backstage/frontend-app-api@workspace:^, @backstage/frontend-app-api@workspace:packages/frontend-app-api":
+  version: 0.0.0-use.local
+  resolution: "@backstage/frontend-app-api@workspace:packages/frontend-app-api"
+  dependencies:
+    "@backstage/cli": "workspace:^"
+    "@backstage/config": "workspace:^"
+    "@backstage/core-plugin-api": "workspace:^"
+    "@backstage/frontend-plugin-api": "workspace:^"
+    "@backstage/plugin-graphiql": "workspace:^"
+    "@backstage/types": "workspace:^"
+    "@testing-library/jest-dom": ^5.10.1
+    "@types/react": ^16.13.1 || ^17.0.0
+    lodash: ^4.17.21
+  peerDependencies:
+    react: ^16.13.1 || ^17.0.0
+    react-router-dom: 6.0.0-beta.0 || ^6.3.0
+  languageName: unknown
+  linkType: soft
+
+"@backstage/frontend-plugin-api@workspace:^, @backstage/frontend-plugin-api@workspace:packages/frontend-plugin-api":
+  version: 0.0.0-use.local
+  resolution: "@backstage/frontend-plugin-api@workspace:packages/frontend-plugin-api"
+  dependencies:
+    "@backstage/cli": "workspace:^"
+    "@backstage/core-plugin-api": "workspace:^"
+    "@backstage/frontend-app-api": "workspace:^"
+    "@backstage/types": "workspace:^"
+    "@testing-library/jest-dom": ^5.10.1
+    "@testing-library/react": ^12.1.3
+    "@types/react": ^16.13.1 || ^17.0.0
+    lodash: ^4.17.21
+    zod: ^3.21.4
+    zod-to-json-schema: ^3.21.4
+  peerDependencies:
+    react: ^16.13.1 || ^17.0.0
+    react-router-dom: 6.0.0-beta.0 || ^6.3.0
+  languageName: unknown
+  linkType: soft
+
 "@backstage/integration-aws-node@workspace:^, @backstage/integration-aws-node@workspace:packages/integration-aws-node":
   version: 0.0.0-use.local
   resolution: "@backstage/integration-aws-node@workspace:packages/integration-aws-node"
@@ -4138,14 +4369,14 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@backstage/integration-react@npm:^1.1.15":
-  version: 1.1.15
-  resolution: "@backstage/integration-react@npm:1.1.15"
+"@backstage/integration-react@npm:^1.1.18":
+  version: 1.1.18
+  resolution: "@backstage/integration-react@npm:1.1.18"
   dependencies:
     "@backstage/config": ^1.0.8
-    "@backstage/core-components": ^0.13.3
+    "@backstage/core-components": ^0.13.4
     "@backstage/core-plugin-api": ^1.5.3
-    "@backstage/integration": ^1.5.1
+    "@backstage/integration": ^1.6.2
     "@backstage/theme": ^0.4.1
     "@material-ui/core": ^4.12.2
     "@material-ui/icons": ^4.9.1
@@ -4155,7 +4386,7 @@ __metadata:
     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: 3fed97a63e3bc4c5faf128373def1b31d62952f088ae19feb7ee1c68aa5092215ab047b66cb4b38caa022a26370eac244fb2b6ddb47ba896e2c3fce06873f575
+  checksum: ec2ea86510947f4ecb59838fb540f7318e1e13f859b16340fa52e33d7e014e8796528fcd2e5a37a7c525d48c7df0533954565b561c89575f7075d933ba1ed340
   languageName: node
   linkType: hard
 
@@ -4178,7 +4409,6 @@ __metadata:
     "@testing-library/jest-dom": ^5.10.1
     "@testing-library/react": ^12.1.3
     "@testing-library/user-event": ^14.0.0
-    "@types/node": ^16.11.26
     "@types/react": ^16.13.1 || ^17.0.0
     msw: ^1.0.0
     react-use: ^17.2.4
@@ -4189,7 +4419,24 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@backstage/integration@^1.5.1, @backstage/integration@workspace:^, @backstage/integration@workspace:packages/integration":
+"@backstage/integration@npm:^1.6.2":
+  version: 1.6.2
+  resolution: "@backstage/integration@npm:1.6.2"
+  dependencies:
+    "@azure/identity": ^3.2.1
+    "@backstage/config": ^1.0.8
+    "@backstage/errors": ^1.2.1
+    "@octokit/auth-app": ^4.0.0
+    "@octokit/rest": ^19.0.3
+    cross-fetch: ^3.1.5
+    git-url-parse: ^13.0.0
+    lodash: ^4.17.21
+    luxon: ^3.0.0
+  checksum: 5ae6a3def92ee9feb114fecea8a36337df592f49f23875fa619b0eba223f287ed7bbe993c15cac99c2b45c3150e10bb2e1bb4389b34a09de5377365ab13e9ae7
+  languageName: node
+  linkType: hard
+
+"@backstage/integration@workspace:^, @backstage/integration@workspace:packages/integration":
   version: 0.0.0-use.local
   resolution: "@backstage/integration@workspace:packages/integration"
   dependencies:
@@ -4276,7 +4523,6 @@ __metadata:
     "@testing-library/react": ^12.1.3
     "@testing-library/user-event": ^14.0.0
     "@types/git-url-parse": ^9.0.0
-    "@types/node": "*"
     "@types/react": ^16.13.1 || ^17.0.0
     cross-fetch: ^3.1.5
     lodash: ^4.17.21
@@ -4332,7 +4578,6 @@ __metadata:
     "@testing-library/jest-dom": ^5.10.1
     "@testing-library/react": ^12.1.3
     "@testing-library/user-event": ^14.0.0
-    "@types/node": ^16.11.26
     "@types/react": ^16.13.1 || ^17.0.0
     msw: ^1.0.0
     react-use: ^17.2.4
@@ -4363,7 +4608,6 @@ __metadata:
     "@testing-library/jest-dom": ^5.10.1
     "@testing-library/react": ^12.1.3
     "@testing-library/user-event": ^14.0.0
-    "@types/node": ^16.11.26
     "@types/react": ^16.13.1 || ^17.0.0
     msw: ^1.0.0
     react-use: ^17.2.4
@@ -4391,7 +4635,6 @@ __metadata:
     "@testing-library/react": ^12.1.3
     "@testing-library/user-event": ^14.0.0
     "@types/jest": ^28.1.3
-    "@types/node": ^16.11.26
     "@types/react": ^16.13.1 || ^17.0.0
     msw: ^1.0.0
     react-ga4: ^2.0.0
@@ -4422,7 +4665,6 @@ __metadata:
     "@testing-library/jest-dom": ^5.10.1
     "@testing-library/react": ^12.1.3
     "@testing-library/user-event": ^14.0.0
-    "@types/node": ^16.11.26
     "@types/react": ^16.13.1 || ^17.0.0
     msw: ^1.0.0
     prop-types: ^15.7.2
@@ -4450,7 +4692,6 @@ __metadata:
     "@testing-library/jest-dom": ^5.10.1
     "@testing-library/react": ^12.1.3
     "@testing-library/user-event": ^14.0.0
-    "@types/node": "*"
     msw: ^1.0.0
     react-use: ^17.2.4
   peerDependencies:
@@ -4475,7 +4716,6 @@ __metadata:
     "@testing-library/jest-dom": ^5.10.1
     "@testing-library/react": ^12.1.3
     "@testing-library/user-event": ^14.0.0
-    "@types/node": ^16.11.26
     "@types/react": ^16.13.1 || ^17.0.0
     cross-fetch: ^3.1.5
     msw: ^1.0.0
@@ -4525,7 +4765,6 @@ __metadata:
     "@testing-library/jest-dom": ^5.10.1
     "@testing-library/react": ^12.1.3
     "@testing-library/user-event": ^14.0.0
-    "@types/node": ^16.11.26
     "@types/react": ^16.13.1 || ^17.0.0
     "@types/swagger-ui-react": ^4.18.0
     cross-fetch: ^3.1.5
@@ -4561,7 +4800,6 @@ __metadata:
     "@testing-library/jest-dom": ^5.10.1
     "@testing-library/react": ^12.1.3
     "@testing-library/user-event": ^14.0.0
-    "@types/node": "*"
     "@types/react": ^16.13.1 || ^17.0.0
     msw: ^1.0.0
     react-use: ^17.2.4
@@ -4616,18 +4854,93 @@ __metadata:
   languageName: unknown
   linkType: soft
 
+"@backstage/plugin-auth-backend-module-gcp-iap-provider@workspace:^, @backstage/plugin-auth-backend-module-gcp-iap-provider@workspace:plugins/auth-backend-module-gcp-iap-provider":
+  version: 0.0.0-use.local
+  resolution: "@backstage/plugin-auth-backend-module-gcp-iap-provider@workspace:plugins/auth-backend-module-gcp-iap-provider"
+  dependencies:
+    "@backstage/backend-plugin-api": "workspace:^"
+    "@backstage/backend-test-utils": "workspace:^"
+    "@backstage/cli": "workspace:^"
+    "@backstage/errors": "workspace:^"
+    "@backstage/plugin-auth-node": "workspace:^"
+    "@backstage/types": "workspace:^"
+    express: ^4.18.2
+    google-auth-library: ^8.0.0
+    msw: ^1.0.0
+    supertest: ^6.1.3
+  languageName: unknown
+  linkType: soft
+
+"@backstage/plugin-auth-backend-module-github-provider@workspace:^, @backstage/plugin-auth-backend-module-github-provider@workspace:plugins/auth-backend-module-github-provider":
+  version: 0.0.0-use.local
+  resolution: "@backstage/plugin-auth-backend-module-github-provider@workspace:plugins/auth-backend-module-github-provider"
+  dependencies:
+    "@backstage/backend-common": "workspace:^"
+    "@backstage/backend-defaults": "workspace:^"
+    "@backstage/backend-plugin-api": "workspace:^"
+    "@backstage/backend-test-utils": "workspace:^"
+    "@backstage/cli": "workspace:^"
+    "@backstage/plugin-auth-backend": "workspace:^"
+    "@backstage/plugin-auth-node": "workspace:^"
+    passport-github2: ^0.1.12
+    supertest: ^6.3.3
+  languageName: unknown
+  linkType: soft
+
+"@backstage/plugin-auth-backend-module-gitlab-provider@workspace:^, @backstage/plugin-auth-backend-module-gitlab-provider@workspace:plugins/auth-backend-module-gitlab-provider":
+  version: 0.0.0-use.local
+  resolution: "@backstage/plugin-auth-backend-module-gitlab-provider@workspace:plugins/auth-backend-module-gitlab-provider"
+  dependencies:
+    "@backstage/backend-common": "workspace:^"
+    "@backstage/backend-defaults": "workspace:^"
+    "@backstage/backend-plugin-api": "workspace:^"
+    "@backstage/backend-test-utils": "workspace:^"
+    "@backstage/cli": "workspace:^"
+    "@backstage/plugin-auth-backend": "workspace:^"
+    "@backstage/plugin-auth-node": "workspace:^"
+    express: ^4.18.2
+    passport: ^0.6.0
+    passport-gitlab2: ^5.0.0
+    supertest: ^6.3.3
+  languageName: unknown
+  linkType: soft
+
+"@backstage/plugin-auth-backend-module-google-provider@workspace:^, @backstage/plugin-auth-backend-module-google-provider@workspace:plugins/auth-backend-module-google-provider":
+  version: 0.0.0-use.local
+  resolution: "@backstage/plugin-auth-backend-module-google-provider@workspace:plugins/auth-backend-module-google-provider"
+  dependencies:
+    "@backstage/backend-plugin-api": "workspace:^"
+    "@backstage/backend-test-utils": "workspace:^"
+    "@backstage/cli": "workspace:^"
+    "@backstage/plugin-auth-backend": "workspace:^"
+    "@backstage/plugin-auth-node": "workspace:^"
+    "@types/passport-google-oauth20": ^2.0.3
+    google-auth-library: ^8.0.0
+    msw: ^1.0.0
+    passport-google-oauth20: ^2.0.0
+    supertest: ^6.1.3
+  languageName: unknown
+  linkType: soft
+
 "@backstage/plugin-auth-backend@workspace:^, @backstage/plugin-auth-backend@workspace:plugins/auth-backend":
   version: 0.0.0-use.local
   resolution: "@backstage/plugin-auth-backend@workspace:plugins/auth-backend"
   dependencies:
     "@backstage/backend-common": "workspace:^"
+    "@backstage/backend-defaults": "workspace:^"
+    "@backstage/backend-plugin-api": "workspace:^"
     "@backstage/backend-test-utils": "workspace:^"
     "@backstage/catalog-client": "workspace:^"
     "@backstage/catalog-model": "workspace:^"
     "@backstage/cli": "workspace:^"
     "@backstage/config": "workspace:^"
     "@backstage/errors": "workspace:^"
+    "@backstage/plugin-auth-backend-module-gcp-iap-provider": "workspace:^"
+    "@backstage/plugin-auth-backend-module-github-provider": "workspace:^"
+    "@backstage/plugin-auth-backend-module-gitlab-provider": "workspace:^"
+    "@backstage/plugin-auth-backend-module-google-provider": "workspace:^"
     "@backstage/plugin-auth-node": "workspace:^"
+    "@backstage/plugin-catalog-node": "workspace:^"
     "@backstage/types": "workspace:^"
     "@davidzemon/passport-okta-oauth": ^0.0.5
     "@google-cloud/firestore": ^6.0.0
@@ -4686,18 +4999,29 @@ __metadata:
   resolution: "@backstage/plugin-auth-node@workspace:plugins/auth-node"
   dependencies:
     "@backstage/backend-common": "workspace:^"
+    "@backstage/backend-plugin-api": "workspace:^"
     "@backstage/backend-test-utils": "workspace:^"
+    "@backstage/catalog-client": "workspace:^"
+    "@backstage/catalog-model": "workspace:^"
     "@backstage/cli": "workspace:^"
     "@backstage/config": "workspace:^"
     "@backstage/errors": "workspace:^"
+    "@backstage/types": "workspace:^"
     "@types/express": "*"
+    "@types/passport": ^1.0.3
+    cookie-parser: ^1.4.6
     express: ^4.17.1
+    express-promise-router: ^4.1.1
     jose: ^4.6.0
     lodash: ^4.17.21
     msw: ^1.0.0
     node-fetch: ^2.6.7
+    passport: ^0.6.0
+    supertest: ^6.1.3
     uuid: ^8.0.0
     winston: ^3.2.1
+    zod: ^3.21.4
+    zod-to-json-schema: ^3.21.4
   languageName: unknown
   linkType: soft
 
@@ -4754,7 +5078,6 @@ __metadata:
     "@testing-library/jest-dom": ^5.10.1
     "@testing-library/react": ^12.1.3
     "@testing-library/user-event": ^14.0.0
-    "@types/node": ^16.11.26
     "@types/react": ^16.13.1 || ^17.0.0
     humanize-duration: ^3.27.0
     luxon: ^3.0.0
@@ -4818,7 +5141,6 @@ __metadata:
     "@testing-library/jest-dom": ^5.10.1
     "@testing-library/react": ^12.1.3
     "@testing-library/user-event": ^14.0.0
-    "@types/node": ^16.11.26
     "@types/react": ^16.13.1 || ^17.0.0
     luxon: ^3.0.0
     msw: ^1.0.0
@@ -4844,7 +5166,6 @@ __metadata:
     "@backstage/errors": "workspace:^"
     "@backstage/plugin-auth-node": "workspace:^"
     "@types/express": ^4.17.6
-    "@types/node": "*"
     badge-maker: ^3.3.0
     cors: ^2.8.5
     cross-fetch: ^3.1.5
@@ -4877,7 +5198,7 @@ __metadata:
     "@material-ui/icons": ^4.9.1
     "@material-ui/lab": 4.0.0-alpha.61
     "@testing-library/jest-dom": ^5.16.5
-    "@types/node": ^16.11.26
+    "@types/react": ^16.13.1 || ^17.0.0
     react-use: ^17.2.4
   peerDependencies:
     react: ^16.13.1 || ^17.0.0
@@ -4971,7 +5292,6 @@ __metadata:
     "@testing-library/jest-dom": ^5.10.1
     "@testing-library/react": ^12.1.3
     "@testing-library/user-event": ^14.0.0
-    "@types/node": ^16.11.26
     "@types/react": ^16.13.1 || ^17.0.0
     "@types/recharts": ^1.8.15
     lodash: ^4.17.21
@@ -5416,7 +5736,18 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@backstage/plugin-catalog-common@^1.0.10, @backstage/plugin-catalog-common@^1.0.15, @backstage/plugin-catalog-common@workspace:^, @backstage/plugin-catalog-common@workspace:plugins/catalog-common":
+"@backstage/plugin-catalog-common@npm:^1.0.10, @backstage/plugin-catalog-common@npm:^1.0.15":
+  version: 1.0.15
+  resolution: "@backstage/plugin-catalog-common@npm:1.0.15"
+  dependencies:
+    "@backstage/catalog-model": ^1.4.1
+    "@backstage/plugin-permission-common": ^0.7.7
+    "@backstage/plugin-search-common": ^1.2.5
+  checksum: b5d371605e9436b99b0a2b22cbb049f65d42ab4736108bddafea9294b25adb466a2f3baeb360d428f40f7c63503663c1648089f440c9cfaff3cb70647e5a4e0e
+  languageName: node
+  linkType: hard
+
+"@backstage/plugin-catalog-common@workspace:^, @backstage/plugin-catalog-common@workspace:plugins/catalog-common":
   version: 0.0.0-use.local
   resolution: "@backstage/plugin-catalog-common@workspace:plugins/catalog-common"
   dependencies:
@@ -5553,16 +5884,16 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@backstage/plugin-catalog-react@npm:^1.2.4, @backstage/plugin-catalog-react@npm:^1.7.0, @backstage/plugin-catalog-react@npm:^1.8.0":
-  version: 1.8.0
-  resolution: "@backstage/plugin-catalog-react@npm:1.8.0"
+"@backstage/plugin-catalog-react@npm:^1.2.4, @backstage/plugin-catalog-react@npm:^1.8.3":
+  version: 1.8.3
+  resolution: "@backstage/plugin-catalog-react@npm:1.8.3"
   dependencies:
     "@backstage/catalog-client": ^1.4.3
     "@backstage/catalog-model": ^1.4.1
-    "@backstage/core-components": ^0.13.3
+    "@backstage/core-components": ^0.13.4
     "@backstage/core-plugin-api": ^1.5.3
     "@backstage/errors": ^1.2.1
-    "@backstage/integration": ^1.5.1
+    "@backstage/integration": ^1.6.2
     "@backstage/plugin-catalog-common": ^1.0.15
     "@backstage/plugin-permission-common": ^0.7.7
     "@backstage/plugin-permission-react": ^0.4.14
@@ -5586,7 +5917,7 @@ __metadata:
     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: 01dff91076bcc7829b10866975599a05991dd12b9c8f5978383a58dbbb2a4a0ef3b4558b6f8cc468260dc9eef594f8ebdba3cf9cbf776529ca1fd24b6460bb8e
+  checksum: 8d334dc8eb35399fb4fde7eb218589cc3bedf6f65665a0f379a578ca892ab4a06a83a6e0de2c392e16d12981a91c903efdaa78f577639dd8f73604c61541f60e
   languageName: node
   linkType: hard
 
@@ -5657,7 +5988,7 @@ __metadata:
     "@testing-library/jest-dom": ^5.10.1
     "@testing-library/react": ^12.1.3
     "@testing-library/user-event": ^14.0.0
-    "@types/node": "*"
+    "@types/react": ^16.13.1 || ^17.0.0
     msw: ^1.0.0
     react-use: ^17.2.4
   peerDependencies:
@@ -5780,7 +6111,6 @@ __metadata:
     "@testing-library/react": ^12.1.3
     "@testing-library/user-event": ^14.0.0
     "@types/humanize-duration": ^3.25.1
-    "@types/node": ^16.11.26
     "@types/react": ^16.13.1 || ^17.0.0
     circleci-api: ^4.0.0
     cross-fetch: ^3.1.5
@@ -5816,7 +6146,6 @@ __metadata:
     "@testing-library/jest-dom": ^5.10.1
     "@testing-library/react": ^12.1.3
     "@testing-library/user-event": ^14.0.0
-    "@types/node": ^16.11.26
     "@types/react": ^16.13.1 || ^17.0.0
     cross-fetch: ^3.1.5
     luxon: ^3.0.0
@@ -5851,7 +6180,6 @@ __metadata:
     "@testing-library/user-event": ^14.0.0
     "@types/humanize-duration": ^3.27.1
     "@types/luxon": ^3.0.0
-    "@types/node": ^16.11.26
     "@types/react": ^16.13.1 || ^17.0.0
     humanize-duration: ^3.27.1
     luxon: ^3.0.0
@@ -5875,12 +6203,14 @@ __metadata:
     "@backstage/config": "workspace:^"
     "@backstage/errors": "workspace:^"
     "@backstage/integration": "workspace:^"
+    "@backstage/plugin-auth-node": "workspace:^"
+    "@types/body-parser-xml": ^2.0.2
     "@types/express": ^4.17.6
-    "@types/express-xml-bodyparser": ^0.3.2
     "@types/supertest": ^2.0.8
+    body-parser: ^1.20.0
+    body-parser-xml: ^2.0.5
     express: ^4.17.1
     express-promise-router: ^4.1.0
-    express-xml-bodyparser: ^0.3.0
     knex: ^2.0.0
     msw: ^1.0.0
     supertest: ^6.1.6
@@ -5915,7 +6245,6 @@ __metadata:
     "@testing-library/react": ^12.1.3
     "@testing-library/user-event": ^14.0.0
     "@types/highlightjs": ^10.1.0
-    "@types/node": ^16.11.26
     "@types/react": ^16.13.1 || ^17.0.0
     "@types/recharts": ^1.8.15
     highlight.js: ^10.6.0
@@ -5950,10 +6279,9 @@ __metadata:
     "@testing-library/jest-dom": ^5.10.1
     "@testing-library/react": ^12.1.3
     "@testing-library/user-event": ^14.0.0
-    "@types/node": "*"
     "@types/react": ^16.13.1 || ^17.0.0
     msw: ^1.0.0
-    rc-progress: 3.4.2
+    rc-progress: 3.5.1
     react-use: ^17.2.4
   peerDependencies:
     react: ^16.13.1 || ^17.0.0
@@ -5983,7 +6311,6 @@ __metadata:
     "@testing-library/jest-dom": ^5.10.1
     "@testing-library/react": ^12.1.3
     "@testing-library/user-event": ^14.0.0
-    "@types/node": ^16.11.26
     "@types/react": ^16.13.1 || ^17.0.0
     jsonschema: ^1.2.6
     msw: ^1.0.0
@@ -6027,8 +6354,7 @@ __metadata:
     "@testing-library/jest-dom": ^5.10.1
     "@testing-library/react": ^12.1.3
     "@testing-library/user-event": ^14.0.0
-    "@types/node": ^16.11.26
-    "@types/pluralize": ^0.0.29
+    "@types/pluralize": ^0.0.30
     "@types/react": ^16.13.1 || ^17.0.0
     "@types/recharts": ^1.8.14
     "@types/regression": ^2.0.0
@@ -6121,7 +6447,6 @@ __metadata:
     "@testing-library/jest-dom": ^5.10.1
     "@testing-library/react": ^12.1.3
     "@testing-library/user-event": ^14.0.0
-    "@types/node": "*"
     cross-fetch: ^3.1.5
     msw: ^1.0.0
     react-json-view: ^1.21.3
@@ -6153,7 +6478,6 @@ __metadata:
     "@testing-library/jest-dom": ^5.10.1
     "@testing-library/react": ^12.1.3
     "@testing-library/user-event": ^14.0.0
-    "@types/node": "*"
     "@types/react": ^16.13.1 || ^17.0.0
     express: ^4.18.1
     msw: ^1.0.0
@@ -6223,7 +6547,6 @@ __metadata:
     "@testing-library/react": ^12.1.3
     "@testing-library/react-hooks": ^8.0.1
     "@testing-library/user-event": ^14.0.0
-    "@types/node": "*"
     "@types/react": ^16.13.1 || ^17.0.0
     msw: ^1.0.0
     react-use: ^17.2.4
@@ -6261,7 +6584,6 @@ __metadata:
     "@testing-library/jest-dom": ^5.10.1
     "@testing-library/react": ^12.1.3
     "@testing-library/user-event": ^14.0.0
-    "@types/node": "*"
     "@types/react": ^16.13.1 || ^17.0.0
     "@uiw/react-codemirror": ^4.9.3
     lodash: ^4.17.21
@@ -6451,7 +6773,6 @@ __metadata:
     "@testing-library/jest-dom": ^5.10.1
     "@testing-library/react": ^12.1.3
     "@testing-library/user-event": ^14.0.0
-    "@types/node": ^16.11.26
     "@types/react": ^16.13.1 || ^17.0.0
     cross-fetch: ^3.1.5
     msw: ^1.0.0
@@ -6488,7 +6809,6 @@ __metadata:
     "@testing-library/jest-dom": ^5.10.1
     "@testing-library/react": ^12.1.3
     "@testing-library/user-event": ^14.0.0
-    "@types/node": ^16.11.26
     "@types/react": ^16.13.1 || ^17.0.0
     classnames: ^2.2.6
     cross-fetch: ^3.1.5
@@ -6522,7 +6842,6 @@ __metadata:
     "@testing-library/jest-dom": ^5.10.1
     "@testing-library/react": ^12.1.3
     "@testing-library/user-event": ^14.0.0
-    "@types/node": ^16.11.26
     "@types/react": ^16.13.1 || ^17.0.0
     luxon: ^3.0.0
     msw: ^1.0.0
@@ -6555,7 +6874,6 @@ __metadata:
     "@testing-library/jest-dom": ^5.10.1
     "@testing-library/react": ^12.1.3
     "@testing-library/user-event": ^14.0.0
-    "@types/node": ^16.11.26
     "@types/react": ^16.13.1 || ^17.0.0
     cross-fetch: ^3.1.5
     luxon: ^3.0.0
@@ -6591,7 +6909,6 @@ __metadata:
     "@testing-library/react": ^12.1.3
     "@testing-library/user-event": ^14.0.0
     "@types/dompurify": ^2.3.3
-    "@types/node": ^16.11.26
     "@types/react": ^16.13.1 || ^17.0.0
     "@types/sanitize-html": ^2.6.2
     classnames: ^2.3.1
@@ -6628,7 +6945,6 @@ __metadata:
     "@testing-library/jest-dom": ^5.10.1
     "@testing-library/react": ^12.1.3
     "@testing-library/user-event": ^14.0.0
-    "@types/node": ^16.11.26
     "@types/react": ^16.13.1 || ^17.0.0
     cross-fetch: ^3.1.5
     msw: ^1.0.0
@@ -6660,7 +6976,6 @@ __metadata:
     "@testing-library/react": ^12.1.3
     "@testing-library/react-hooks": ^8.0.0
     "@testing-library/user-event": ^14.0.0
-    "@types/node": ^16.11.26
     "@types/react": ^16.13.1 || ^17.0.0
     "@types/recharts": ^1.8.15
     luxon: ^3.0.0
@@ -6698,7 +7013,6 @@ __metadata:
     "@testing-library/jest-dom": ^5.10.1
     "@testing-library/react": ^12.1.3
     "@testing-library/user-event": ^14.0.0
-    "@types/node": ^16.11.26
     "@types/react": ^16.13.1 || ^17.0.0
     cross-fetch: ^3.1.5
     git-url-parse: ^13.0.0
@@ -6736,7 +7050,6 @@ __metadata:
     "@testing-library/jest-dom": ^5.10.1
     "@testing-library/react": ^12.1.3
     "@testing-library/user-event": ^14.0.0
-    "@types/node": ^16.11.26
     "@types/react": ^16.13.1 || ^17.0.0
     luxon: ^3.0.0
     msw: ^1.0.0
@@ -6770,7 +7083,6 @@ __metadata:
     "@testing-library/jest-dom": ^5.10.1
     "@testing-library/react": ^12.1.3
     "@testing-library/user-event": ^14.0.0
-    "@types/node": "*"
     "@types/react": ^16.13.1 || ^17.0.0
     luxon: ^3.0.0
     msw: ^1.0.0
@@ -6804,7 +7116,6 @@ __metadata:
     "@testing-library/jest-dom": ^5.10.1
     "@testing-library/react": ^12.1.3
     "@testing-library/user-event": ^14.0.0
-    "@types/node": ^16.11.26
     "@types/react": ^16.13.1 || ^17.0.0
     luxon: ^3.0.0
     msw: ^1.0.0
@@ -6836,7 +7147,6 @@ __metadata:
     "@testing-library/jest-dom": ^5.10.1
     "@testing-library/react": ^12.1.3
     "@testing-library/user-event": ^14.0.0
-    "@types/node": ^16.11.26
     "@types/react": ^16.13.1 || ^17.0.0
     cross-fetch: ^3.1.5
     msw: ^1.0.0
@@ -6871,7 +7181,6 @@ __metadata:
     "@testing-library/user-event": ^14.0.0
     "@types/lodash": ^4.14.173
     "@types/luxon": ^3.0.0
-    "@types/node": ^16.11.26
     "@types/react": ^16.13.1 || ^17.0.0
     lodash: ^4.17.21
     luxon: ^3.0.0
@@ -6894,6 +7203,7 @@ __metadata:
     "@backstage/core-components": "workspace:^"
     "@backstage/core-plugin-api": "workspace:^"
     "@backstage/dev-utils": "workspace:^"
+    "@backstage/frontend-plugin-api": "workspace:^"
     "@backstage/test-utils": "workspace:^"
     "@backstage/theme": "workspace:^"
     "@material-ui/core": ^4.12.2
@@ -6904,7 +7214,6 @@ __metadata:
     "@testing-library/react": ^12.1.3
     "@testing-library/user-event": ^14.0.0
     "@types/codemirror": ^5.0.0
-    "@types/node": ^16.11.26
     "@types/react": ^16.13.1 || ^17.0.0
     cross-fetch: ^3.1.5
     graphiql: ^1.5.12
@@ -6962,7 +7271,6 @@ __metadata:
     "@testing-library/jest-dom": ^5.10.1
     "@testing-library/react": ^12.1.3
     "@testing-library/user-event": ^14.0.0
-    "@types/node": "*"
     "@types/react": ^16.13.1 || ^17.0.0
     graphql-voyager: ^1.0.0-rc.31
     msw: ^1.0.0
@@ -6974,11 +7282,11 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@backstage/plugin-home-react@npm:^0.1.1":
-  version: 0.1.1
-  resolution: "@backstage/plugin-home-react@npm:0.1.1"
+"@backstage/plugin-home-react@npm:^0.1.2":
+  version: 0.1.2
+  resolution: "@backstage/plugin-home-react@npm:0.1.2"
   dependencies:
-    "@backstage/core-components": ^0.13.3
+    "@backstage/core-components": ^0.13.4
     "@backstage/core-plugin-api": ^1.5.3
     "@material-ui/core": ^4.12.2
     "@material-ui/icons": ^4.9.1
@@ -6987,7 +7295,7 @@ __metadata:
     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: cc9741b1a3b3e1943d849d5437d0254b3fbfebf3a700ba1c282ccb158aa1f23761ba021330318c79fe0fd153c2ca088e04d8355a2fd4bdaa8731e667496dd33c
+  checksum: fafec93fe81f7a2e4a3bc018cc740b8c93b4be3bb0f9216ec8f510390cf70302d912734be9bec72ae9319b9fce39fb72c1467b97fb23ba54c597253912114bb5
   languageName: node
   linkType: hard
 
@@ -7008,7 +7316,6 @@ __metadata:
     "@testing-library/jest-dom": ^5.10.1
     "@testing-library/react": ^12.1.3
     "@testing-library/user-event": ^14.0.0
-    "@types/node": ^16.11.26
     "@types/react": ^16.13.1 || ^17.0.0
     "@types/react-grid-layout": ^1.3.2
     cross-fetch: ^3.1.5
@@ -7020,16 +7327,16 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@backstage/plugin-home@npm:^0.5.3":
-  version: 0.5.4
-  resolution: "@backstage/plugin-home@npm:0.5.4"
+"@backstage/plugin-home@npm:^0.5.7":
+  version: 0.5.7
+  resolution: "@backstage/plugin-home@npm:0.5.7"
   dependencies:
     "@backstage/catalog-model": ^1.4.1
     "@backstage/config": ^1.0.8
-    "@backstage/core-components": ^0.13.3
+    "@backstage/core-components": ^0.13.4
     "@backstage/core-plugin-api": ^1.5.3
-    "@backstage/plugin-catalog-react": ^1.8.0
-    "@backstage/plugin-home-react": ^0.1.1
+    "@backstage/plugin-catalog-react": ^1.8.3
+    "@backstage/plugin-home-react": ^0.1.2
     "@backstage/theme": ^0.4.1
     "@material-ui/core": ^4.12.2
     "@material-ui/icons": ^4.9.1
@@ -7048,7 +7355,7 @@ __metadata:
     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: cf27862ba80f166691880b46c942726515695537ecb61eb4996109fdf32d2797ae47e25a0342f4cf1e4f1403262456dc5b6e190cd0ef28c80f188fd34aaa7196
+  checksum: 9d6d77fc07507b5b861fa650eaba318af693f9c972eb33513b499eda4abba242ae75621403a59ae9a0ba1370c25229405081af208a3bd52455942cfa17aa89fe
   languageName: node
   linkType: hard
 
@@ -7078,7 +7385,6 @@ __metadata:
     "@testing-library/jest-dom": ^5.10.1
     "@testing-library/react": ^12.1.3
     "@testing-library/user-event": ^14.0.0
-    "@types/node": ^16.11.26
     "@types/react": ^16.13.1 || ^17.0.0
     "@types/react-grid-layout": ^1.3.2
     lodash: ^4.17.21
@@ -7086,7 +7392,7 @@ __metadata:
     react-grid-layout: ^1.3.4
     react-resizable: ^3.0.4
     react-use: ^17.2.4
-    zod: ~3.21.4
+    zod: ^3.21.4
   peerDependencies:
     react: ^16.13.1 || ^17.0.0
     react-dom: ^16.13.1 || ^17.0.0
@@ -7117,7 +7423,6 @@ __metadata:
     "@testing-library/jest-dom": ^5.10.1
     "@testing-library/react": ^12.1.3
     "@testing-library/user-event": ^14.0.0
-    "@types/node": ^16.11.26
     "@types/react": ^16.13.1 || ^17.0.0
     humanize-duration: ^3.26.0
     luxon: ^3.0.0
@@ -7191,7 +7496,6 @@ __metadata:
     "@testing-library/jest-dom": ^5.10.1
     "@testing-library/react": ^12.1.3
     "@testing-library/user-event": ^14.0.0
-    "@types/node": ^16.11.26
     "@types/react": ^16.13.1 || ^17.0.0
     "@types/testing-library__jest-dom": ^5.9.1
     cross-fetch: ^3.1.5
@@ -7250,7 +7554,6 @@ __metadata:
     "@testing-library/react": ^12.1.3
     "@testing-library/react-hooks": ^8.0.0
     "@testing-library/user-event": ^14.0.0
-    "@types/node": ^16.11.26
     "@types/react": ^16.13.1 || ^17.0.0
     jest-when: ^3.1.0
     msw: ^1.0.0
@@ -7284,6 +7587,7 @@ __metadata:
     "@backstage/plugin-kubernetes-common": "workspace:^"
     "@backstage/plugin-permission-common": "workspace:^"
     "@backstage/plugin-permission-node": "workspace:^"
+    "@backstage/types": "workspace:^"
     "@google-cloud/container": ^4.0.0
     "@jest-mock/express": ^2.0.1
     "@kubernetes/client-node": 0.18.1
@@ -7354,12 +7658,16 @@ __metadata:
     "@types/node": ^16.11.26
     "@types/react": ^16.13.1 || ^17.0.0
     cronstrue: ^2.2.0
+    jest-websocket-mock: ^2.4.1
     js-yaml: ^4.0.0
     kubernetes-models: ^4.1.0
     lodash: ^4.17.21
     luxon: ^3.0.0
     msw: ^1.0.0
     react-use: ^17.2.4
+    xterm: ^5.2.1
+    xterm-addon-attach: ^0.8.0
+    xterm-addon-fit: ^0.7.0
   peerDependencies:
     react: ^16.13.1 || ^17.0.0
     react-dom: ^16.13.1 || ^17.0.0
@@ -7417,7 +7725,6 @@ __metadata:
     "@testing-library/react": ^12.1.3
     "@testing-library/react-hooks": ^8.0.0
     "@testing-library/user-event": ^14.0.0
-    "@types/node": ^16.11.26
     "@types/react": ^16.13.1 || ^17.0.0
     msw: ^1.0.0
     react-use: ^17.2.4
@@ -7493,7 +7800,6 @@ __metadata:
     "@testing-library/jest-dom": ^5.10.1
     "@testing-library/react": ^12.1.3
     "@testing-library/user-event": ^14.0.0
-    "@types/node": "*"
     "@types/react": ^16.13.1 || ^17.0.0
     luxon: ^2.0.2
     msw: ^1.0.0
@@ -7526,7 +7832,6 @@ __metadata:
     "@testing-library/jest-dom": ^5.10.1
     "@testing-library/react": ^12.1.3
     "@testing-library/user-event": ^14.0.0
-    "@types/node": ^16.11.26
     "@types/react": ^16.13.1 || ^17.0.0
     classnames: ^2.3.1
     dompurify: ^2.3.6
@@ -7570,6 +7875,7 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "@backstage/plugin-newrelic@workspace:plugins/newrelic"
   dependencies:
+    "@backstage/backend-test-utils": "workspace:^"
     "@backstage/cli": "workspace:^"
     "@backstage/core-app-api": "workspace:^"
     "@backstage/core-components": "workspace:^"
@@ -7584,10 +7890,11 @@ __metadata:
     "@testing-library/jest-dom": ^5.10.1
     "@testing-library/react": ^12.1.3
     "@testing-library/user-event": ^14.0.0
-    "@types/node": ^16.11.26
+    "@types/parse-link-header": ^2.0.1
     "@types/react": ^16.13.1 || ^17.0.0
     cross-fetch: ^3.1.5
-    msw: ^1.0.0
+    msw: ^1.2.3
+    parse-link-header: ^2.0.0
     react-use: ^17.2.4
   peerDependencies:
     react: ^16.13.1 || ^17.0.0
@@ -7636,7 +7943,7 @@ __metadata:
     "@testing-library/jest-dom": ^5.10.1
     "@testing-library/react": ^12.1.3
     "@testing-library/user-event": ^14.0.0
-    "@types/node": "*"
+    "@types/react": ^16.13.1 || ^17.0.0
     cross-fetch: ^3.1.5
     luxon: ^3.3.0
     msw: ^1.0.0
@@ -7668,7 +7975,6 @@ __metadata:
     "@testing-library/jest-dom": ^5.10.1
     "@testing-library/react": ^12.1.3
     "@testing-library/user-event": ^14.0.0
-    "@types/node": "*"
     "@types/react": ^16.13.1 || ^17.0.0
     msw: ^1.0.0
     react-use: ^17.2.4
@@ -7679,6 +7985,40 @@ __metadata:
   languageName: unknown
   linkType: soft
 
+"@backstage/plugin-opencost@workspace:plugins/opencost":
+  version: 0.0.0-use.local
+  resolution: "@backstage/plugin-opencost@workspace:plugins/opencost"
+  dependencies:
+    "@backstage/cli": "workspace:^"
+    "@backstage/core-app-api": "workspace:^"
+    "@backstage/core-components": "workspace:^"
+    "@backstage/core-plugin-api": "workspace:^"
+    "@backstage/dev-utils": "workspace:^"
+    "@backstage/test-utils": "workspace:^"
+    "@backstage/theme": "workspace:^"
+    "@date-io/luxon": 1.x
+    "@material-ui/core": ^4.9.13
+    "@material-ui/icons": ^4.9.1
+    "@material-ui/lab": ^4.0.0-alpha.60
+    "@material-ui/pickers": ^3.3.10
+    "@material-ui/styles": ^4.11.5
+    "@testing-library/jest-dom": ^5.10.1
+    "@testing-library/react": ^12.1.3
+    "@testing-library/user-event": ^14.0.0
+    "@types/react": ^16.13.1 || ^17.0.0
+    axios: ^1.4.0
+    cross-fetch: ^3.1.5
+    date-fns: ^2.30.0
+    lodash: ^4.17.21
+    msw: ^1.0.0
+    react-use: ^17.2.4
+    recharts: ^2.5.0
+  peerDependencies:
+    react: ^16.13.1 || ^17.0.0
+    react-router-dom: "*"
+  languageName: unknown
+  linkType: soft
+
 "@backstage/plugin-org-react@workspace:plugins/org-react":
   version: 0.0.0-use.local
   resolution: "@backstage/plugin-org-react@workspace:plugins/org-react"
@@ -7700,7 +8040,6 @@ __metadata:
     "@testing-library/jest-dom": ^5.10.1
     "@testing-library/react": ^12.1.3
     "@testing-library/user-event": ^14.0.0
-    "@types/node": "*"
     "@types/react": ^16.13.1 || ^17.0.0
     msw: ^1.0.0
     react-use: ^17.2.4
@@ -7734,8 +8073,8 @@ __metadata:
     "@testing-library/dom": ^8.0.0
     "@testing-library/jest-dom": ^5.10.1
     "@testing-library/react": ^12.1.3
+    "@testing-library/react-hooks": ^8.0.1
     "@testing-library/user-event": ^14.0.0
-    "@types/node": ^16.11.26
     "@types/react": ^16.13.1 || ^17.0.0
     msw: ^1.0.0
     p-limit: ^3.1.0
@@ -7771,7 +8110,6 @@ __metadata:
     "@testing-library/jest-dom": ^5.10.1
     "@testing-library/react": ^12.1.3
     "@testing-library/user-event": ^14.0.0
-    "@types/node": ^16.11.26
     "@types/react": ^16.13.1 || ^17.0.0
     classnames: ^2.2.6
     luxon: ^3.0.0
@@ -7826,7 +8164,6 @@ __metadata:
     "@testing-library/react": ^12.1.3
     "@testing-library/user-event": ^14.0.0
     "@types/luxon": ^3.0.0
-    "@types/node": ^16.11.26
     "@types/react": ^16.13.1 || ^17.0.0
     luxon: ^3.0.0
     msw: ^1.0.0
@@ -7838,6 +8175,20 @@ __metadata:
   languageName: unknown
   linkType: soft
 
+"@backstage/plugin-permission-backend-module-allow-all-policy@workspace:^, @backstage/plugin-permission-backend-module-allow-all-policy@workspace:plugins/permission-backend-module-policy-allow-all":
+  version: 0.0.0-use.local
+  resolution: "@backstage/plugin-permission-backend-module-allow-all-policy@workspace:plugins/permission-backend-module-policy-allow-all"
+  dependencies:
+    "@backstage/backend-common": "workspace:^"
+    "@backstage/backend-plugin-api": "workspace:^"
+    "@backstage/backend-test-utils": "workspace:^"
+    "@backstage/cli": "workspace:^"
+    "@backstage/plugin-auth-node": "workspace:^"
+    "@backstage/plugin-permission-common": "workspace:^"
+    "@backstage/plugin-permission-node": "workspace:^"
+  languageName: unknown
+  linkType: soft
+
 "@backstage/plugin-permission-backend@workspace:^, @backstage/plugin-permission-backend@workspace:plugins/permission-backend":
   version: 0.0.0-use.local
   resolution: "@backstage/plugin-permission-backend@workspace:plugins/permission-backend"
@@ -7866,7 +8217,21 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@backstage/plugin-permission-common@^0.7.7, @backstage/plugin-permission-common@workspace:^, @backstage/plugin-permission-common@workspace:plugins/permission-common":
+"@backstage/plugin-permission-common@npm:^0.7.7":
+  version: 0.7.7
+  resolution: "@backstage/plugin-permission-common@npm:0.7.7"
+  dependencies:
+    "@backstage/config": ^1.0.8
+    "@backstage/errors": ^1.2.1
+    "@backstage/types": ^1.1.0
+    cross-fetch: ^3.1.5
+    uuid: ^8.0.0
+    zod: ^3.21.4
+  checksum: cf529acd946f667c291ed4f77947ef79737580b5396ec5cdcf4bc954238c54fe29503af8dfec0aca97ad4e378edb44e23936df6fd186bfa0f1d61f34997c4588
+  languageName: node
+  linkType: hard
+
+"@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:
@@ -7904,7 +8269,26 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@backstage/plugin-permission-react@^0.4.14, @backstage/plugin-permission-react@workspace:^, @backstage/plugin-permission-react@workspace:plugins/permission-react":
+"@backstage/plugin-permission-react@npm:^0.4.14":
+  version: 0.4.14
+  resolution: "@backstage/plugin-permission-react@npm:0.4.14"
+  dependencies:
+    "@backstage/config": ^1.0.8
+    "@backstage/core-plugin-api": ^1.5.3
+    "@backstage/plugin-permission-common": ^0.7.7
+    "@types/react": ^16.13.1 || ^17.0.0
+    cross-fetch: ^3.1.5
+    react-use: ^17.2.4
+    swr: ^2.0.0
+  peerDependencies:
+    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: a41c652a133a5ffd54342f0dd9cf9db72be9b174bd20e04ad75a513ff9a61b00d84a2ddabcbf381473fae5e19ba76c33b121b16bfd60684758fda3b1b653955e
+  languageName: node
+  linkType: hard
+
+"@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:
@@ -7992,7 +8376,6 @@ __metadata:
     "@testing-library/react": ^12.1.3
     "@testing-library/react-hooks": ^8.0.0
     "@testing-library/user-event": ^14.0.0
-    "@types/node": "*"
     "@types/react": ^16.13.1 || ^17.0.0
     lodash: ^4.17.21
     msw: ^1.0.0
@@ -8057,7 +8440,6 @@ __metadata:
     "@testing-library/jest-dom": ^5.10.1
     "@testing-library/react": ^12.1.3
     "@testing-library/user-event": ^14.0.0
-    "@types/node": "*"
     "@types/react": ^16.13.1 || ^17.0.0
     msw: ^1.0.1
     react-use: ^17.2.4
@@ -8114,7 +8496,6 @@ __metadata:
     "@testing-library/react": ^12.1.3
     "@testing-library/react-hooks": ^8.0.0
     "@testing-library/user-event": ^14.0.0
-    "@types/node": ^16.11.26
     "@types/react": ^16.13.1 || ^17.0.0
     cross-fetch: ^3.1.5
     lodash: ^4.17.21
@@ -8276,7 +8657,7 @@ __metadata:
     command-exists: ^1.2.9
     compression: ^1.7.4
     cors: ^2.8.5
-    esbuild: ^0.18.0
+    esbuild: ^0.19.0
     express: ^4.17.1
     express-promise-router: ^4.1.0
     fs-extra: 10.1.0
@@ -8390,7 +8771,7 @@ __metadata:
     luxon: ^3.0.0
     qs: ^6.9.4
     react-use: ^17.2.4
-    use-immer: ^0.8.0
+    use-immer: ^0.9.0
     zen-observable: ^0.10.0
     zod: ^3.21.4
     zod-to-json-schema: ^3.20.4
@@ -8443,7 +8824,6 @@ __metadata:
     "@testing-library/user-event": ^14.0.0
     "@types/humanize-duration": ^3.18.1
     "@types/json-schema": ^7.0.9
-    "@types/node": ^16.11.26
     "@types/react": ^16.13.1 || ^17.0.0
     "@uiw/react-codemirror": ^4.9.3
     classnames: ^2.2.6
@@ -8481,6 +8861,7 @@ __metadata:
     "@backstage/catalog-model": "workspace:^"
     "@backstage/cli": "workspace:^"
     "@backstage/config": "workspace:^"
+    "@backstage/errors": "workspace:^"
     "@backstage/plugin-catalog-common": "workspace:^"
     "@backstage/plugin-catalog-node": "workspace:^"
     "@backstage/plugin-permission-common": "workspace:^"
@@ -8629,6 +9010,16 @@ __metadata:
   languageName: unknown
   linkType: soft
 
+"@backstage/plugin-search-common@npm:^1.2.5":
+  version: 1.2.5
+  resolution: "@backstage/plugin-search-common@npm:1.2.5"
+  dependencies:
+    "@backstage/plugin-permission-common": ^0.7.7
+    "@backstage/types": ^1.1.0
+  checksum: cd995f9dddf42c1e5ec94c4bb34103d58bce60174fc122c3db93f13f314064188b8903b0402c5ce21493d41660ab0221cb9e35ec97cdf3c28c3756e2c17edfe0
+  languageName: node
+  linkType: hard
+
 "@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"
@@ -8698,7 +9089,6 @@ __metadata:
     "@testing-library/react": ^12.1.3
     "@testing-library/react-hooks": ^8.0.0
     "@testing-library/user-event": ^14.0.0
-    "@types/node": ^16.11.26
     "@types/react": ^16.13.1 || ^17.0.0
     history: ^5.0.0
     msw: ^1.0.0
@@ -8734,7 +9124,6 @@ __metadata:
     "@testing-library/react": ^12.1.3
     "@testing-library/user-event": ^14.0.0
     "@types/luxon": ^3.0.0
-    "@types/node": ^16.11.26
     "@types/react": ^16.13.1 || ^17.0.0
     cross-fetch: ^3.1.5
     luxon: ^3.0.0
@@ -8767,7 +9156,6 @@ __metadata:
     "@testing-library/jest-dom": ^5.10.1
     "@testing-library/react": ^12.1.3
     "@testing-library/user-event": ^14.0.0
-    "@types/node": ^16.11.26
     "@types/react": ^16.13.1 || ^17.0.0
     "@types/zen-observable": ^0.8.2
     msw: ^1.0.0
@@ -8840,12 +9228,11 @@ __metadata:
     "@testing-library/jest-dom": ^5.10.1
     "@testing-library/react": ^12.1.3
     "@testing-library/user-event": ^14.0.0
-    "@types/node": ^16.11.26
     "@types/react": ^16.13.1 || ^17.0.0
     cross-fetch: ^3.1.5
     luxon: ^3.0.0
     msw: ^1.0.0
-    rc-progress: 3.4.2
+    rc-progress: 3.5.1
     react-use: ^17.2.4
   peerDependencies:
     react: ^16.13.1 || ^17.0.0
@@ -8875,7 +9262,6 @@ __metadata:
     "@testing-library/react": ^12.1.3
     "@testing-library/user-event": ^14.0.0
     "@types/luxon": ^3.0.0
-    "@types/node": ^16.11.26
     "@types/react": ^16.13.1 || ^17.0.0
     classnames: ^2.2.6
     luxon: ^3.0.0
@@ -8926,7 +9312,6 @@ __metadata:
     "@testing-library/jest-dom": ^5.10.1
     "@testing-library/react": ^12.1.3
     "@testing-library/user-event": ^14.0.0
-    "@types/node": ^16.11.26
     "@types/react": ^16.13.1 || ^17.0.0
     cross-fetch: ^3.1.5
     lodash: ^4.17.21
@@ -8958,7 +9343,6 @@ __metadata:
     "@testing-library/jest-dom": ^5.10.1
     "@testing-library/react": ^12.1.3
     "@testing-library/user-event": ^14.0.0
-    "@types/node": "*"
     "@types/react": ^16.13.1 || ^17.0.0
     msw: ^1.0.0
     react-use: ^17.2.4
@@ -9070,7 +9454,6 @@ __metadata:
     "@testing-library/jest-dom": ^5.10.1
     "@testing-library/react": ^12.1.3
     "@testing-library/user-event": ^14.0.0
-    "@types/node": ^16.11.26
     "@types/react": ^16.13.1 || ^17.0.0
     msw: ^1.0.0
     qs: ^6.9.4
@@ -9102,7 +9485,6 @@ __metadata:
     "@testing-library/user-event": ^14.0.0
     "@types/color": ^3.0.1
     "@types/d3-force": ^3.0.0
-    "@types/node": ^16.11.26
     "@types/react": ^16.13.1 || ^17.0.0
     color: ^4.0.1
     cross-fetch: ^3.1.5
@@ -9140,7 +9522,6 @@ __metadata:
     "@testing-library/jest-dom": ^5.10.1
     "@testing-library/react": ^12.1.3
     "@testing-library/user-event": ^14.0.0
-    "@types/node": ^16.11.26
     "@types/react": ^16.13.1 || ^17.0.0
     msw: ^1.0.0
     react-use: ^17.2.4
@@ -9210,7 +9591,6 @@ __metadata:
     "@testing-library/jest-dom": ^5.10.1
     "@testing-library/react": ^12.1.3
     "@testing-library/user-event": ^14.0.0
-    "@types/node": ^16.11.26
     "@types/react": ^16.13.1 || ^17.0.0
     git-url-parse: ^13.0.0
     msw: ^1.0.0
@@ -9329,7 +9709,6 @@ __metadata:
     "@testing-library/user-event": ^14.0.0
     "@types/dompurify": ^2.2.2
     "@types/event-source-polyfill": ^1.0.0
-    "@types/node": ^16.11.26
     "@types/react": ^16.13.1 || ^17.0.0
     canvas: ^2.10.2
     cross-fetch: ^3.1.5
@@ -9395,7 +9774,6 @@ __metadata:
     "@testing-library/jest-dom": ^5.10.1
     "@testing-library/react": ^12.1.3
     "@testing-library/user-event": ^14.0.0
-    "@types/node": ^16.11.26
     "@types/react": ^16.13.1 || ^17.0.0
     msw: ^1.0.0
     react-use: ^17.2.4
@@ -9450,10 +9828,10 @@ __metadata:
     "@testing-library/jest-dom": ^5.10.1
     "@testing-library/react": ^12.1.3
     "@testing-library/user-event": ^14.0.0
-    "@types/node": ^16.11.26
     "@types/react": ^16.13.1 || ^17.0.0
     cross-fetch: ^3.1.5
     msw: ^1.0.0
+    react-i18next: ^12.3.1
     react-use: ^17.2.4
     zen-observable: ^0.10.0
   peerDependencies:
@@ -9511,7 +9889,6 @@ __metadata:
     "@testing-library/jest-dom": ^5.10.1
     "@testing-library/react": ^12.1.3
     "@testing-library/user-event": ^14.0.0
-    "@types/node": "*"
     "@types/react": ^16.13.1 || ^17.0.0
     msw: ^1.0.0
     react-use: ^17.2.4
@@ -9542,7 +9919,6 @@ __metadata:
     "@testing-library/react": ^12.1.3
     "@testing-library/user-event": ^14.0.0
     "@types/luxon": ^3.0.0
-    "@types/node": ^16.11.26
     "@types/react": ^16.13.1 || ^17.0.0
     lodash: ^4.17.21
     luxon: ^3.0.0
@@ -9562,7 +9938,6 @@ __metadata:
   dependencies:
     "@backstage/cli": "workspace:^"
     "@backstage/test-utils": "workspace:^"
-    "@types/node": ^16.0.0
     cross-fetch: ^3.1.5
     msw: ^1.0.0
   languageName: unknown
@@ -9574,14 +9949,15 @@ __metadata:
   dependencies:
     "@apidevtools/swagger-parser": ^10.1.0
     "@apisyouwonthate/style-guide": ^1.4.0
+    "@backstage/catalog-model": "workspace:^"
     "@backstage/cli": "workspace:^"
     "@backstage/cli-common": "workspace:^"
     "@backstage/cli-node": "workspace:^"
     "@backstage/errors": "workspace:^"
     "@backstage/types": "workspace:^"
     "@manypkg/get-packages": ^1.1.3
-    "@microsoft/api-documenter": ^7.19.27
-    "@microsoft/api-extractor": ^7.33.7
+    "@microsoft/api-documenter": ^7.22.33
+    "@microsoft/api-extractor": ^7.36.4
     "@stoplight/spectral-core": ^1.18.0
     "@stoplight/spectral-formatters": ^1.1.0
     "@stoplight/spectral-functions": ^1.7.2
@@ -9593,6 +9969,7 @@ __metadata:
     "@types/mock-fs": ^4.13.0
     "@types/node": ^16.11.26
     chalk: ^4.0.0
+    codeowners-utils: ^1.0.2
     commander: ^9.1.0
     fs-extra: 10.1.0
     glob: ^8.0.3
@@ -9603,6 +9980,7 @@ __metadata:
     mock-fs: ^5.1.0
     p-limit: ^3.0.2
     ts-node: ^10.0.0
+    yaml-diff-patch: ^2.0.0
   peerDependencies:
     "@microsoft/api-extractor-model": "*"
     "@microsoft/tsdoc": "*"
@@ -9635,7 +10013,6 @@ __metadata:
     "@testing-library/jest-dom": ^5.10.1
     "@testing-library/react": ^12.1.3
     "@testing-library/user-event": ^14.0.0
-    "@types/node": ^16.11.26
     "@types/react": ^16.13.1 || ^17.0.0
     cross-fetch: ^3.1.5
     msw: ^1.0.0
@@ -9717,10 +10094,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@braintree/sanitize-url@npm:=6.0.2":
-  version: 6.0.2
-  resolution: "@braintree/sanitize-url@npm:6.0.2"
-  checksum: 6a9dfd4081cc96516eeb281d1a83d3b5f1ad3d2837adf968fcc2ba18889ee833554f9c641b4083c36d3360a932e4504ddf25b0b51e9933c3742622df82cf7c9a
+"@braintree/sanitize-url@npm:=6.0.4":
+  version: 6.0.4
+  resolution: "@braintree/sanitize-url@npm:6.0.4"
+  checksum: f5ec6048973722ea1c46ae555d2e9eb848d7fa258994f8ea7d6db9514ee754ea3ef344ef71b3696d486776bcb839f3124e79f67c6b5b2814ed2da220b340627c
   languageName: node
   linkType: hard
 
@@ -9990,8 +10367,8 @@ __metadata:
   linkType: hard
 
 "@codemirror/language@npm:^6.0.0":
-  version: 6.8.0
-  resolution: "@codemirror/language@npm:6.8.0"
+  version: 6.9.0
+  resolution: "@codemirror/language@npm:6.9.0"
   dependencies:
     "@codemirror/state": ^6.0.0
     "@codemirror/view": ^6.0.0
@@ -9999,7 +10376,7 @@ __metadata:
     "@lezer/highlight": ^1.0.0
     "@lezer/lr": ^1.0.0
     style-mod: ^4.0.0
-  checksum: 64408d996641931fa4c6b892e17ee1fdaee0f63d3d84c019a6ea7b1e6d1c774f92357b95c2ebaed60545062b795b72d0a058c03578b2bf4023c87726e97b5d2f
+  checksum: 9a897fb0f569159eeafb7dce83061b425af7244bbeae2649e0e677488548b2a02eaf0c13c0c5b4d59da55e8866e6f4dc7abe3dfaa09c13749a2fa2c0dbc0c565
   languageName: node
   linkType: hard
 
@@ -10054,13 +10431,13 @@ __metadata:
   linkType: hard
 
 "@codemirror/view@npm:^6.0.0":
-  version: 6.16.0
-  resolution: "@codemirror/view@npm:6.16.0"
+  version: 6.18.0
+  resolution: "@codemirror/view@npm:6.18.0"
   dependencies:
     "@codemirror/state": ^6.1.4
-    style-mod: ^4.0.0
+    style-mod: ^4.1.0
     w3c-keyname: ^2.2.4
-  checksum: 54d412b5159716c8a1a9c46fa04ff083e68a663cb887e6e2a4ca86fe9c3930d5255200fe84c65620e0a442f62dc2c13df277bcd1d4eef2e11e3c4e124fcf9d38
+  checksum: 275bf5898e884297f16f73e4dff1b520a196a5f7724fbeda634a927e7f4036f6786e816b124505942de99800fb66c538307e8c08e55234ad57483f1a009e3d35
   languageName: node
   linkType: hard
 
@@ -10198,38 +10575,35 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@emotion/babel-plugin@npm:^11.10.5":
-  version: 11.10.5
-  resolution: "@emotion/babel-plugin@npm:11.10.5"
+"@emotion/babel-plugin@npm:^11.11.0":
+  version: 11.11.0
+  resolution: "@emotion/babel-plugin@npm:11.11.0"
   dependencies:
     "@babel/helper-module-imports": ^7.16.7
-    "@babel/plugin-syntax-jsx": ^7.17.12
     "@babel/runtime": ^7.18.3
-    "@emotion/hash": ^0.9.0
-    "@emotion/memoize": ^0.8.0
-    "@emotion/serialize": ^1.1.1
+    "@emotion/hash": ^0.9.1
+    "@emotion/memoize": ^0.8.1
+    "@emotion/serialize": ^1.1.2
     babel-plugin-macros: ^3.1.0
     convert-source-map: ^1.5.0
     escape-string-regexp: ^4.0.0
     find-root: ^1.1.0
     source-map: ^0.5.7
-    stylis: 4.1.3
-  peerDependencies:
-    "@babel/core": ^7.0.0
-  checksum: e3353499c76c4422d6e900c0dfab73607056d9da86161a3f27c3459c193c4908050c5d252c68fcde231e13f02a9d8e0dc07d260317ae0e5206841e331cc4caae
+    stylis: 4.2.0
+  checksum: 6b363edccc10290f7a23242c06f88e451b5feb2ab94152b18bb8883033db5934fb0e421e2d67d09907c13837c21218a3ac28c51707778a54d6cd3706c0c2f3f9
   languageName: node
   linkType: hard
 
-"@emotion/cache@npm:^11.10.5, @emotion/cache@npm:^11.10.7":
-  version: 11.10.7
-  resolution: "@emotion/cache@npm:11.10.7"
+"@emotion/cache@npm:^11.11.0":
+  version: 11.11.0
+  resolution: "@emotion/cache@npm:11.11.0"
   dependencies:
-    "@emotion/memoize": ^0.8.0
-    "@emotion/sheet": ^1.2.1
-    "@emotion/utils": ^1.2.0
-    "@emotion/weak-memoize": ^0.3.0
-    stylis: 4.1.3
-  checksum: 6b1efed2dffc93dac419409d91f6d57a200d858ec5ffa4b7c30080fdbd93db431ff86bb779c5b8830b8373f3c5dd754d9beb386604ed2667c7d55608ff653dfc
+    "@emotion/memoize": ^0.8.1
+    "@emotion/sheet": ^1.2.2
+    "@emotion/utils": ^1.2.1
+    "@emotion/weak-memoize": ^0.3.1
+    stylis: 4.2.0
+  checksum: 8eb1dc22beaa20c21a2e04c284d5a2630a018a9d51fb190e52de348c8d27f4e8ca4bbab003d68b4f6cd9cc1c569ca747a997797e0f76d6c734a660dc29decf08
   languageName: node
   linkType: hard
 
@@ -10240,93 +10614,87 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@emotion/hash@npm:^0.9.0":
-  version: 0.9.0
-  resolution: "@emotion/hash@npm:0.9.0"
-  checksum: b63428f7c8186607acdca5d003700cecf0ded519d0b5c5cc3b3154eafcad6ff433f8361bd2bac8882715b557e6f06945694aeb6ba8b25c6095d7a88570e2e0bb
+"@emotion/hash@npm:^0.9.1":
+  version: 0.9.1
+  resolution: "@emotion/hash@npm:0.9.1"
+  checksum: 716e17e48bf9047bf9383982c071de49f2615310fb4e986738931776f5a823bc1f29c84501abe0d3df91a3803c80122d24e28b57351bca9e01356ebb33d89876
   languageName: node
   linkType: hard
 
-"@emotion/is-prop-valid@npm:^1.1.0, @emotion/is-prop-valid@npm:^1.2.0":
-  version: 1.2.0
-  resolution: "@emotion/is-prop-valid@npm:1.2.0"
+"@emotion/is-prop-valid@npm:^1.1.0, @emotion/is-prop-valid@npm:^1.2.1":
+  version: 1.2.1
+  resolution: "@emotion/is-prop-valid@npm:1.2.1"
   dependencies:
-    "@emotion/memoize": ^0.8.0
-  checksum: cc7a19850a4c5b24f1514665289442c8c641709e6f7711067ad550e05df331da0692a16148e85eda6f47e31b3261b64d74c5e25194d053223be16231f969d633
+    "@emotion/memoize": ^0.8.1
+  checksum: 8f42dc573a3fad79b021479becb639b8fe3b60bdd1081a775d32388bca418ee53074c7602a4c845c5f75fa6831eb1cbdc4d208cc0299f57014ed3a02abcad16a
   languageName: node
   linkType: hard
 
-"@emotion/memoize@npm:^0.8.0":
-  version: 0.8.0
-  resolution: "@emotion/memoize@npm:0.8.0"
-  checksum: c87bb110b829edd8e1c13b90a6bc37cebc39af29c7599a1e66a48e06f9bec43e8e53495ba86278cc52e7589549492c8dfdc81d19f4fdec0cee6ba13d2ad2c928
+"@emotion/memoize@npm:^0.8.1":
+  version: 0.8.1
+  resolution: "@emotion/memoize@npm:0.8.1"
+  checksum: a19cc01a29fcc97514948eaab4dc34d8272e934466ed87c07f157887406bc318000c69ae6f813a9001c6a225364df04249842a50e692ef7a9873335fbcc141b0
   languageName: node
   linkType: hard
 
 "@emotion/react@npm:^11.10.5":
-  version: 11.10.5
-  resolution: "@emotion/react@npm:11.10.5"
+  version: 11.11.1
+  resolution: "@emotion/react@npm:11.11.1"
   dependencies:
     "@babel/runtime": ^7.18.3
-    "@emotion/babel-plugin": ^11.10.5
-    "@emotion/cache": ^11.10.5
-    "@emotion/serialize": ^1.1.1
-    "@emotion/use-insertion-effect-with-fallbacks": ^1.0.0
-    "@emotion/utils": ^1.2.0
-    "@emotion/weak-memoize": ^0.3.0
+    "@emotion/babel-plugin": ^11.11.0
+    "@emotion/cache": ^11.11.0
+    "@emotion/serialize": ^1.1.2
+    "@emotion/use-insertion-effect-with-fallbacks": ^1.0.1
+    "@emotion/utils": ^1.2.1
+    "@emotion/weak-memoize": ^0.3.1
     hoist-non-react-statics: ^3.3.1
   peerDependencies:
-    "@babel/core": ^7.0.0
     react: ">=16.8.0"
   peerDependenciesMeta:
-    "@babel/core":
-      optional: true
     "@types/react":
       optional: true
-  checksum: 32b67b28e9b6d6c53b970072680697f04c2521441050bdeb19a1a7f0164af549b4dad39ff375eda1b6a3cf1cc86ba2c6fa55460ec040e6ebbca3e9ec58353cf7
+  checksum: aec3c36650f5f0d3d4445ff44d73dd88712b1609645b6af3e6d08049cfbc51f1785fe13dea1a1d4ab1b0800d68f2339ab11e459687180362b1ef98863155aae5
   languageName: node
   linkType: hard
 
-"@emotion/serialize@npm:^1.1.1":
-  version: 1.1.1
-  resolution: "@emotion/serialize@npm:1.1.1"
+"@emotion/serialize@npm:^1.1.2":
+  version: 1.1.2
+  resolution: "@emotion/serialize@npm:1.1.2"
   dependencies:
-    "@emotion/hash": ^0.9.0
-    "@emotion/memoize": ^0.8.0
-    "@emotion/unitless": ^0.8.0
-    "@emotion/utils": ^1.2.0
+    "@emotion/hash": ^0.9.1
+    "@emotion/memoize": ^0.8.1
+    "@emotion/unitless": ^0.8.1
+    "@emotion/utils": ^1.2.1
     csstype: ^3.0.2
-  checksum: 24cfd5b16e6f2335c032ca33804a876e0442aaf8f9c94d269d23735ebd194fb1ed142542dd92191a3e6ef8bad5bd560dfc5aaf363a1b70954726dbd4dd93085c
+  checksum: 413c352e657f1b5e27ea6437b3ef7dcc3860669b7ae17fd5c18bfbd44e033af1acc56b64d252284a813ca4f3b3e1b0841c42d3fb08e02d2df56fd3cd63d72986
   languageName: node
   linkType: hard
 
-"@emotion/sheet@npm:^1.2.1":
-  version: 1.2.1
-  resolution: "@emotion/sheet@npm:1.2.1"
-  checksum: ce78763588ea522438156344d9f592203e2da582d8d67b32e1b0b98eaba26994c6c270f8c7ad46442fc9c0a9f048685d819cd73ca87e544520fd06f0e24a1562
+"@emotion/sheet@npm:^1.2.2":
+  version: 1.2.2
+  resolution: "@emotion/sheet@npm:1.2.2"
+  checksum: d973273c9c15f1c291ca2269728bf044bd3e92a67bca87943fa9ec6c3cd2b034f9a6bfe95ef1b5d983351d128c75b547b43ff196a00a3875f7e1d269793cecfe
   languageName: node
   linkType: hard
 
 "@emotion/styled@npm:^11.10.5":
-  version: 11.10.5
-  resolution: "@emotion/styled@npm:11.10.5"
+  version: 11.11.0
+  resolution: "@emotion/styled@npm:11.11.0"
   dependencies:
     "@babel/runtime": ^7.18.3
-    "@emotion/babel-plugin": ^11.10.5
-    "@emotion/is-prop-valid": ^1.2.0
-    "@emotion/serialize": ^1.1.1
-    "@emotion/use-insertion-effect-with-fallbacks": ^1.0.0
-    "@emotion/utils": ^1.2.0
+    "@emotion/babel-plugin": ^11.11.0
+    "@emotion/is-prop-valid": ^1.2.1
+    "@emotion/serialize": ^1.1.2
+    "@emotion/use-insertion-effect-with-fallbacks": ^1.0.1
+    "@emotion/utils": ^1.2.1
   peerDependencies:
-    "@babel/core": ^7.0.0
     "@emotion/react": ^11.0.0-rc.0
     react: ">=16.8.0"
   peerDependenciesMeta:
-    "@babel/core":
-      optional: true
     "@types/react":
       optional: true
-  checksum: 1cec5f6aeb227a7255141031e8594f38ad83902413472aae0a46c27e5f9769c01e23c1ad39adee408d8a2168a697464314d1a0c4f50b31a5d25ea506b2d7bbc8
+  checksum: 904f641aad3892c65d7d6c0808b036dae1e6d6dad4861c1c7dc0baa59977047c6cad220691206eba7b4059f1a1c6e6c1ef4ebb8c829089e280fa0f2164a01e6b
   languageName: node
   linkType: hard
 
@@ -10344,33 +10712,33 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@emotion/unitless@npm:^0.8.0":
-  version: 0.8.0
-  resolution: "@emotion/unitless@npm:0.8.0"
-  checksum: 176141117ed23c0eb6e53a054a69c63e17ae532ec4210907a20b2208f91771821835f1c63dd2ec63e30e22fcc984026d7f933773ee6526dd038e0850919fae7a
+"@emotion/unitless@npm:^0.8.1":
+  version: 0.8.1
+  resolution: "@emotion/unitless@npm:0.8.1"
+  checksum: 385e21d184d27853bb350999471f00e1429fa4e83182f46cd2c164985999d9b46d558dc8b9cc89975cb337831ce50c31ac2f33b15502e85c299892e67e7b4a88
   languageName: node
   linkType: hard
 
-"@emotion/use-insertion-effect-with-fallbacks@npm:^1.0.0":
-  version: 1.0.0
-  resolution: "@emotion/use-insertion-effect-with-fallbacks@npm:1.0.0"
+"@emotion/use-insertion-effect-with-fallbacks@npm:^1.0.1":
+  version: 1.0.1
+  resolution: "@emotion/use-insertion-effect-with-fallbacks@npm:1.0.1"
   peerDependencies:
     react: ">=16.8.0"
-  checksum: 4f06a3b48258c832aa8022a262572061a31ff078d377e9164cccc99951309d70f4466e774fe704461b2f8715007a82ed625a54a5c7a127c89017d3ce3187d4f1
+  checksum: 700b6e5bbb37a9231f203bb3af11295eed01d73b2293abece0bc2a2237015e944d7b5114d4887ad9a79776504aa51ed2a8b0ddbc117c54495dd01a6b22f93786
   languageName: node
   linkType: hard
 
-"@emotion/utils@npm:^1.2.0":
-  version: 1.2.0
-  resolution: "@emotion/utils@npm:1.2.0"
-  checksum: 55457a49ddd4db6a014ea0454dc09eaa23eedfb837095c8ff90470cb26a303f7ceb5fcc1e2190ef64683e64cfd33d3ba3ca3109cd87d12bc9e379e4195c9a4dd
+"@emotion/utils@npm:^1.2.1":
+  version: 1.2.1
+  resolution: "@emotion/utils@npm:1.2.1"
+  checksum: e0b44be0705b56b079c55faff93952150be69e79b660ae70ddd5b6e09fc40eb1319654315a9f34bb479d7f4ec94be6068c061abbb9e18b9778ae180ad5d97c73
   languageName: node
   linkType: hard
 
-"@emotion/weak-memoize@npm:^0.3.0":
-  version: 0.3.0
-  resolution: "@emotion/weak-memoize@npm:0.3.0"
-  checksum: f43ef4c8b7de70d9fa5eb3105921724651e4188e895beb71f0c5919dc899a7b8743e1fdd99d38b9092dd5722c7be2312ebb47fbdad0c4e38bea58f6df5885cc0
+"@emotion/weak-memoize@npm:^0.3.1":
+  version: 0.3.1
+  resolution: "@emotion/weak-memoize@npm:0.3.1"
+  checksum: b2be47caa24a8122622ea18cd2d650dbb4f8ad37b636dc41ed420c2e082f7f1e564ecdea68122b546df7f305b159bf5ab9ffee872abd0f052e687428459af594
   languageName: node
   linkType: hard
 
@@ -10394,6 +10762,16 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@esbuild-kit/esm-loader@npm:^2.5.5":
+  version: 2.5.5
+  resolution: "@esbuild-kit/esm-loader@npm:2.5.5"
+  dependencies:
+    "@esbuild-kit/core-utils": ^3.0.0
+    get-tsconfig: ^4.4.0
+  checksum: 9d4a03ffc937fbec75a8456c3d45d7cdb1a65768416791a5720081753502bc9f485ba27942a46f564b12483b140a8a46c12433a4496430d93e4513e430484ec7
+  languageName: node
+  linkType: hard
+
 "@esbuild/android-arm64@npm:0.16.17":
   version: 0.16.17
   resolution: "@esbuild/android-arm64@npm:0.16.17"
@@ -10401,9 +10779,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@esbuild/android-arm64@npm:0.18.19":
-  version: 0.18.19
-  resolution: "@esbuild/android-arm64@npm:0.18.19"
+"@esbuild/android-arm64@npm:0.19.2":
+  version: 0.19.2
+  resolution: "@esbuild/android-arm64@npm:0.19.2"
   conditions: os=android & cpu=arm64
   languageName: node
   linkType: hard
@@ -10422,9 +10800,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@esbuild/android-arm@npm:0.18.19":
-  version: 0.18.19
-  resolution: "@esbuild/android-arm@npm:0.18.19"
+"@esbuild/android-arm@npm:0.19.2":
+  version: 0.19.2
+  resolution: "@esbuild/android-arm@npm:0.19.2"
   conditions: os=android & cpu=arm
   languageName: node
   linkType: hard
@@ -10436,9 +10814,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@esbuild/android-x64@npm:0.18.19":
-  version: 0.18.19
-  resolution: "@esbuild/android-x64@npm:0.18.19"
+"@esbuild/android-x64@npm:0.19.2":
+  version: 0.19.2
+  resolution: "@esbuild/android-x64@npm:0.19.2"
   conditions: os=android & cpu=x64
   languageName: node
   linkType: hard
@@ -10450,9 +10828,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@esbuild/darwin-arm64@npm:0.18.19":
-  version: 0.18.19
-  resolution: "@esbuild/darwin-arm64@npm:0.18.19"
+"@esbuild/darwin-arm64@npm:0.19.2":
+  version: 0.19.2
+  resolution: "@esbuild/darwin-arm64@npm:0.19.2"
   conditions: os=darwin & cpu=arm64
   languageName: node
   linkType: hard
@@ -10464,9 +10842,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@esbuild/darwin-x64@npm:0.18.19":
-  version: 0.18.19
-  resolution: "@esbuild/darwin-x64@npm:0.18.19"
+"@esbuild/darwin-x64@npm:0.19.2":
+  version: 0.19.2
+  resolution: "@esbuild/darwin-x64@npm:0.19.2"
   conditions: os=darwin & cpu=x64
   languageName: node
   linkType: hard
@@ -10478,9 +10856,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@esbuild/freebsd-arm64@npm:0.18.19":
-  version: 0.18.19
-  resolution: "@esbuild/freebsd-arm64@npm:0.18.19"
+"@esbuild/freebsd-arm64@npm:0.19.2":
+  version: 0.19.2
+  resolution: "@esbuild/freebsd-arm64@npm:0.19.2"
   conditions: os=freebsd & cpu=arm64
   languageName: node
   linkType: hard
@@ -10492,9 +10870,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@esbuild/freebsd-x64@npm:0.18.19":
-  version: 0.18.19
-  resolution: "@esbuild/freebsd-x64@npm:0.18.19"
+"@esbuild/freebsd-x64@npm:0.19.2":
+  version: 0.19.2
+  resolution: "@esbuild/freebsd-x64@npm:0.19.2"
   conditions: os=freebsd & cpu=x64
   languageName: node
   linkType: hard
@@ -10506,9 +10884,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@esbuild/linux-arm64@npm:0.18.19":
-  version: 0.18.19
-  resolution: "@esbuild/linux-arm64@npm:0.18.19"
+"@esbuild/linux-arm64@npm:0.19.2":
+  version: 0.19.2
+  resolution: "@esbuild/linux-arm64@npm:0.19.2"
   conditions: os=linux & cpu=arm64
   languageName: node
   linkType: hard
@@ -10520,9 +10898,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@esbuild/linux-arm@npm:0.18.19":
-  version: 0.18.19
-  resolution: "@esbuild/linux-arm@npm:0.18.19"
+"@esbuild/linux-arm@npm:0.19.2":
+  version: 0.19.2
+  resolution: "@esbuild/linux-arm@npm:0.19.2"
   conditions: os=linux & cpu=arm
   languageName: node
   linkType: hard
@@ -10534,9 +10912,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@esbuild/linux-ia32@npm:0.18.19":
-  version: 0.18.19
-  resolution: "@esbuild/linux-ia32@npm:0.18.19"
+"@esbuild/linux-ia32@npm:0.19.2":
+  version: 0.19.2
+  resolution: "@esbuild/linux-ia32@npm:0.19.2"
   conditions: os=linux & cpu=ia32
   languageName: node
   linkType: hard
@@ -10555,9 +10933,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@esbuild/linux-loong64@npm:0.18.19":
-  version: 0.18.19
-  resolution: "@esbuild/linux-loong64@npm:0.18.19"
+"@esbuild/linux-loong64@npm:0.19.2":
+  version: 0.19.2
+  resolution: "@esbuild/linux-loong64@npm:0.19.2"
   conditions: os=linux & cpu=loong64
   languageName: node
   linkType: hard
@@ -10569,9 +10947,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@esbuild/linux-mips64el@npm:0.18.19":
-  version: 0.18.19
-  resolution: "@esbuild/linux-mips64el@npm:0.18.19"
+"@esbuild/linux-mips64el@npm:0.19.2":
+  version: 0.19.2
+  resolution: "@esbuild/linux-mips64el@npm:0.19.2"
   conditions: os=linux & cpu=mips64el
   languageName: node
   linkType: hard
@@ -10583,9 +10961,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@esbuild/linux-ppc64@npm:0.18.19":
-  version: 0.18.19
-  resolution: "@esbuild/linux-ppc64@npm:0.18.19"
+"@esbuild/linux-ppc64@npm:0.19.2":
+  version: 0.19.2
+  resolution: "@esbuild/linux-ppc64@npm:0.19.2"
   conditions: os=linux & cpu=ppc64
   languageName: node
   linkType: hard
@@ -10597,9 +10975,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@esbuild/linux-riscv64@npm:0.18.19":
-  version: 0.18.19
-  resolution: "@esbuild/linux-riscv64@npm:0.18.19"
+"@esbuild/linux-riscv64@npm:0.19.2":
+  version: 0.19.2
+  resolution: "@esbuild/linux-riscv64@npm:0.19.2"
   conditions: os=linux & cpu=riscv64
   languageName: node
   linkType: hard
@@ -10611,9 +10989,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@esbuild/linux-s390x@npm:0.18.19":
-  version: 0.18.19
-  resolution: "@esbuild/linux-s390x@npm:0.18.19"
+"@esbuild/linux-s390x@npm:0.19.2":
+  version: 0.19.2
+  resolution: "@esbuild/linux-s390x@npm:0.19.2"
   conditions: os=linux & cpu=s390x
   languageName: node
   linkType: hard
@@ -10625,9 +11003,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@esbuild/linux-x64@npm:0.18.19":
-  version: 0.18.19
-  resolution: "@esbuild/linux-x64@npm:0.18.19"
+"@esbuild/linux-x64@npm:0.19.2":
+  version: 0.19.2
+  resolution: "@esbuild/linux-x64@npm:0.19.2"
   conditions: os=linux & cpu=x64
   languageName: node
   linkType: hard
@@ -10639,9 +11017,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@esbuild/netbsd-x64@npm:0.18.19":
-  version: 0.18.19
-  resolution: "@esbuild/netbsd-x64@npm:0.18.19"
+"@esbuild/netbsd-x64@npm:0.19.2":
+  version: 0.19.2
+  resolution: "@esbuild/netbsd-x64@npm:0.19.2"
   conditions: os=netbsd & cpu=x64
   languageName: node
   linkType: hard
@@ -10653,9 +11031,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@esbuild/openbsd-x64@npm:0.18.19":
-  version: 0.18.19
-  resolution: "@esbuild/openbsd-x64@npm:0.18.19"
+"@esbuild/openbsd-x64@npm:0.19.2":
+  version: 0.19.2
+  resolution: "@esbuild/openbsd-x64@npm:0.19.2"
   conditions: os=openbsd & cpu=x64
   languageName: node
   linkType: hard
@@ -10667,9 +11045,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@esbuild/sunos-x64@npm:0.18.19":
-  version: 0.18.19
-  resolution: "@esbuild/sunos-x64@npm:0.18.19"
+"@esbuild/sunos-x64@npm:0.19.2":
+  version: 0.19.2
+  resolution: "@esbuild/sunos-x64@npm:0.19.2"
   conditions: os=sunos & cpu=x64
   languageName: node
   linkType: hard
@@ -10681,9 +11059,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@esbuild/win32-arm64@npm:0.18.19":
-  version: 0.18.19
-  resolution: "@esbuild/win32-arm64@npm:0.18.19"
+"@esbuild/win32-arm64@npm:0.19.2":
+  version: 0.19.2
+  resolution: "@esbuild/win32-arm64@npm:0.19.2"
   conditions: os=win32 & cpu=arm64
   languageName: node
   linkType: hard
@@ -10695,9 +11073,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@esbuild/win32-ia32@npm:0.18.19":
-  version: 0.18.19
-  resolution: "@esbuild/win32-ia32@npm:0.18.19"
+"@esbuild/win32-ia32@npm:0.19.2":
+  version: 0.19.2
+  resolution: "@esbuild/win32-ia32@npm:0.19.2"
   conditions: os=win32 & cpu=ia32
   languageName: node
   linkType: hard
@@ -10709,9 +11087,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@esbuild/win32-x64@npm:0.18.19":
-  version: 0.18.19
-  resolution: "@esbuild/win32-x64@npm:0.18.19"
+"@esbuild/win32-x64@npm:0.19.2":
+  version: 0.19.2
+  resolution: "@esbuild/win32-x64@npm:0.19.2"
   conditions: os=win32 & cpu=x64
   languageName: node
   linkType: hard
@@ -10734,9 +11112,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@eslint/eslintrc@npm:^2.1.1":
-  version: 2.1.1
-  resolution: "@eslint/eslintrc@npm:2.1.1"
+"@eslint/eslintrc@npm:^2.1.2":
+  version: 2.1.2
+  resolution: "@eslint/eslintrc@npm:2.1.2"
   dependencies:
     ajv: ^6.12.4
     debug: ^4.3.2
@@ -10747,14 +11125,14 @@ __metadata:
     js-yaml: ^4.1.0
     minimatch: ^3.1.2
     strip-json-comments: ^3.1.1
-  checksum: bf909ea183d27238c257a82d4ffdec38ca94b906b4b8dfae02ecbe7ecc9e5a8182ef5e469c808bb8cb4fea4750f43ac4ca7c4b4a167b6cd7e3aaacd386b2bd25
+  checksum: bc742a1e3b361f06fedb4afb6bf32cbd27171292ef7924f61c62f2aed73048367bcc7ac68f98c06d4245cd3fabc43270f844e3c1699936d4734b3ac5398814a7
   languageName: node
   linkType: hard
 
-"@eslint/js@npm:^8.46.0":
-  version: 8.46.0
-  resolution: "@eslint/js@npm:8.46.0"
-  checksum: 7aed479832302882faf5bec37e9d068f270f84c19b3fb529646a7c1b031e73a312f730569c78806492bc09cfce3d7651dfab4ce09a56cbb06bc6469449e56377
+"@eslint/js@npm:8.48.0":
+  version: 8.48.0
+  resolution: "@eslint/js@npm:8.48.0"
+  checksum: b2755f9c0ee810c886eba3c50dcacb184ba5a5cd1cbc01988ee506ad7340653cae0bd55f1d95c64b56dfc6d25c2caa7825335ffd2c50165bae9996fe0f396851
   languageName: node
   linkType: hard
 
@@ -10808,6 +11186,44 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@floating-ui/core@npm:^1.4.1":
+  version: 1.4.1
+  resolution: "@floating-ui/core@npm:1.4.1"
+  dependencies:
+    "@floating-ui/utils": ^0.1.1
+  checksum: be4ab864fe17eeba5e205bd554c264b9a4895a57c573661bbf638357fa3108677fed7ba3269ec15b4da90e29274c9b626d5a15414e8d1fe691e210d02a03695c
+  languageName: node
+  linkType: hard
+
+"@floating-ui/dom@npm:^1.3.0":
+  version: 1.5.1
+  resolution: "@floating-ui/dom@npm:1.5.1"
+  dependencies:
+    "@floating-ui/core": ^1.4.1
+    "@floating-ui/utils": ^0.1.1
+  checksum: ddb509030978536ba7b321cf8c764ae9d0142a3b1fefb7e6bc050a5de7e825e12131fa5089009edabf7c125fb274886da211a5220fe17a71d875a7a96eb1386c
+  languageName: node
+  linkType: hard
+
+"@floating-ui/react-dom@npm:^2.0.1":
+  version: 2.0.1
+  resolution: "@floating-ui/react-dom@npm:2.0.1"
+  dependencies:
+    "@floating-ui/dom": ^1.3.0
+  peerDependencies:
+    react: ">=16.8.0"
+    react-dom: ">=16.8.0"
+  checksum: 00fef2cf69ac2b15952e47505fd9e23f6cc5c20a26adc707862932826d1682f3c30f83c9887abfc93574fdca2d34dd2fc00271527318b1db403549cd6bc9eb00
+  languageName: node
+  linkType: hard
+
+"@floating-ui/utils@npm:^0.1.1":
+  version: 0.1.1
+  resolution: "@floating-ui/utils@npm:0.1.1"
+  checksum: 548acdda7902f45b0afbe34e2e7f4cbff0696b95bad8c039f80936519de24ef2ec20e79902825b7815294b37f51a7c52ee86288b0688869a57cc229a164d86b4
+  languageName: node
+  linkType: hard
+
 "@fmvilas/pseudo-yaml-ast@npm:^0.3.1":
   version: 0.3.1
   resolution: "@fmvilas/pseudo-yaml-ast@npm:0.3.1"
@@ -10944,8 +11360,8 @@ __metadata:
   linkType: hard
 
 "@google-cloud/storage@npm:^6.0.0":
-  version: 6.11.0
-  resolution: "@google-cloud/storage@npm:6.11.0"
+  version: 6.12.0
+  resolution: "@google-cloud/storage@npm:6.12.0"
   dependencies:
     "@google-cloud/paginator": ^3.0.7
     "@google-cloud/projectify": ^3.0.0
@@ -10956,6 +11372,7 @@ __metadata:
     duplexify: ^4.0.0
     ent: ^2.2.0
     extend: ^3.0.2
+    fast-xml-parser: ^4.2.2
     gaxios: ^5.0.0
     google-auth-library: ^8.0.1
     mime: ^3.0.0
@@ -10964,7 +11381,7 @@ __metadata:
     retry-request: ^5.0.0
     teeny-request: ^8.0.0
     uuid: ^8.0.0
-  checksum: 4183c0ad3b271e0c22b3aa01e9942590ae64b984efa142a787b96379baaf4c05a2ebdbb6015c8ea189951df251d57f4f35c6a28b920922828cc89d3e4147d1a1
+  checksum: cfe44e3f4d1bacd8eeefa7885d261f421c4ff84e82abe50200b5b77e28322baf9cb67497872b9868b25b43b14197b1a155d5eb7b70afb39d3476fa4bdead3338
   languageName: node
   linkType: hard
 
@@ -11002,8 +11419,8 @@ __metadata:
   linkType: hard
 
 "@graphql-codegen/cli@npm:^3.0.0":
-  version: 3.3.0
-  resolution: "@graphql-codegen/cli@npm:3.3.0"
+  version: 3.3.1
+  resolution: "@graphql-codegen/cli@npm:3.3.1"
   dependencies:
     "@babel/generator": ^7.18.13
     "@babel/template": ^7.18.10
@@ -11047,7 +11464,7 @@ __metadata:
     graphql-code-generator: cjs/bin.js
     graphql-codegen: cjs/bin.js
     graphql-codegen-esm: esm/bin.js
-  checksum: 7c3ae7ba62cfb5576e6c1fc78f81a2c59d399415b9ef2ba55818af00aff2337a047a61b1cedb6e89e73dac30d9a00e57045ff6052245934bc4c5cf35c9762250
+  checksum: cc3c0b8f1fd8150591b35b549a04577e84ac9c30396ad100196f594f741dd34e69ec9b1335ec41c00afe4ecf1d7e3505c1859fa244bdef1d10753d2b441de962
   languageName: node
   linkType: hard
 
@@ -11066,18 +11483,18 @@ __metadata:
   linkType: hard
 
 "@graphql-codegen/graphql-modules-preset@npm:^3.0.0":
-  version: 3.1.2
-  resolution: "@graphql-codegen/graphql-modules-preset@npm:3.1.2"
+  version: 3.1.3
+  resolution: "@graphql-codegen/graphql-modules-preset@npm:3.1.3"
   dependencies:
     "@graphql-codegen/plugin-helpers": ^4.2.0
-    "@graphql-codegen/visitor-plugin-common": 3.1.0
+    "@graphql-codegen/visitor-plugin-common": 3.1.1
     "@graphql-tools/utils": ^9.0.0
     change-case-all: 1.0.15
     parse-filepath: ^1.0.2
     tslib: ~2.5.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: d3b4e9fe169742ce7973466045793ff0823c690f0736ba22aef3d4578be498746df108726ccad0c190d1c45a33816ab4e010b9c6e9931ced06ef7489d85a3691
+  checksum: 6e7303a850984c3c414a96784f499dab188d94cf3d13b6f44cb3c59de4b5f127080df610a316554511cfe669283ac745d8b2537afbe6d8113e58f4b30a27c28b
   languageName: node
   linkType: hard
 
@@ -11111,39 +11528,39 @@ __metadata:
   linkType: hard
 
 "@graphql-codegen/typescript-resolvers@npm:^3.0.0":
-  version: 3.2.0
-  resolution: "@graphql-codegen/typescript-resolvers@npm:3.2.0"
+  version: 3.2.1
+  resolution: "@graphql-codegen/typescript-resolvers@npm:3.2.1"
   dependencies:
     "@graphql-codegen/plugin-helpers": ^4.2.0
-    "@graphql-codegen/typescript": ^3.0.3
-    "@graphql-codegen/visitor-plugin-common": 3.1.0
+    "@graphql-codegen/typescript": ^3.0.4
+    "@graphql-codegen/visitor-plugin-common": 3.1.1
     "@graphql-tools/utils": ^9.0.0
     auto-bind: ~4.0.0
     tslib: ~2.5.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: d866b95775c95d1685e832a1d24df2a1e98feb67f35ef20a5d590c42b7314307b48399531b0cdc004e0be1062769ffe1e1a4757863ed1ca1f575dcd5e08b014d
+  checksum: a84f8fc68fe778beabbf537f1312699a220a3a605d972403075d8307fb7fe9aec73ae2eb5b42dea9f3a7c91deabfe6e1271d607e1b2c84b346686107f39354fb
   languageName: node
   linkType: hard
 
-"@graphql-codegen/typescript@npm:^3.0.0, @graphql-codegen/typescript@npm:^3.0.3":
-  version: 3.0.3
-  resolution: "@graphql-codegen/typescript@npm:3.0.3"
+"@graphql-codegen/typescript@npm:^3.0.0, @graphql-codegen/typescript@npm:^3.0.4":
+  version: 3.0.4
+  resolution: "@graphql-codegen/typescript@npm:3.0.4"
   dependencies:
     "@graphql-codegen/plugin-helpers": ^4.2.0
     "@graphql-codegen/schema-ast": ^3.0.1
-    "@graphql-codegen/visitor-plugin-common": 3.1.0
+    "@graphql-codegen/visitor-plugin-common": 3.1.1
     auto-bind: ~4.0.0
     tslib: ~2.5.0
   peerDependencies:
     graphql: ^0.12.0 || ^0.13.0 || ^14.0.0 || ^15.0.0 || ^16.0.0
-  checksum: 5d292379b5f25f1df0dfdec62211f7e304a85910b6e30dcb28e89478dd15b565f05993913d9b8cf7f08b1e9166242f08e9cb68bd9688f486bd5eada7c6f82442
+  checksum: ede5311c5f620e16c3e98f51bdcedc7fd42f2c552a8ca5a946f757dc9709c384a12d32d088769d04041461d3318159ad0644f70056aea1877ee80a0bdc48de1f
   languageName: node
   linkType: hard
 
-"@graphql-codegen/visitor-plugin-common@npm:3.1.0":
-  version: 3.1.0
-  resolution: "@graphql-codegen/visitor-plugin-common@npm:3.1.0"
+"@graphql-codegen/visitor-plugin-common@npm:3.1.1":
+  version: 3.1.1
+  resolution: "@graphql-codegen/visitor-plugin-common@npm:3.1.1"
   dependencies:
     "@graphql-codegen/plugin-helpers": ^4.2.0
     "@graphql-tools/optimize": ^1.3.0
@@ -11157,7 +11574,7 @@ __metadata:
     tslib: ~2.5.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: 7532666c578680cda538d7b859ee7d5541113f3972f0f2396affa4dd6823a2e2d6f8b715c685912652b0906722dfafb4375c462aa3b4f991a12ec0a28f1b7ba7
+  checksum: 8dbef75ba0576a7de5e134b53778d64d818084df01e74554adc979f08db8446e9734889575c820449b6ef9febd6a9005fb89c7c9c101a9e398c195b5c3279353
   languageName: node
   linkType: hard
 
@@ -11189,17 +11606,17 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@graphql-tools/batch-execute@npm:^8.5.18":
-  version: 8.5.18
-  resolution: "@graphql-tools/batch-execute@npm:8.5.18"
+"@graphql-tools/batch-execute@npm:^9.0.1":
+  version: 9.0.1
+  resolution: "@graphql-tools/batch-execute@npm:9.0.1"
   dependencies:
-    "@graphql-tools/utils": 9.2.1
-    dataloader: 2.2.2
+    "@graphql-tools/utils": ^10.0.5
+    dataloader: ^2.2.2
     tslib: ^2.4.0
-    value-or-promise: 1.0.12
+    value-or-promise: ^1.0.12
   peerDependencies:
     graphql: ^14.0.0 || ^15.0.0 || ^16.0.0 || ^17.0.0
-  checksum: 4a5b5dec502a91bd657a4ddad74965d050d3994c89f036225fac58657b5a275bb374224b20484e3ba773525e75a5552c4a5af7b6d52859ce3a3b32aec2412b6e
+  checksum: c2bcf9dbcd3d08b2e04708fddad7f587677b62e189b0357b8a5495693e17b257b3022f5983d503966baaf32cbdc92a0a00dc95be7f5b6039357a31ffdde29a19
   languageName: node
   linkType: hard
 
@@ -11235,20 +11652,19 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@graphql-tools/delegate@npm:9.0.28":
-  version: 9.0.28
-  resolution: "@graphql-tools/delegate@npm:9.0.28"
+"@graphql-tools/delegate@npm:^10.0.0":
+  version: 10.0.2
+  resolution: "@graphql-tools/delegate@npm:10.0.2"
   dependencies:
-    "@graphql-tools/batch-execute": ^8.5.18
-    "@graphql-tools/executor": ^0.0.15
-    "@graphql-tools/schema": ^9.0.16
-    "@graphql-tools/utils": ^9.2.1
+    "@graphql-tools/batch-execute": ^9.0.1
+    "@graphql-tools/executor": ^1.0.0
+    "@graphql-tools/schema": ^10.0.0
+    "@graphql-tools/utils": ^10.0.5
     dataloader: ^2.2.2
     tslib: ^2.5.0
-    value-or-promise: ^1.0.12
   peerDependencies:
     graphql: ^14.0.0 || ^15.0.0 || ^16.0.0 || ^17.0.0
-  checksum: e24c757ea15a2b654268194bbf76188fca6692486d1b019b0ad7d48c264f92b7b681a43c8a8355ace48a29f9dd566c20e8707b6cef281331a813f23ee1c94375
+  checksum: 3641dd03b241234cc0bc15221e1bd7e82f003f0bdb59a04cfaba23b5dc43d3aed1f068cc79d526dd731f6e4acfd90c9e20287feb565b9c881ed441c5008e32db
   languageName: node
   linkType: hard
 
@@ -11317,18 +11733,18 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@graphql-tools/executor@npm:^0.0.15":
-  version: 0.0.15
-  resolution: "@graphql-tools/executor@npm:0.0.15"
+"@graphql-tools/executor@npm:^1.0.0":
+  version: 1.2.0
+  resolution: "@graphql-tools/executor@npm:1.2.0"
   dependencies:
-    "@graphql-tools/utils": 9.2.1
-    "@graphql-typed-document-node/core": 3.1.2
-    "@repeaterjs/repeater": 3.0.4
+    "@graphql-tools/utils": ^10.0.0
+    "@graphql-typed-document-node/core": 3.2.0
+    "@repeaterjs/repeater": ^3.0.4
     tslib: ^2.4.0
-    value-or-promise: 1.0.12
+    value-or-promise: ^1.0.12
   peerDependencies:
     graphql: ^14.0.0 || ^15.0.0 || ^16.0.0 || ^17.0.0
-  checksum: 7a963d6fcd00bd9c2a42f35a33bc9178576a1eeac755ce69981aa1e2c61238953b7ab9c11ffcfc86e49fdcf4fc057698c6f7169d6be580298e286076276b1295
+  checksum: a6fe10636e433155a8fb76f1be76f4f55e7e54c7473a14c546a7b558819e92b3658f33f1cb646b9523a22d692b95f2cbd5a8e628f4f263fa48f229ddf98a6850
   languageName: node
   linkType: hard
 
@@ -11475,18 +11891,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@graphql-tools/merge@npm:8.4.0":
-  version: 8.4.0
-  resolution: "@graphql-tools/merge@npm:8.4.0"
-  dependencies:
-    "@graphql-tools/utils": 9.2.1
-    tslib: ^2.4.0
-  peerDependencies:
-    graphql: ^14.0.0 || ^15.0.0 || ^16.0.0 || ^17.0.0
-  checksum: 32265749833615ac2cb3d958318f5c46b7bd5ec858acfbad7136d379594ec3c98ba67ba5f04f4061187e5dfd52bb277155cd98fdeb2b4c5535c16bdb4f117ae0
-  languageName: node
-  linkType: hard
-
 "@graphql-tools/merge@npm:^8.2.6, @graphql-tools/merge@npm:^8.4.1":
   version: 8.4.1
   resolution: "@graphql-tools/merge@npm:8.4.1"
@@ -11499,6 +11903,18 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@graphql-tools/merge@npm:^9.0.0":
+  version: 9.0.0
+  resolution: "@graphql-tools/merge@npm:9.0.0"
+  dependencies:
+    "@graphql-tools/utils": ^10.0.0
+    tslib: ^2.4.0
+  peerDependencies:
+    graphql: ^14.0.0 || ^15.0.0 || ^16.0.0 || ^17.0.0
+  checksum: e93794260faa477979bdc22f05da26c0eff02bd82c11565a1197152b70b5ab1c73dc6f8a05caf06737bcb18cb244bd19ee99d62bfc41af3bffb3c17eddb70edf
+  languageName: node
+  linkType: hard
+
 "@graphql-tools/optimize@npm:^1.3.0":
   version: 1.3.0
   resolution: "@graphql-tools/optimize@npm:1.3.0"
@@ -11580,21 +11996,21 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@graphql-tools/schema@npm:9.0.17":
-  version: 9.0.17
-  resolution: "@graphql-tools/schema@npm:9.0.17"
+"@graphql-tools/schema@npm:^10.0.0":
+  version: 10.0.0
+  resolution: "@graphql-tools/schema@npm:10.0.0"
   dependencies:
-    "@graphql-tools/merge": 8.4.0
-    "@graphql-tools/utils": 9.2.1
+    "@graphql-tools/merge": ^9.0.0
+    "@graphql-tools/utils": ^10.0.0
     tslib: ^2.4.0
-    value-or-promise: 1.0.12
+    value-or-promise: ^1.0.12
   peerDependencies:
     graphql: ^14.0.0 || ^15.0.0 || ^16.0.0 || ^17.0.0
-  checksum: 1c6513dd88b47d07702d01a48941ee164c4090c69b2475b1dde48a3d8866ed48fd39a33d15510682f6d8c18d19ceb72b77104eb4edbb194f96a129cc03909e89
+  checksum: 550e9a4528584a4d108892f1553fb5b2590e63e88b9a9d3c1ad80b01c974ca9947adb9d1448a6969230d90c15dc96e8e84d62f32ef0fde804c389b43ac5bd739
   languageName: node
   linkType: hard
 
-"@graphql-tools/schema@npm:^9.0.0, @graphql-tools/schema@npm:^9.0.16":
+"@graphql-tools/schema@npm:^9.0.0":
   version: 9.0.19
   resolution: "@graphql-tools/schema@npm:9.0.19"
   dependencies:
@@ -11698,6 +12114,19 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@graphql-tools/utils@npm:^10.0.0, @graphql-tools/utils@npm:^10.0.5":
+  version: 10.0.5
+  resolution: "@graphql-tools/utils@npm:10.0.5"
+  dependencies:
+    "@graphql-typed-document-node/core": ^3.1.1
+    dset: ^3.1.2
+    tslib: ^2.4.0
+  peerDependencies:
+    graphql: ^14.0.0 || ^15.0.0 || ^16.0.0 || ^17.0.0
+  checksum: 600eb668b0a80264a56d1bfc2b431073a620de8ffea959362a1d13c4e0dd5738b627cc508ead8ecdbd7c1a2da05d5664e43443e15d3b221a809fa1a0e2740193
+  languageName: node
+  linkType: hard
+
 "@graphql-tools/wrap@npm:9.2.23":
   version: 9.2.23
   resolution: "@graphql-tools/wrap@npm:9.2.23"
@@ -11713,18 +12142,18 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@graphql-tools/wrap@npm:^9.0.0":
-  version: 9.3.8
-  resolution: "@graphql-tools/wrap@npm:9.3.8"
+"@graphql-tools/wrap@npm:^10.0.0":
+  version: 10.0.0
+  resolution: "@graphql-tools/wrap@npm:10.0.0"
   dependencies:
-    "@graphql-tools/delegate": 9.0.28
-    "@graphql-tools/schema": 9.0.17
-    "@graphql-tools/utils": 9.2.1
+    "@graphql-tools/delegate": ^10.0.0
+    "@graphql-tools/schema": ^10.0.0
+    "@graphql-tools/utils": ^10.0.0
     tslib: ^2.4.0
-    value-or-promise: 1.0.12
+    value-or-promise: ^1.0.12
   peerDependencies:
     graphql: ^14.0.0 || ^15.0.0 || ^16.0.0 || ^17.0.0
-  checksum: 1f280b939f1c8c33be8fbd92c0584e9125e30c59ce6f75f20657235d24e5a2c01eb3214eda9ae74d431d9da072cdfa6cedeafdc5b352dd33de439ba42402efcb
+  checksum: f7ce366cdd479c3f73c3c98f66fa13c528c63e2f791083e78ca14e010ebcd359b5c9bd78e2e8bd437a705418b87584eb6512f1eeb1971b81560c79c6fb3a4a6e
   languageName: node
   linkType: hard
 
@@ -11737,12 +12166,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@graphql-typed-document-node/core@npm:3.1.2, @graphql-typed-document-node/core@npm:^3.1.0, @graphql-typed-document-node/core@npm:^3.1.1":
-  version: 3.1.2
-  resolution: "@graphql-typed-document-node/core@npm:3.1.2"
+"@graphql-typed-document-node/core@npm:3.2.0, @graphql-typed-document-node/core@npm:^3.1.0, @graphql-typed-document-node/core@npm:^3.1.1":
+  version: 3.2.0
+  resolution: "@graphql-typed-document-node/core@npm:3.2.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 || ^17.0.0
-  checksum: a61afa025acdabd7833e4f654a5802fc1a526171f81e0c435c8e651050a5a0682499a2c7a51304ceb61fde36cd69fc7975ce5e1b16b9ba7ea474c649f33eea8b
+  checksum: fa44443accd28c8cf4cb96aaaf39d144a22e8b091b13366843f4e97d19c7bfeaf609ce3c7603a4aeffe385081eaf8ea245d078633a7324c11c5ec4b2011bb76d
   languageName: node
   linkType: hard
 
@@ -11880,7 +12309,6 @@ __metadata:
     "@backstage/dev-utils": "workspace:^"
     "@backstage/plugin-permission-common": "workspace:^"
     "@backstage/test-utils": "workspace:^"
-    "@types/node": ^16.11.26
     cross-fetch: ^3.1.5
     msw: ^1.0.0
   languageName: unknown
@@ -11904,7 +12332,6 @@ __metadata:
     "@testing-library/jest-dom": ^5.10.1
     "@testing-library/react": ^12.1.3
     "@testing-library/user-event": ^14.0.0
-    "@types/node": ^16.11.26
     "@types/react": ^16.13.1 || ^17.0.0
     msw: ^1.0.0
     react-use: ^17.2.4
@@ -12147,12 +12574,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@jest/schemas@npm:^29.4.3":
-  version: 29.4.3
-  resolution: "@jest/schemas@npm:29.4.3"
+"@jest/schemas@npm:^29.4.3, @jest/schemas@npm:^29.6.3":
+  version: 29.6.3
+  resolution: "@jest/schemas@npm:29.6.3"
   dependencies:
-    "@sinclair/typebox": ^0.25.16
-  checksum: ac754e245c19dc39e10ebd41dce09040214c96a4cd8efa143b82148e383e45128f24599195ab4f01433adae4ccfbe2db6574c90db2862ccd8551a86704b5bebd
+    "@sinclair/typebox": ^0.27.8
+  checksum: 910040425f0fc93cd13e68c750b7885590b8839066dfa0cd78e7def07bbb708ad869381f725945d66f2284de5663bbecf63e8fdd856e2ae6e261ba30b1687e93
   languageName: node
   linkType: hard
 
@@ -12314,7 +12741,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@jridgewell/trace-mapping@npm:^0.3.0, @jridgewell/trace-mapping@npm:^0.3.12, @jridgewell/trace-mapping@npm:^0.3.15, @jridgewell/trace-mapping@npm:^0.3.17, @jridgewell/trace-mapping@npm:^0.3.9":
+"@jridgewell/trace-mapping@npm:^0.3.12, @jridgewell/trace-mapping@npm:^0.3.15, @jridgewell/trace-mapping@npm:^0.3.17, @jridgewell/trace-mapping@npm:^0.3.9":
   version: 0.3.17
   resolution: "@jridgewell/trace-mapping@npm:0.3.17"
   dependencies:
@@ -12512,21 +12939,21 @@ __metadata:
   linkType: hard
 
 "@mapbox/node-pre-gyp@npm:^1.0.0":
-  version: 1.0.5
-  resolution: "@mapbox/node-pre-gyp@npm:1.0.5"
+  version: 1.0.11
+  resolution: "@mapbox/node-pre-gyp@npm:1.0.11"
   dependencies:
-    detect-libc: ^1.0.3
+    detect-libc: ^2.0.0
     https-proxy-agent: ^5.0.0
     make-dir: ^3.1.0
-    node-fetch: ^2.6.1
+    node-fetch: ^2.6.7
     nopt: ^5.0.0
-    npmlog: ^4.1.2
+    npmlog: ^5.0.1
     rimraf: ^3.0.2
-    semver: ^7.3.4
-    tar: ^6.1.0
+    semver: ^7.3.5
+    tar: ^6.1.11
   bin:
     node-pre-gyp: bin/node-pre-gyp
-  checksum: c1f182a707f5782e47b77a76e9d6a073fb043999cf9ad965bc86732e88db27ad00926d1602918edb7105f05cde67871b84a178ee9844eb742319ade419636675
+  checksum: b848f6abc531a11961d780db813cc510ca5a5b6bf3184d72134089c6875a91c44d571ba6c1879470020803f7803609e7b2e6e429651c026fe202facd11d444b8
   languageName: node
   linkType: hard
 
@@ -12700,8 +13127,8 @@ __metadata:
   linkType: hard
 
 "@material-ui/pickers@npm:^3.2.10, @material-ui/pickers@npm:^3.3.10":
-  version: 3.3.10
-  resolution: "@material-ui/pickers@npm:3.3.10"
+  version: 3.3.11
+  resolution: "@material-ui/pickers@npm:3.3.11"
   dependencies:
     "@babel/runtime": ^7.6.0
     "@date-io/core": 1.x
@@ -12715,7 +13142,7 @@ __metadata:
     prop-types: ^15.6.0
     react: ^16.8.0 || ^17.0.0
     react-dom: ^16.8.0 || ^17.0.0
-  checksum: b8ec52f2e8a4dfae8f14e29c41428a708c843d2c64b5ece64747d8d9401edaeb4d7de6cce985d13e486f2addec1b7787eeed7a3dfcbba90803c23f1ba2ed2420
+  checksum: c97822ae407877d1aa9ab7b14c335511d6879ca2546455ac7a3b156d70966b5678372a6d4d3470c2dced84e59857e2c1e1b2be61d26ab43f7f29806666f33064
   languageName: node
   linkType: hard
 
@@ -12845,60 +13272,60 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@microsoft/api-documenter@npm:^7.19.27":
-  version: 7.19.27
-  resolution: "@microsoft/api-documenter@npm:7.19.27"
+"@microsoft/api-documenter@npm:^7.22.33":
+  version: 7.22.33
+  resolution: "@microsoft/api-documenter@npm:7.22.33"
   dependencies:
-    "@microsoft/api-extractor-model": 7.25.3
+    "@microsoft/api-extractor-model": 7.27.6
     "@microsoft/tsdoc": 0.14.2
-    "@rushstack/node-core-library": 3.53.3
-    "@rushstack/ts-command-line": 4.13.1
+    "@rushstack/node-core-library": 3.59.7
+    "@rushstack/ts-command-line": 4.15.2
     colors: ~1.2.1
     js-yaml: ~3.13.1
     resolve: ~1.22.1
   bin:
     api-documenter: bin/api-documenter
-  checksum: f243f473e1fe58e1cd6e32aad223724b6b621f569276415380abc4845859bf5c23fbe0e370be2a218f362a6c85b01b44b5427336f55800f2ea8bf3f398b0ee41
+  checksum: b2aa75823c3a5bf65ce87b56bd85dfa276ff155eb2244187e163e4eb8f4a2daf15e39e9b5d1dea13f854309d9562ab845ff6c7c8b4973e409593852c3bc058f0
   languageName: node
   linkType: hard
 
-"@microsoft/api-extractor-model@npm:7.25.3":
-  version: 7.25.3
-  resolution: "@microsoft/api-extractor-model@npm:7.25.3"
+"@microsoft/api-extractor-model@npm:7.27.6":
+  version: 7.27.6
+  resolution: "@microsoft/api-extractor-model@npm:7.27.6"
   dependencies:
     "@microsoft/tsdoc": 0.14.2
     "@microsoft/tsdoc-config": ~0.16.1
-    "@rushstack/node-core-library": 3.53.3
-  checksum: 532ca30606b5649e90035ef70ff46868f6ccc63181e10b783bc5092e580bcb133112b300799b8f71a19da2b79f685a55f7ddbe84c8fe7ad93d71359c1763c521
+    "@rushstack/node-core-library": 3.59.7
+  checksum: 7867feaf3a0e5accfcce3a77681248a319952a266cffc644e4f8f7df1c9e1d55adb5124df901e8cca594bb3e12d361d1fcb2bffbdbb4b20fe3113928f6535975
   languageName: node
   linkType: hard
 
-"@microsoft/api-extractor@npm:^7.33.7":
-  version: 7.33.7
-  resolution: "@microsoft/api-extractor@npm:7.33.7"
+"@microsoft/api-extractor@npm:^7.36.4":
+  version: 7.36.4
+  resolution: "@microsoft/api-extractor@npm:7.36.4"
   dependencies:
-    "@microsoft/api-extractor-model": 7.25.3
+    "@microsoft/api-extractor-model": 7.27.6
     "@microsoft/tsdoc": 0.14.2
     "@microsoft/tsdoc-config": ~0.16.1
-    "@rushstack/node-core-library": 3.53.3
-    "@rushstack/rig-package": 0.3.17
-    "@rushstack/ts-command-line": 4.13.1
+    "@rushstack/node-core-library": 3.59.7
+    "@rushstack/rig-package": 0.4.1
+    "@rushstack/ts-command-line": 4.15.2
     colors: ~1.2.1
     lodash: ~4.17.15
-    resolve: ~1.17.0
-    semver: ~7.3.0
+    resolve: ~1.22.1
+    semver: ~7.5.4
     source-map: ~0.6.1
-    typescript: ~4.8.4
+    typescript: ~5.0.4
   bin:
     api-extractor: bin/api-extractor
-  checksum: 3f9034ca8e7bc7a6622cb8ac1f53f7f265ebca529e17f4abb2bef0ca297011cfa0927c0703a819607d974ca79b8f5307371491cfb192788e723cfd316250f9a6
+  checksum: 92559325cf2407fa27cb9675772956511fa35005f295cdb4dc47abd7ef9c77ba61b0f684c2e952301a76dd2cfa9e398840c8f3d9117d621300e12b0ecfbf8147
   languageName: node
   linkType: hard
 
 "@microsoft/microsoft-graph-types@npm:^2.25.0, @microsoft/microsoft-graph-types@npm:^2.6.0":
-  version: 2.35.0
-  resolution: "@microsoft/microsoft-graph-types@npm:2.35.0"
-  checksum: d2053799a8b78f5743a64853727e3887101cbb6b26558b8a6e8501b561b04d4bca1dac6c74534229b9e40daa489f47188ae5837ada42108a50d4062cfb60f57e
+  version: 2.38.0
+  resolution: "@microsoft/microsoft-graph-types@npm:2.38.0"
+  checksum: f5778650655034a6d92fbb932376002aefcf0cd358de323267b65fbec59284e8c0208e895c5523dcbbe79c4b583f3822c6beea01b70c687da26929c92de93c92
   languageName: node
   linkType: hard
 
@@ -12947,16 +13374,17 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@mui/base@npm:5.0.0-alpha.127":
-  version: 5.0.0-alpha.127
-  resolution: "@mui/base@npm:5.0.0-alpha.127"
+"@mui/base@npm:5.0.0-beta.14":
+  version: 5.0.0-beta.14
+  resolution: "@mui/base@npm:5.0.0-beta.14"
   dependencies:
-    "@babel/runtime": ^7.21.0
-    "@emotion/is-prop-valid": ^1.2.0
+    "@babel/runtime": ^7.22.10
+    "@emotion/is-prop-valid": ^1.2.1
+    "@floating-ui/react-dom": ^2.0.1
     "@mui/types": ^7.2.4
-    "@mui/utils": ^5.12.0
-    "@popperjs/core": ^2.11.7
-    clsx: ^1.2.1
+    "@mui/utils": ^5.14.8
+    "@popperjs/core": ^2.11.8
+    clsx: ^2.0.0
     prop-types: ^15.8.1
     react-is: ^18.2.0
   peerDependencies:
@@ -12966,29 +13394,29 @@ __metadata:
   peerDependenciesMeta:
     "@types/react":
       optional: true
-  checksum: 330baeef1fdaa513707f295e07a3436af24d0831a18109ed877f76b86cf1f392309833d33a2c7ca250db79fdf53f5e88c2618f876f50dbbbf9323bbf08e367e7
+  checksum: 3e5c980edb285d4fbf1f9f6c08b237a502e6c444222e0165e98e4e25787de7663d6905536b8e8a7a0888571daaa75fcad01534c8f8ea8ba30451cad82d1b85cc
   languageName: node
   linkType: hard
 
-"@mui/core-downloads-tracker@npm:^5.12.2":
-  version: 5.12.2
-  resolution: "@mui/core-downloads-tracker@npm:5.12.2"
-  checksum: d748bdc56df6fdfe6712550a94263cf094c53ddcb70f6a8f633caf23927edf5ac88b1f888429d895fe2a5045b27eb7aa9826ccee5b917e31973667d604ed87fe
+"@mui/core-downloads-tracker@npm:^5.14.8":
+  version: 5.14.8
+  resolution: "@mui/core-downloads-tracker@npm:5.14.8"
+  checksum: b8322994d7c05426008c3426f7ce4bb0a1dfd633429af704cc9e164655007fc446ba21bf6b00af8fa1b9a9cb4c1757d72c7554e13cceadc575af7d44344da38c
   languageName: node
   linkType: hard
 
 "@mui/material@npm:^5.12.2":
-  version: 5.12.2
-  resolution: "@mui/material@npm:5.12.2"
+  version: 5.14.8
+  resolution: "@mui/material@npm:5.14.8"
   dependencies:
-    "@babel/runtime": ^7.21.0
-    "@mui/base": 5.0.0-alpha.127
-    "@mui/core-downloads-tracker": ^5.12.2
-    "@mui/system": ^5.12.1
+    "@babel/runtime": ^7.22.10
+    "@mui/base": 5.0.0-beta.14
+    "@mui/core-downloads-tracker": ^5.14.8
+    "@mui/system": ^5.14.8
     "@mui/types": ^7.2.4
-    "@mui/utils": ^5.12.0
-    "@types/react-transition-group": ^4.4.5
-    clsx: ^1.2.1
+    "@mui/utils": ^5.14.8
+    "@types/react-transition-group": ^4.4.6
+    clsx: ^2.0.0
     csstype: ^3.1.2
     prop-types: ^15.8.1
     react-is: ^18.2.0
@@ -13006,16 +13434,16 @@ __metadata:
       optional: true
     "@types/react":
       optional: true
-  checksum: a3464dfbcc496164967e134d6f1d40e060ee02fc2ddb5fcf648ca85580efdbd5eff5aab6a73486d0a7f329f7299127b52501a13993bb131cbd4e310c7f2e633f
+  checksum: 2db4eceb6a2b51e2f429082206b5c4194f894bc6831cf5348d301b910e5e2b1a62565cad00a244100434899307c20134832ab2e85dd56bef4dd210d87496e136
   languageName: node
   linkType: hard
 
-"@mui/private-theming@npm:^5.12.0":
-  version: 5.12.0
-  resolution: "@mui/private-theming@npm:5.12.0"
+"@mui/private-theming@npm:^5.14.8":
+  version: 5.14.8
+  resolution: "@mui/private-theming@npm:5.14.8"
   dependencies:
-    "@babel/runtime": ^7.21.0
-    "@mui/utils": ^5.12.0
+    "@babel/runtime": ^7.22.10
+    "@mui/utils": ^5.14.8
     prop-types: ^15.8.1
   peerDependencies:
     "@types/react": ^17.0.0 || ^18.0.0
@@ -13023,16 +13451,16 @@ __metadata:
   peerDependenciesMeta:
     "@types/react":
       optional: true
-  checksum: 761bc7a57e1643c2c4c327886882fa5efc7bacae1c6fffe6be4197f49d337261c916a883d96996445efcdedc0672251725c1e5b264b6250d6c9527fd0cafcc62
+  checksum: 3d8c4b768ee81d03c739acfa7d99450423b9267a1a2219171f247b1823350426452514f0cc646f4d48f113db396b5488c48132fe54a5db8646e101514b764d96
   languageName: node
   linkType: hard
 
-"@mui/styled-engine@npm:^5.12.0":
-  version: 5.12.0
-  resolution: "@mui/styled-engine@npm:5.12.0"
+"@mui/styled-engine@npm:^5.14.8":
+  version: 5.14.8
+  resolution: "@mui/styled-engine@npm:5.14.8"
   dependencies:
-    "@babel/runtime": ^7.21.0
-    "@emotion/cache": ^11.10.7
+    "@babel/runtime": ^7.22.10
+    "@emotion/cache": ^11.11.0
     csstype: ^3.1.2
     prop-types: ^15.8.1
   peerDependencies:
@@ -13044,20 +13472,20 @@ __metadata:
       optional: true
     "@emotion/styled":
       optional: true
-  checksum: 4a415473cf62aa05012f667dd2e9b1dc2fb175be5b0c4d0b8df541e2dac3d7db410e920e0d5910c8e2b8996a4fb51f74d79483e2878a9b5c0d334498f5537d74
+  checksum: 12d626a42fa15cc315172775a076cf6f71afc999123bd290cbda3855de8c607f8fbf0a3daa7a391e67a83ad824c6e7eb21e57121a448a527b3bf9b494a7bd852
   languageName: node
   linkType: hard
 
-"@mui/system@npm:^5.12.1":
-  version: 5.12.1
-  resolution: "@mui/system@npm:5.12.1"
+"@mui/system@npm:^5.14.8":
+  version: 5.14.8
+  resolution: "@mui/system@npm:5.14.8"
   dependencies:
-    "@babel/runtime": ^7.21.0
-    "@mui/private-theming": ^5.12.0
-    "@mui/styled-engine": ^5.12.0
+    "@babel/runtime": ^7.22.10
+    "@mui/private-theming": ^5.14.8
+    "@mui/styled-engine": ^5.14.8
     "@mui/types": ^7.2.4
-    "@mui/utils": ^5.12.0
-    clsx: ^1.2.1
+    "@mui/utils": ^5.14.8
+    clsx: ^2.0.0
     csstype: ^3.1.2
     prop-types: ^15.8.1
   peerDependencies:
@@ -13072,7 +13500,7 @@ __metadata:
       optional: true
     "@types/react":
       optional: true
-  checksum: b951959bf5e5af581319354c044f441d97849ff120cfec111d2ed5e7fa05efd63721acff96f48093b8e2bdeb5ccbe35c48613fb925be2b58c596447d10dbed3e
+  checksum: d630b4253caa971ad0bcb35cef1165ff689bfcadb806eb3b26eddce4d6c1bcdeb9781ccaea87f9950bff308ac302514766880f63c4bbdcdf28619f66d974797c
   languageName: node
   linkType: hard
 
@@ -13088,18 +13516,18 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@mui/utils@npm:^5.12.0":
-  version: 5.12.0
-  resolution: "@mui/utils@npm:5.12.0"
+"@mui/utils@npm:^5.14.8":
+  version: 5.14.8
+  resolution: "@mui/utils@npm:5.14.8"
   dependencies:
-    "@babel/runtime": ^7.21.0
+    "@babel/runtime": ^7.22.10
     "@types/prop-types": ^15.7.5
-    "@types/react-is": ^16.7.1 || ^17.0.0
+    "@types/react-is": ^18.2.1
     prop-types: ^15.8.1
     react-is: ^18.2.0
   peerDependencies:
     react: ^17.0.0 || ^18.0.0
-  checksum: 87b2c7468803b083f50af28d7c215c45291e73fef16570848b596d0f1cde1fc613c20e8951f431217b31451de254744abd50eda5013dedec4982420b5bf1c6b6
+  checksum: 2fb29c9d7908a47276b4f4a31a7e76d5a7d437afe95d2c0d6cd9c07f04beea89857f763c4f5c546fe243539d9986181815bfded42e516077122ed373d11a7ebf
   languageName: node
   linkType: hard
 
@@ -13176,14 +13604,14 @@ __metadata:
   linkType: hard
 
 "@newrelic/browser-agent@npm:^1.236.0":
-  version: 1.236.0
-  resolution: "@newrelic/browser-agent@npm:1.236.0"
+  version: 1.239.1
+  resolution: "@newrelic/browser-agent@npm:1.239.1"
   dependencies:
     core-js: ^3.26.0
     fflate: ^0.7.4
     rrweb: ^2.0.0-alpha.8
     web-vitals: ^3.1.0
-  checksum: 79a96c8f8421bed13e0e9eaf08c9bb8ac2785da3199e2304366c5cf98eb976713e393bd26a7efe998837eba5facfe7a54a6d58ba5c948c7ecc8de49e477b5836
+  checksum: c1b0df2fff4b5bef3718f94f0fa418dc4db087d6b4bd94547d274acd2fc8f771888baea456d1e559a36d11436d11a34615b3d1cce12d604758a689b950eb7597
   languageName: node
   linkType: hard
 
@@ -13877,15 +14305,15 @@ __metadata:
   linkType: hard
 
 "@opensearch-project/opensearch@npm:^2.2.1":
-  version: 2.2.1
-  resolution: "@opensearch-project/opensearch@npm:2.2.1"
+  version: 2.3.1
+  resolution: "@opensearch-project/opensearch@npm:2.3.1"
   dependencies:
     aws4: ^1.11.0
     debug: ^4.3.1
     hpagent: ^1.2.0
     ms: ^2.1.3
     secure-json-parse: ^2.4.0
-  checksum: ec75081574dbd036d8a72383a1a3bd99ed70a149a80960beb53052dcf8a7e2c4715a10b92fe7f6c2391ff681a3f27d9b3361f06bdbee7b88ddf869df57c2fe71
+  checksum: 70324153eb9d74c005d5517a997f7027b829387af482956593a23b80c24ba8c9f9cdff40fec3d72e7066f3f16070b543c2d6f59f578e1be898784b49f9f6720f
   languageName: node
   linkType: hard
 
@@ -14030,8 +14458,8 @@ __metadata:
   linkType: hard
 
 "@pmmmwh/react-refresh-webpack-plugin@npm:^0.5.7":
-  version: 0.5.10
-  resolution: "@pmmmwh/react-refresh-webpack-plugin@npm:0.5.10"
+  version: 0.5.11
+  resolution: "@pmmmwh/react-refresh-webpack-plugin@npm:0.5.11"
   dependencies:
     ansi-html-community: ^0.0.8
     common-path-prefix: ^3.0.0
@@ -14046,7 +14474,7 @@ __metadata:
     "@types/webpack": 4.x || 5.x
     react-refresh: ">=0.10.0 <1.0.0"
     sockjs-client: ^1.4.0
-    type-fest: ">=0.17.0 <4.0.0"
+    type-fest: ">=0.17.0 <5.0.0"
     webpack: ">=4.43.0 <6.0.0"
     webpack-dev-server: 3.x || 4.x
     webpack-hot-middleware: 2.x
@@ -14064,14 +14492,14 @@ __metadata:
       optional: true
     webpack-plugin-serve:
       optional: true
-  checksum: c45beded9c56fbbdc7213a2c36131ace5db360ed704d462cc39d6678f980173a91c9a3f691e6bd3a026f25486644cd0027e8a12a0a4eced8e8b886a0472e7d34
+  checksum: a82eced9519f4dcac424acae719f819ab4150bfcf2874ac7daaf25a4f1c409e3d8b9d693fea0c686c24d520a5473756df32da90d8b89739670f8f8084c600bb4
   languageName: node
   linkType: hard
 
-"@popperjs/core@npm:^2.11.7":
-  version: 2.11.7
-  resolution: "@popperjs/core@npm:2.11.7"
-  checksum: 5b6553747899683452a1d28898c1b39173a4efd780e74360bfcda8eb42f1c5e819602769c81a10920fc68c881d07fb40429604517d499567eac079cfa6470f19
+"@popperjs/core@npm:^2.11.8":
+  version: 2.11.8
+  resolution: "@popperjs/core@npm:2.11.8"
+  checksum: e5c69fdebf52a4012f6a1f14817ca8e9599cb1be73dd1387e1785e2ed5e5f0862ff817f420a87c7fc532add1f88a12e25aeb010ffcbdc98eace3d55ce2139cf0
   languageName: node
   linkType: hard
 
@@ -14194,14 +14622,14 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@remix-run/router@npm:1.4.0":
-  version: 1.4.0
-  resolution: "@remix-run/router@npm:1.4.0"
-  checksum: 707dce35a2b8138005cf19e63f6fd3c4da05b4b892e9e9118e8b727c3b95953efe27307ca2df35084044df30fa1fc367cf0bbc98d1ded9020c82e61e6242caaf
+"@remix-run/router@npm:1.8.0":
+  version: 1.8.0
+  resolution: "@remix-run/router@npm:1.8.0"
+  checksum: f754f02d3b4fc86791b88acf16065000609e2324b9436027844a76831c7107c0994067cb83abdd6093c282bd518a5c89b5e02aead585782978586e3a04534428
   languageName: node
   linkType: hard
 
-"@repeaterjs/repeater@npm:3.0.4":
+"@repeaterjs/repeater@npm:3.0.4, @repeaterjs/repeater@npm:^3.0.4":
   version: 3.0.4
   resolution: "@repeaterjs/repeater@npm:3.0.4"
   checksum: cca0db3e802bc26fcce0b4a574074d9956da53bf43094de03c0e4732d05e13441279a92f0b96e2a7a39da50933684947a138c1213406eaafe39cfd4683d6c0df
@@ -14298,13 +14726,13 @@ __metadata:
   linkType: hard
 
 "@roadiehq/backstage-plugin-buildkite@npm:^2.0.8":
-  version: 2.1.13
-  resolution: "@roadiehq/backstage-plugin-buildkite@npm:2.1.13"
+  version: 2.1.14
+  resolution: "@roadiehq/backstage-plugin-buildkite@npm:2.1.14"
   dependencies:
     "@backstage/catalog-model": ^1.4.1
-    "@backstage/core-components": ^0.13.3
+    "@backstage/core-components": ^0.13.4
     "@backstage/core-plugin-api": ^1.5.3
-    "@backstage/plugin-catalog-react": ^1.8.0
+    "@backstage/plugin-catalog-react": ^1.8.3
     "@backstage/theme": ^0.4.1
     "@material-ui/core": ^4.12.1
     "@material-ui/icons": ^4.11.2
@@ -14317,19 +14745,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: 03945723ee9f71717f7ea1ac0a240fb516b33740b86a11c0be0f22021bb0cfa5eec541b3cadc5e77efa9ef432c4e978885cd0124b8eabc74f410b6fbc7d55f91
+  checksum: 938fa38d6199a1c5199eb47851ddc0edb2f0d3064fa189baf104ff820096700cb95843c499353efc77b10c1fc721aa2a32b0146c1d3df1bea31f5af61dfd250b
   languageName: node
   linkType: hard
 
 "@roadiehq/backstage-plugin-github-insights@npm:^2.0.5":
-  version: 2.3.16
-  resolution: "@roadiehq/backstage-plugin-github-insights@npm:2.3.16"
+  version: 2.3.18
+  resolution: "@roadiehq/backstage-plugin-github-insights@npm:2.3.18"
   dependencies:
     "@backstage/catalog-model": ^1.4.1
-    "@backstage/core-components": ^0.13.3
+    "@backstage/core-components": ^0.13.4
     "@backstage/core-plugin-api": ^1.5.3
-    "@backstage/integration-react": ^1.1.15
-    "@backstage/plugin-catalog-react": ^1.8.0
+    "@backstage/integration-react": ^1.1.18
+    "@backstage/plugin-catalog-react": ^1.8.3
     "@backstage/theme": ^0.4.1
     "@date-io/core": 2.10.7
     "@material-ui/core": ^4.11.0
@@ -14345,19 +14773,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: 31f857ea5992910a0ef94c53adbe14992aba53021a377123a2cd217a0537c9b310028626f27c97692ea2265ce1b95ea8c5f33605eac54dada3684c2c90333f3f
+  checksum: 891ab977ef1edb5afd921c52788db19734227248c75dde515e9bed092884d29a9c91c3a0a824f69a7d3fd741d862dba9d83c00fae447e3011e88966d2a30307f
   languageName: node
   linkType: hard
 
 "@roadiehq/backstage-plugin-github-pull-requests@npm:^2.2.7":
-  version: 2.5.13
-  resolution: "@roadiehq/backstage-plugin-github-pull-requests@npm:2.5.13"
+  version: 2.5.15
+  resolution: "@roadiehq/backstage-plugin-github-pull-requests@npm:2.5.15"
   dependencies:
-    "@backstage/catalog-model": ^1.4.0
-    "@backstage/core-components": ^0.13.2
-    "@backstage/core-plugin-api": ^1.5.2
-    "@backstage/plugin-catalog-react": ^1.7.0
-    "@backstage/plugin-home": ^0.5.3
+    "@backstage/catalog-model": ^1.4.1
+    "@backstage/core-components": ^0.13.4
+    "@backstage/core-plugin-api": ^1.5.3
+    "@backstage/plugin-catalog-react": ^1.8.3
+    "@backstage/plugin-home": ^0.5.7
     "@material-ui/core": ^4.11.0
     "@material-ui/icons": ^4.9.1
     "@material-ui/lab": ^4.0.0-alpha.60
@@ -14374,18 +14802,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: 1af9997d26ee9dba046d71aa5415bde7e207c4118ca77e6e3e9623920ce7f6e314d8365fe2d1ef3eb1c279ac113653df903f1286005aba681faf75381a387189
+  checksum: 3332a560f8741536ab12ff1e14567e739aa6f60767d8eb0a2e5b9873b54947b0cdaac7c44cb5bb3156dc8b2a7d88d33ee20191c8920bfe8f67b87857dfda2780
   languageName: node
   linkType: hard
 
 "@roadiehq/backstage-plugin-travis-ci@npm:^2.0.5":
-  version: 2.1.13
-  resolution: "@roadiehq/backstage-plugin-travis-ci@npm:2.1.13"
+  version: 2.1.14
+  resolution: "@roadiehq/backstage-plugin-travis-ci@npm:2.1.14"
   dependencies:
     "@backstage/catalog-model": ^1.4.1
-    "@backstage/core-components": ^0.13.3
+    "@backstage/core-components": ^0.13.4
     "@backstage/core-plugin-api": ^1.5.3
-    "@backstage/plugin-catalog-react": ^1.8.0
+    "@backstage/plugin-catalog-react": ^1.8.3
     "@backstage/theme": ^0.4.1
     "@material-ui/core": ^4.11.3
     "@material-ui/icons": ^4.11.2
@@ -14400,7 +14828,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: c8ddeadcc5edec0b25276b65ddf7971943939eb2c82d363919c748b8a740ed53c2642bda6cb509d7fc8c02f002166abf8fc4cb7a2cfa83577e1139c5ba31841b
+  checksum: f6e297460aa2dccd3ac5b639838a253017229ecf6ec03541702ccb33f93ec15327894e35f7dfa565bc58c137abfd94129a858d43b2b861283370a003b2685dda
   languageName: node
   linkType: hard
 
@@ -14517,41 +14945,45 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@rushstack/node-core-library@npm:3.53.3":
-  version: 3.53.3
-  resolution: "@rushstack/node-core-library@npm:3.53.3"
+"@rushstack/node-core-library@npm:3.59.7":
+  version: 3.59.7
+  resolution: "@rushstack/node-core-library@npm:3.59.7"
   dependencies:
-    "@types/node": 12.20.24
     colors: ~1.2.1
     fs-extra: ~7.0.1
     import-lazy: ~4.0.0
     jju: ~1.4.0
-    resolve: ~1.17.0
-    semver: ~7.3.0
+    resolve: ~1.22.1
+    semver: ~7.5.4
     z-schema: ~5.0.2
-  checksum: 265d18e176079b8e90cd507e5d4d45f3afb1f811efdf491ea26f25f0397b77c0e9d42065166bf79a04503426c844ea92034cd3f8d5961b2a116de82e45cf6d6a
+  peerDependencies:
+    "@types/node": "*"
+  peerDependenciesMeta:
+    "@types/node":
+      optional: true
+  checksum: 57819d62fd662a6cf3306bf7d39c11204e094a2d5c2210639c2ac5baee58c183c02023203963cd0484a5623fd9f5dea7a223df843fb52b46a18508e6118cdc19
   languageName: node
   linkType: hard
 
-"@rushstack/rig-package@npm:0.3.17":
-  version: 0.3.17
-  resolution: "@rushstack/rig-package@npm:0.3.17"
+"@rushstack/rig-package@npm:0.4.1":
+  version: 0.4.1
+  resolution: "@rushstack/rig-package@npm:0.4.1"
   dependencies:
-    resolve: ~1.17.0
+    resolve: ~1.22.1
     strip-json-comments: ~3.1.1
-  checksum: 54eeea471c85b547575d7efc84fad3c9588f10106e2bfd8cd022bccb02c2fb0bf8ff597fab9114450b3c262abab0f0a4e52dd074bfd120e850b95037cd7b3102
+  checksum: 68c5ec6c446c35939fca0444fa48e5beda736e3a5816e8b44d83df6ba8b9a2caf0ceddbdc866cd8ad3b523e42877cf6ecd467bc7839e3d618a9bb1c4b3e0b5a5
   languageName: node
   linkType: hard
 
-"@rushstack/ts-command-line@npm:4.13.1":
-  version: 4.13.1
-  resolution: "@rushstack/ts-command-line@npm:4.13.1"
+"@rushstack/ts-command-line@npm:4.15.2":
+  version: 4.15.2
+  resolution: "@rushstack/ts-command-line@npm:4.15.2"
   dependencies:
     "@types/argparse": 1.0.38
     argparse: ~1.0.9
     colors: ~1.2.1
     string-argv: ~0.3.1
-  checksum: fea24b2549ecb7d3409b6b485d7c58bf8af8f8d1dd19c43a6b3532c45579ffc546bc4533b5db29c91ae1716581fdee4cb725f6a81ecb300e902ef06600e59f1d
+  checksum: c80dcfc99630ee51c6654c58ff41f69a3bd89c38e41d9871692bc73ee3c938ced79f8b75e182e492cafb2f6ddeb0628606856af494a0259ff6fac5b248996bed
   languageName: node
   linkType: hard
 
@@ -14613,10 +15045,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@sinclair/typebox@npm:^0.25.16":
-  version: 0.25.23
-  resolution: "@sinclair/typebox@npm:0.25.23"
-  checksum: 5720daec6e604be9ac849e6361cfa30d19f4d01934c9b79a3a5f5290dfcefaa300192ea0d384bb5dd0104432d88447bbad27adfacdf0b0f042b510bf15fbd5db
+"@sinclair/typebox@npm:^0.27.8":
+  version: 0.27.8
+  resolution: "@sinclair/typebox@npm:0.27.8"
+  checksum: 00bd7362a3439021aa1ea51b0e0d0a0e8ca1351a3d54c606b115fdcc49b51b16db6e5f43b4fe7a28c38688523e22a94d49dd31168868b655f0d4d50f032d07a1
   languageName: node
   linkType: hard
 
@@ -14690,13 +15122,13 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@smithy/abort-controller@npm:^2.0.1":
-  version: 2.0.1
-  resolution: "@smithy/abort-controller@npm:2.0.1"
+"@smithy/abort-controller@npm:^2.0.1, @smithy/abort-controller@npm:^2.0.5":
+  version: 2.0.5
+  resolution: "@smithy/abort-controller@npm:2.0.5"
   dependencies:
-    "@smithy/types": ^2.0.2
+    "@smithy/types": ^2.2.2
     tslib: ^2.5.0
-  checksum: ec126164886a6f44ed83bde7599cd1a16e20cf429c05bf68897d06220b638aab6c7b6b3b937e65fc25d383d015ed2218ca8c1afaed2ff65fad197d0df2ccebc7
+  checksum: 2e328942b9f42c1186943ed300acd1bd0dbbf0b69ec4826a124fb1e649bcaef556c24d13023439dac0ce93cf37a46e3a277fe8a683fcaee95537d192a9f5d7da
   languageName: node
   linkType: hard
 
@@ -14719,141 +15151,141 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@smithy/config-resolver@npm:^2.0.1":
-  version: 2.0.1
-  resolution: "@smithy/config-resolver@npm:2.0.1"
+"@smithy/config-resolver@npm:^2.0.5":
+  version: 2.0.5
+  resolution: "@smithy/config-resolver@npm:2.0.5"
   dependencies:
-    "@smithy/types": ^2.0.2
+    "@smithy/types": ^2.2.2
     "@smithy/util-config-provider": ^2.0.0
     "@smithy/util-middleware": ^2.0.0
     tslib: ^2.5.0
-  checksum: ded6c77fd29ab026b5dcc1b4c4adb417515f7fd18af80f487f1868273ae98003d35ff7c6286207895fc74f5098e6eb8a94555a5af89818796a2fb8bb01a80c60
+  checksum: 324bc188246462ec7b29f128a92f9135620a37d1bf7c8071c3f51fc8249e8baafe8d8722e7547327c9fea8ad292c42383d211daa24dc8b627baacbeae62c3d1b
   languageName: node
   linkType: hard
 
-"@smithy/credential-provider-imds@npm:^2.0.0, @smithy/credential-provider-imds@npm:^2.0.1":
-  version: 2.0.1
-  resolution: "@smithy/credential-provider-imds@npm:2.0.1"
+"@smithy/credential-provider-imds@npm:^2.0.0, @smithy/credential-provider-imds@npm:^2.0.7":
+  version: 2.0.7
+  resolution: "@smithy/credential-provider-imds@npm:2.0.7"
   dependencies:
-    "@smithy/node-config-provider": ^2.0.1
-    "@smithy/property-provider": ^2.0.1
-    "@smithy/types": ^2.0.2
-    "@smithy/url-parser": ^2.0.1
+    "@smithy/node-config-provider": ^2.0.7
+    "@smithy/property-provider": ^2.0.6
+    "@smithy/types": ^2.2.2
+    "@smithy/url-parser": ^2.0.5
     tslib: ^2.5.0
-  checksum: cf0ee4b50da5584685afc9019af1a8e8c910890dc3128a574b606b7845d898cd65429263682ef27da79dc358286f48b4452617a2fe9fcb98e5483908ac05ce8b
+  checksum: e4caa4d2f34b9788345fb13ed7d363bc70491e2ac505f2c20d308a3e228a6705666e540ebe07fb81b1369c8893dc4ca64e0997f55221b411335070a83dd48729
   languageName: node
   linkType: hard
 
-"@smithy/eventstream-codec@npm:^2.0.1":
-  version: 2.0.1
-  resolution: "@smithy/eventstream-codec@npm:2.0.1"
+"@smithy/eventstream-codec@npm:^2.0.1, @smithy/eventstream-codec@npm:^2.0.5":
+  version: 2.0.5
+  resolution: "@smithy/eventstream-codec@npm:2.0.5"
   dependencies:
     "@aws-crypto/crc32": 3.0.0
-    "@smithy/types": ^2.0.2
+    "@smithy/types": ^2.2.2
     "@smithy/util-hex-encoding": ^2.0.0
     tslib: ^2.5.0
-  checksum: 2b7dc1f974b5302dd9fc0982c2484a4d6286e512db78c1c0b8796a5916c3846644b02c6dbbc8433181aeb41c5468d73635459e9f37d640a0bdaf3fe670da8914
+  checksum: 472c0b1652e2afcf9dd9a8f122255d8b3b46019ead3c12ce8ceb3242d2dca525c5dcf6fd2fe57e03621283c8762b44d553a10eb0ce35eecaf2f4366c45bbf683
   languageName: node
   linkType: hard
 
-"@smithy/eventstream-serde-browser@npm:^2.0.1":
-  version: 2.0.1
-  resolution: "@smithy/eventstream-serde-browser@npm:2.0.1"
+"@smithy/eventstream-serde-browser@npm:^2.0.5":
+  version: 2.0.5
+  resolution: "@smithy/eventstream-serde-browser@npm:2.0.5"
   dependencies:
-    "@smithy/eventstream-serde-universal": ^2.0.1
-    "@smithy/types": ^2.0.2
+    "@smithy/eventstream-serde-universal": ^2.0.5
+    "@smithy/types": ^2.2.2
     tslib: ^2.5.0
-  checksum: 08fc90c21a27f323a30c95d6fbbd57df077fbde8d80ae554b13984cc9a189f31e173296fdff64d7630118949f206d2054e75dd8e0ed97d281e1b41c933947570
+  checksum: 5fb5f31b20d8b8e614159ed4fa7ad619d303f220bcf2f9bb13ccf07e91ccd187a898cf9c09c97fe4b48d49ba702d1e3d5ad833591afd0051253638204cfafa4b
   languageName: node
   linkType: hard
 
-"@smithy/eventstream-serde-config-resolver@npm:^2.0.1":
-  version: 2.0.1
-  resolution: "@smithy/eventstream-serde-config-resolver@npm:2.0.1"
+"@smithy/eventstream-serde-config-resolver@npm:^2.0.5":
+  version: 2.0.5
+  resolution: "@smithy/eventstream-serde-config-resolver@npm:2.0.5"
   dependencies:
-    "@smithy/types": ^2.0.2
+    "@smithy/types": ^2.2.2
     tslib: ^2.5.0
-  checksum: 9efb031a7029fe21153d695126ee28bfbaa1c42d6d7b4ffedf06959e9d4ab3c7312c7c75cea102af2451dad919bea49dbe9d6fb9877fbf25fdd639a8c715a864
+  checksum: e1914a9b422c2cbcff1e8897e59ad0f8ca81116c08180f0316ba4adbfc72115ccbff5453488e8cba15431f980adc0a09695fb437b67df8e11b2ebbb0b70036c5
   languageName: node
   linkType: hard
 
-"@smithy/eventstream-serde-node@npm:^2.0.1":
-  version: 2.0.1
-  resolution: "@smithy/eventstream-serde-node@npm:2.0.1"
+"@smithy/eventstream-serde-node@npm:^2.0.5":
+  version: 2.0.5
+  resolution: "@smithy/eventstream-serde-node@npm:2.0.5"
   dependencies:
-    "@smithy/eventstream-serde-universal": ^2.0.1
-    "@smithy/types": ^2.0.2
+    "@smithy/eventstream-serde-universal": ^2.0.5
+    "@smithy/types": ^2.2.2
     tslib: ^2.5.0
-  checksum: ff7460759e45286980d8c7addff2bd52b8c8dbcddd6ad6877f31654f936be5dbfbe9745b1ce70fb6b05b0426181594555593826b209f41e74fdc78dcb2e500b7
+  checksum: a13a432a13418d7d5f766b1dce312c004691b6cd1991d9bae74e65a2b5bcb4f4d8af285ad6c91edbbc8b9b50d4a1405432e0db38e52401c134113c00ea74c5b4
   languageName: node
   linkType: hard
 
-"@smithy/eventstream-serde-universal@npm:^2.0.1":
-  version: 2.0.1
-  resolution: "@smithy/eventstream-serde-universal@npm:2.0.1"
+"@smithy/eventstream-serde-universal@npm:^2.0.5":
+  version: 2.0.5
+  resolution: "@smithy/eventstream-serde-universal@npm:2.0.5"
   dependencies:
-    "@smithy/eventstream-codec": ^2.0.1
-    "@smithy/types": ^2.0.2
+    "@smithy/eventstream-codec": ^2.0.5
+    "@smithy/types": ^2.2.2
     tslib: ^2.5.0
-  checksum: b9c7492719ccf444d209e6ced04c1526211b65cab23d6dbf89213c65957493cd5d0ec0f382d021c22e93461d2a7f3a2c7cb08c899d9e1690c3bf9c47d3edfa47
+  checksum: 94a49055f025a9aac5e115038bdebdc8c88086e58f25d32c3e57f2d788c880e113eccec4633b485b83e8b1e67d42d3870acedbf27365200fd436ebc13948f9e9
   languageName: node
   linkType: hard
 
-"@smithy/fetch-http-handler@npm:^2.0.1":
-  version: 2.0.1
-  resolution: "@smithy/fetch-http-handler@npm:2.0.1"
+"@smithy/fetch-http-handler@npm:^2.0.5":
+  version: 2.0.5
+  resolution: "@smithy/fetch-http-handler@npm:2.0.5"
   dependencies:
-    "@smithy/protocol-http": ^2.0.1
-    "@smithy/querystring-builder": ^2.0.1
-    "@smithy/types": ^2.0.2
+    "@smithy/protocol-http": ^2.0.5
+    "@smithy/querystring-builder": ^2.0.5
+    "@smithy/types": ^2.2.2
     "@smithy/util-base64": ^2.0.0
     tslib: ^2.5.0
-  checksum: ba80a2182d3c68a88212a99cbeb1bd645f5f6f7584081763faf5590443266e9f32b15e8f7380eaf92ed61fe9fdfbdec1ec030eb0c02b68ed48b4fa710c6718e3
+  checksum: dae54728eca4e47b0e9604dd87cc503887f62d796b2f92efbbcdfcb4b7432454fa866898416ddf7fd02e7a7d06eb2ba0f1709e418cb1ce763764797f53188b46
   languageName: node
   linkType: hard
 
-"@smithy/hash-blob-browser@npm:^2.0.1":
-  version: 2.0.1
-  resolution: "@smithy/hash-blob-browser@npm:2.0.1"
+"@smithy/hash-blob-browser@npm:^2.0.5":
+  version: 2.0.5
+  resolution: "@smithy/hash-blob-browser@npm:2.0.5"
   dependencies:
     "@smithy/chunked-blob-reader": ^2.0.0
     "@smithy/chunked-blob-reader-native": ^2.0.0
-    "@smithy/types": ^2.0.2
+    "@smithy/types": ^2.2.2
     tslib: ^2.5.0
-  checksum: 480555069022fc725f05b1b5ecdd3d70280d851a4e61b5ddd3f1c43ef59e8c0e9e3b45991716a87d9bb7d542833d01d0d614d3b7d60448ffa521956a8be58cb3
+  checksum: b66102c035d669169ef28c2ddc7115b0bb2620159eb0768782d832cc85324222e9463945477dc8b61daa5036251e76a0dd05ddda13e2464373cc31a0b05f94f1
   languageName: node
   linkType: hard
 
-"@smithy/hash-node@npm:^2.0.1":
-  version: 2.0.1
-  resolution: "@smithy/hash-node@npm:2.0.1"
+"@smithy/hash-node@npm:^2.0.5":
+  version: 2.0.5
+  resolution: "@smithy/hash-node@npm:2.0.5"
   dependencies:
-    "@smithy/types": ^2.0.2
+    "@smithy/types": ^2.2.2
     "@smithy/util-buffer-from": ^2.0.0
     "@smithy/util-utf8": ^2.0.0
     tslib: ^2.5.0
-  checksum: e1a1b1ea44f42eacd982680877c31ce4ea4243455bc16e89357981c60902f93074874148701bc82776f41e66eacc6b16c8cc46cd7c99f4135ba13f4ba4a44edf
+  checksum: bfc0441464b0f37905feb715bf86fb0ded8be3d31e6b28a1e05bfd48b45fcb929f93be3b25d59a89bb0156cbeb9ba5a245ca807fc42f43b26dd77ed18a3794fa
   languageName: node
   linkType: hard
 
-"@smithy/hash-stream-node@npm:^2.0.1":
-  version: 2.0.1
-  resolution: "@smithy/hash-stream-node@npm:2.0.1"
+"@smithy/hash-stream-node@npm:^2.0.5":
+  version: 2.0.5
+  resolution: "@smithy/hash-stream-node@npm:2.0.5"
   dependencies:
-    "@smithy/types": ^2.0.2
+    "@smithy/types": ^2.2.2
     "@smithy/util-utf8": ^2.0.0
     tslib: ^2.5.0
-  checksum: 8c80dbfe4ae143d73feae381c47e78e29f05d9bfed457cfdb22c5e0fc5b773500c943cd9ca58a1eb04f7ccfcea197bcd05741ad68ae17b08472264e900bc8edf
+  checksum: c1b1afa1595bf87101a906d28b7ce3fccfd9d32314305bf143ee126cce2977aa36fb57a12f6830f53008aadfe0161e5b4ad7a193ba00af652eaff27a50a3632b
   languageName: node
   linkType: hard
 
-"@smithy/invalid-dependency@npm:^2.0.1":
-  version: 2.0.1
-  resolution: "@smithy/invalid-dependency@npm:2.0.1"
+"@smithy/invalid-dependency@npm:^2.0.5":
+  version: 2.0.5
+  resolution: "@smithy/invalid-dependency@npm:2.0.5"
   dependencies:
-    "@smithy/types": ^2.0.2
+    "@smithy/types": ^2.2.2
     tslib: ^2.5.0
-  checksum: d50f5781c9e0b1cb336fa20979ee69640bfa586139237eacae9f9068e40c8c729b3b4646af5fab0250e8e49649acab14262d3524f515ecbecc58cd24b68b7ef5
+  checksum: b24444cf315fb52078c6d4faaddccc15db7c8068b14bf3d4742ac6addd6719e94ac17b85cc6012714cbca047eb186ac54d632fd3ea5725a523d2fd7e903f0e81
   languageName: node
   linkType: hard
 
@@ -14866,63 +15298,63 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@smithy/md5-js@npm:^2.0.1":
-  version: 2.0.1
-  resolution: "@smithy/md5-js@npm:2.0.1"
+"@smithy/md5-js@npm:^2.0.5":
+  version: 2.0.5
+  resolution: "@smithy/md5-js@npm:2.0.5"
   dependencies:
-    "@smithy/types": ^2.0.2
+    "@smithy/types": ^2.2.2
     "@smithy/util-utf8": ^2.0.0
     tslib: ^2.5.0
-  checksum: 29593e5ea6a53140edadbbfba1004ca811cef1d53db800446fa578a88d71fb1e042cb551b5b954162066027a09c7866d7d955f6d0aadfebeec01af744f7c8b8a
+  checksum: 4b253d6762750f751431d881f4d4fb6e0a0d0bc63744a637cff7cc51d242a3d84b906c3fed2500324f13236c16946f18a88b51f35b5ef8edd4ad1ffaf69fdac0
   languageName: node
   linkType: hard
 
-"@smithy/middleware-content-length@npm:^2.0.1":
-  version: 2.0.1
-  resolution: "@smithy/middleware-content-length@npm:2.0.1"
+"@smithy/middleware-content-length@npm:^2.0.5":
+  version: 2.0.5
+  resolution: "@smithy/middleware-content-length@npm:2.0.5"
   dependencies:
-    "@smithy/protocol-http": ^2.0.1
-    "@smithy/types": ^2.0.2
+    "@smithy/protocol-http": ^2.0.5
+    "@smithy/types": ^2.2.2
     tslib: ^2.5.0
-  checksum: f9074ba2d5780b0d55e46aeacff8276fb11acf828afdc813ec3c5f118323533f774dd2b99ae00c946993c5ba91c66afa5b40d66ce5f035a456cf6c4cd38a83e1
+  checksum: 1dfbac11f63a38a73bb33883c4575d0f74982000ad173a4b723d505734abad3cd20962635aa63231bd0ac1bcdebe75a4f95520c9779d542e6937b70a3dbc84c6
   languageName: node
   linkType: hard
 
-"@smithy/middleware-endpoint@npm:^2.0.1":
-  version: 2.0.1
-  resolution: "@smithy/middleware-endpoint@npm:2.0.1"
+"@smithy/middleware-endpoint@npm:^2.0.5":
+  version: 2.0.5
+  resolution: "@smithy/middleware-endpoint@npm:2.0.5"
   dependencies:
-    "@smithy/middleware-serde": ^2.0.1
-    "@smithy/types": ^2.0.2
-    "@smithy/url-parser": ^2.0.1
+    "@smithy/middleware-serde": ^2.0.5
+    "@smithy/types": ^2.2.2
+    "@smithy/url-parser": ^2.0.5
     "@smithy/util-middleware": ^2.0.0
     tslib: ^2.5.0
-  checksum: 5aa0a4c6972a533936dba5eb0d719bb9b534484a401f1a6135a201fc683083aa925d207f2155e15656b2c941c05de2a2aa74dae5e0b9d1a183371a3c3b90b3f6
+  checksum: 258ad9e51dc39aa0b6f16af14bdc80871e3fa0c9649e1ad83d3e8c7e14b4139f8dcba4fbe0953010fde08ba9af3b27611d70627368d94672232b3b667ac398ac
   languageName: node
   linkType: hard
 
-"@smithy/middleware-retry@npm:^2.0.1":
-  version: 2.0.1
-  resolution: "@smithy/middleware-retry@npm:2.0.1"
+"@smithy/middleware-retry@npm:^2.0.5":
+  version: 2.0.5
+  resolution: "@smithy/middleware-retry@npm:2.0.5"
   dependencies:
-    "@smithy/protocol-http": ^2.0.1
+    "@smithy/protocol-http": ^2.0.5
     "@smithy/service-error-classification": ^2.0.0
-    "@smithy/types": ^2.0.2
+    "@smithy/types": ^2.2.2
     "@smithy/util-middleware": ^2.0.0
     "@smithy/util-retry": ^2.0.0
     tslib: ^2.5.0
     uuid: ^8.3.2
-  checksum: a1dd6d1feb560632075f3b3be2f3d406635dc3a158e286eb43f3b93c52deacb2a7c7262f3c911cb652f42e4cb4091155482b04a6c0c61360b650468a54f944b2
+  checksum: 486d3a1d1e706abbb4853c1ee4db313578c19b2529a7c9c2f9e2afd4789f25d247f74895f2c745a49eed6f4c873bd00c2ad3da0f1d170da09c4e90798ca2c3b7
   languageName: node
   linkType: hard
 
-"@smithy/middleware-serde@npm:^2.0.1":
-  version: 2.0.1
-  resolution: "@smithy/middleware-serde@npm:2.0.1"
+"@smithy/middleware-serde@npm:^2.0.5":
+  version: 2.0.5
+  resolution: "@smithy/middleware-serde@npm:2.0.5"
   dependencies:
-    "@smithy/types": ^2.0.2
+    "@smithy/types": ^2.2.2
     tslib: ^2.5.0
-  checksum: 115d2b94925f24e3592d6e3889179c30c8992957021bfdc67496f9e36dcb3ffe2282a01c0e439282e89c0a5b56bf125a1bec2c87aed02e325316e3b6050ed9fa
+  checksum: 51c2ce5158106757da351fce512ea709c1cf7a2724f5e4430bf18c4e70571a806ebc7f09e38b3281fc81d5446da106450ee84c4508607cff83078c58be61f8dd
   languageName: node
   linkType: hard
 
@@ -14935,69 +15367,69 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@smithy/node-config-provider@npm:^2.0.1":
-  version: 2.0.1
-  resolution: "@smithy/node-config-provider@npm:2.0.1"
+"@smithy/node-config-provider@npm:^2.0.6, @smithy/node-config-provider@npm:^2.0.7":
+  version: 2.0.7
+  resolution: "@smithy/node-config-provider@npm:2.0.7"
   dependencies:
-    "@smithy/property-provider": ^2.0.1
-    "@smithy/shared-ini-file-loader": ^2.0.1
-    "@smithy/types": ^2.0.2
+    "@smithy/property-provider": ^2.0.6
+    "@smithy/shared-ini-file-loader": ^2.0.6
+    "@smithy/types": ^2.2.2
     tslib: ^2.5.0
-  checksum: 9752c8e7c01fc991b93bb080e8486b82d55d592a2c7573004c2e296c192c153b967c79c03be0924c59e14ffc3de04ca861e99370d2ae9a0d8c54f25ea3f99be8
+  checksum: 5bb2e41ada99a4a94a0b087b2e5d2a5e4e1e5d4ed8cb7bf84258ff662a8f649d70870ec40587d4ee92a93dbc1fa904189d71d691c559252e3dc8ddf20990910b
   languageName: node
   linkType: hard
 
-"@smithy/node-http-handler@npm:^2.0.1":
-  version: 2.0.1
-  resolution: "@smithy/node-http-handler@npm:2.0.1"
+"@smithy/node-http-handler@npm:^2.0.5":
+  version: 2.0.5
+  resolution: "@smithy/node-http-handler@npm:2.0.5"
   dependencies:
-    "@smithy/abort-controller": ^2.0.1
-    "@smithy/protocol-http": ^2.0.1
-    "@smithy/querystring-builder": ^2.0.1
-    "@smithy/types": ^2.0.2
+    "@smithy/abort-controller": ^2.0.5
+    "@smithy/protocol-http": ^2.0.5
+    "@smithy/querystring-builder": ^2.0.5
+    "@smithy/types": ^2.2.2
     tslib: ^2.5.0
-  checksum: 04705e7c28fb71a5800a511f64dd182230a501742f779860b1d2155a02eec9c9df3b573e2ad9cd3a0148891f02b780edb7803c95b321dd4a2659715ac73566ee
+  checksum: fb2c6faab1d0107e7610c4ed723114c58de4b396e4e76a13df7831ef4d22ae188138af8becd749b95acec94a44e3d673b2ca9fee5217928ca3bea52c6e5319b0
   languageName: node
   linkType: hard
 
-"@smithy/property-provider@npm:^2.0.0, @smithy/property-provider@npm:^2.0.1":
-  version: 2.0.1
-  resolution: "@smithy/property-provider@npm:2.0.1"
+"@smithy/property-provider@npm:^2.0.0, @smithy/property-provider@npm:^2.0.6":
+  version: 2.0.6
+  resolution: "@smithy/property-provider@npm:2.0.6"
   dependencies:
-    "@smithy/types": ^2.0.2
+    "@smithy/types": ^2.2.2
     tslib: ^2.5.0
-  checksum: 56ea840032911b37a2e602144cf4cf08401a79a3ab06e226a4cf65a14b77e70e4d0bd8f762d172e322a0cf75f45bd1886a265687e090a2848798225e276f2882
+  checksum: 7292d89603c3e98c8d771bb7a9f5fac992608927808d7e06b68213514bf2b894ba5360f2a2b0ccd1f0a1b6aa3c31689637b5fce3eebcaa7aec1dd980a6a1e624
   languageName: node
   linkType: hard
 
-"@smithy/protocol-http@npm:^2.0.1":
-  version: 2.0.1
-  resolution: "@smithy/protocol-http@npm:2.0.1"
+"@smithy/protocol-http@npm:^2.0.5":
+  version: 2.0.5
+  resolution: "@smithy/protocol-http@npm:2.0.5"
   dependencies:
-    "@smithy/types": ^2.0.2
+    "@smithy/types": ^2.2.2
     tslib: ^2.5.0
-  checksum: cc3d354fad3f27ab29cf7053bbdbbd150dca1864595a46d463abf06595af68e5c31cfc2d03b971fbb693cb9abd3be5763a195497a4fe19f8aed3132069ae3246
+  checksum: 0c9dbc7c90a3908626260156ec26e8fc83eb257c002a01c4f840efc19065a9397df8ebaf9ed7f521baea5b2792e3476143ae8bd7e7f21aaa454bcb894c3d1658
   languageName: node
   linkType: hard
 
-"@smithy/querystring-builder@npm:^2.0.1":
-  version: 2.0.1
-  resolution: "@smithy/querystring-builder@npm:2.0.1"
+"@smithy/querystring-builder@npm:^2.0.5":
+  version: 2.0.5
+  resolution: "@smithy/querystring-builder@npm:2.0.5"
   dependencies:
-    "@smithy/types": ^2.0.2
+    "@smithy/types": ^2.2.2
     "@smithy/util-uri-escape": ^2.0.0
     tslib: ^2.5.0
-  checksum: f8ec37623054fcbad8317b57ef41fc906f3f22260b365e7c3b107219dcf456c5c7347165f3bf25d47a4c592548d835778f9c8bc7cc7306b65aa6ce429d94a345
+  checksum: 4a684189ac9bf50dba2c648a6a36299181bcdf3e688dc5e5bce94a5befd30e6662b6e84e5a30e8876dc2ff293eeb74f4fdf17446e8886228a62f1cbcf5c0e807
   languageName: node
   linkType: hard
 
-"@smithy/querystring-parser@npm:^2.0.1":
-  version: 2.0.1
-  resolution: "@smithy/querystring-parser@npm:2.0.1"
+"@smithy/querystring-parser@npm:^2.0.5":
+  version: 2.0.5
+  resolution: "@smithy/querystring-parser@npm:2.0.5"
   dependencies:
-    "@smithy/types": ^2.0.2
+    "@smithy/types": ^2.2.2
     tslib: ^2.5.0
-  checksum: a6107281ae33beb5518b85de82fea7692cfcb6c15155719c6ba6ee44cc75b20f07ce28214c635ee38b0474995c0a23b4872feef8bd9f98a7811b7ccf59bac819
+  checksum: 71d5fb2379529c6fe411945d05887b169113df0c29258981cb541487c0c5cd9be8dc31efee34e357e6532733b000a77f374e665c0ef73aeb92c3134f10ecf607
   languageName: node
   linkType: hard
 
@@ -15008,13 +15440,13 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@smithy/shared-ini-file-loader@npm:^2.0.0, @smithy/shared-ini-file-loader@npm:^2.0.1":
-  version: 2.0.1
-  resolution: "@smithy/shared-ini-file-loader@npm:2.0.1"
+"@smithy/shared-ini-file-loader@npm:^2.0.6":
+  version: 2.0.6
+  resolution: "@smithy/shared-ini-file-loader@npm:2.0.6"
   dependencies:
-    "@smithy/types": ^2.0.2
+    "@smithy/types": ^2.2.2
     tslib: ^2.5.0
-  checksum: 0f67d0ba9e44286a444301e603260a2ae5973324d43bc89f6ca15d2a830b32c1232474ff452cf3d607ee08d4fa6d17517fd901a4e6fd4dddbc571aa6b1ae3b6d
+  checksum: 33569b7e1f236b03c9253ba9d1a07e87d3fb186c33da7ce3f1d3f641a50f1a484e8624b6667d0044188e4a5eb5d594ab9f197dc2d31a8958dc2dd5e6cf74af1d
   languageName: node
   linkType: hard
 
@@ -15034,15 +15466,15 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@smithy/smithy-client@npm:^2.0.1":
-  version: 2.0.1
-  resolution: "@smithy/smithy-client@npm:2.0.1"
+"@smithy/smithy-client@npm:^2.0.5":
+  version: 2.0.5
+  resolution: "@smithy/smithy-client@npm:2.0.5"
   dependencies:
     "@smithy/middleware-stack": ^2.0.0
-    "@smithy/types": ^2.0.2
-    "@smithy/util-stream": ^2.0.1
+    "@smithy/types": ^2.2.2
+    "@smithy/util-stream": ^2.0.5
     tslib: ^2.5.0
-  checksum: 5c4abe0a0a67f2c2aa47cbf2806d0d44a34f97ebc83f1add9654d95cef3303fc0dff41237a7e360ae6c2be721e945c889bf869f11476a759c0ad82d61df18f5a
+  checksum: 8dabc85dae6f7a47cc743e412cbf4d95f93bdee163d9b9dfb0c1f4361f0c3c2d627a1e1dcfec506a2052775b8d3da5977ba94d820c3a3abc48c6d2344185d849
   languageName: node
   linkType: hard
 
@@ -15055,23 +15487,23 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@smithy/types@npm:^2.0.2":
-  version: 2.0.2
-  resolution: "@smithy/types@npm:2.0.2"
+"@smithy/types@npm:^2.0.2, @smithy/types@npm:^2.2.2":
+  version: 2.2.2
+  resolution: "@smithy/types@npm:2.2.2"
   dependencies:
     tslib: ^2.5.0
-  checksum: 4afdd7c77b212abd9e0770a1489057aa0470f8a59061c4fb2175b1f12e02180db3d85e16f2cd870a95c17bd28a5a4b8ef1dff1ade6852f85eafea12872d9588e
+  checksum: 2799a14620da60efb2a0aba1bf9adc553a5446dc447b9ee1d7a95410233a70dff2b5e563fecf84388137dabbe662c6bf3a2247ca20a1f266c1256f82e0f25fcf
   languageName: node
   linkType: hard
 
-"@smithy/url-parser@npm:^2.0.1":
-  version: 2.0.1
-  resolution: "@smithy/url-parser@npm:2.0.1"
+"@smithy/url-parser@npm:^2.0.5":
+  version: 2.0.5
+  resolution: "@smithy/url-parser@npm:2.0.5"
   dependencies:
-    "@smithy/querystring-parser": ^2.0.1
-    "@smithy/types": ^2.0.2
+    "@smithy/querystring-parser": ^2.0.5
+    "@smithy/types": ^2.2.2
     tslib: ^2.5.0
-  checksum: 653bdeff812b972fa88a4e2d795c38df1aca68055818d150727b8b7d2b7b6bb00aed003b113febe371ed2e38e8dd4715b31af6afce7e883d937aed75e7ff48fb
+  checksum: 5360d96d21492a7014bc952f530bf30a50008a809dc0cb219d336bbd23be29ff15437033bddebe600ff763e3d1efab2fe8cacc6d7545c26c86377e23e6a404d8
   languageName: node
   linkType: hard
 
@@ -15094,12 +15526,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@smithy/util-body-length-node@npm:^2.0.0":
-  version: 2.0.0
-  resolution: "@smithy/util-body-length-node@npm:2.0.0"
+"@smithy/util-body-length-node@npm:^2.1.0":
+  version: 2.1.0
+  resolution: "@smithy/util-body-length-node@npm:2.1.0"
   dependencies:
     tslib: ^2.5.0
-  checksum: 47ded0cc99f880eda353700e10d6131289683164d4ef98a24a2d79449d33f3bbf70c1ce0a66fc457e0c8d14be9fb2a3430fa09302bbc3daa5d23129e11fff478
+  checksum: e4635251898f12e1825f2848e0b7cc9d01ec6635b3f1f71b790734bb702b88e795f6c539d42d95472dad00e50e9ff13fcf396791092b131e5834069cb8f52ed0
   languageName: node
   linkType: hard
 
@@ -15122,29 +15554,29 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@smithy/util-defaults-mode-browser@npm:^2.0.1":
-  version: 2.0.1
-  resolution: "@smithy/util-defaults-mode-browser@npm:2.0.1"
+"@smithy/util-defaults-mode-browser@npm:^2.0.6":
+  version: 2.0.6
+  resolution: "@smithy/util-defaults-mode-browser@npm:2.0.6"
   dependencies:
-    "@smithy/property-provider": ^2.0.1
-    "@smithy/types": ^2.0.2
+    "@smithy/property-provider": ^2.0.6
+    "@smithy/types": ^2.2.2
     bowser: ^2.11.0
     tslib: ^2.5.0
-  checksum: b436183ca880c1bb607116c780e7e8d1e252aeb51daf5f35740281671a4553431f393847d74ad180e9388bf11aeab1c675f61bb3a34a0d2fa9943111b063b17d
+  checksum: 017bb8b0deaa38509164478e2d4b865a0c80098013a7e445a633f97a8e5211b79741dca3c2e0990992d0cabd2f3187ec8bba5a9992ad65e5f2898f5cb302c76f
   languageName: node
   linkType: hard
 
-"@smithy/util-defaults-mode-node@npm:^2.0.1":
-  version: 2.0.1
-  resolution: "@smithy/util-defaults-mode-node@npm:2.0.1"
+"@smithy/util-defaults-mode-node@npm:^2.0.6":
+  version: 2.0.7
+  resolution: "@smithy/util-defaults-mode-node@npm:2.0.7"
   dependencies:
-    "@smithy/config-resolver": ^2.0.1
-    "@smithy/credential-provider-imds": ^2.0.1
-    "@smithy/node-config-provider": ^2.0.1
-    "@smithy/property-provider": ^2.0.1
-    "@smithy/types": ^2.0.2
+    "@smithy/config-resolver": ^2.0.5
+    "@smithy/credential-provider-imds": ^2.0.7
+    "@smithy/node-config-provider": ^2.0.7
+    "@smithy/property-provider": ^2.0.6
+    "@smithy/types": ^2.2.2
     tslib: ^2.5.0
-  checksum: ffd9601a8b37e1ea7a2c23bcaa70bf297c5c95113e8bab41a2f533d1a2f9f9631e66b5360312e202980dbd03ed3c8d8146dd33c8d4e5d3caf30c78a39b301de2
+  checksum: 87392a683dbf9d73b5068f280f416efcb70a7f71c0b02bd9f4519530c7f48112ce8549378459c764ae23f0520c065c4e801411fb1875fd8d142a4af95a5bcbba
   languageName: node
   linkType: hard
 
@@ -15176,19 +15608,19 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@smithy/util-stream@npm:^2.0.1":
-  version: 2.0.1
-  resolution: "@smithy/util-stream@npm:2.0.1"
+"@smithy/util-stream@npm:^2.0.5":
+  version: 2.0.5
+  resolution: "@smithy/util-stream@npm:2.0.5"
   dependencies:
-    "@smithy/fetch-http-handler": ^2.0.1
-    "@smithy/node-http-handler": ^2.0.1
-    "@smithy/types": ^2.0.2
+    "@smithy/fetch-http-handler": ^2.0.5
+    "@smithy/node-http-handler": ^2.0.5
+    "@smithy/types": ^2.2.2
     "@smithy/util-base64": ^2.0.0
     "@smithy/util-buffer-from": ^2.0.0
     "@smithy/util-hex-encoding": ^2.0.0
     "@smithy/util-utf8": ^2.0.0
     tslib: ^2.5.0
-  checksum: 3a190a9e5e3675e69ffdb72bec00216cb8c3e5a565cdcea47bff593c8aac34bc39897c870c4ad82ea369a5be5caa63b08a20516653b6de0e0a19a291315c3773
+  checksum: a78312fcbd50b55eb995959fccea8b7957dd352a1fff1abea2906aa5629305b68a9f3025bcd1edd60e5a2d5dd9e1dab00959f5971ded0d450fb463cf9865aedd
   languageName: node
   linkType: hard
 
@@ -15211,14 +15643,14 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@smithy/util-waiter@npm:^2.0.1":
-  version: 2.0.1
-  resolution: "@smithy/util-waiter@npm:2.0.1"
+"@smithy/util-waiter@npm:^2.0.5":
+  version: 2.0.5
+  resolution: "@smithy/util-waiter@npm:2.0.5"
   dependencies:
-    "@smithy/abort-controller": ^2.0.1
-    "@smithy/types": ^2.0.2
+    "@smithy/abort-controller": ^2.0.5
+    "@smithy/types": ^2.2.2
     tslib: ^2.5.0
-  checksum: d85893533b4222545151d8a0e4c67400a8370bc3dce34c17f5ce0c19b4dadf102ffa7b3ef2b5004abcf0892c318825b07498f8a86f2430cc886f55bf7369a57f
+  checksum: b36069643d7641f019f8eb28e006eb301e82f5d93412f79b87ae473d661830349e60d65c18219e252d276cd014954f05e989eb6098100efb782219167a88f1f0
   languageName: node
   linkType: hard
 
@@ -15383,8 +15815,8 @@ __metadata:
   linkType: hard
 
 "@stoplight/spectral-formatters@npm:^1.1.0":
-  version: 1.1.0
-  resolution: "@stoplight/spectral-formatters@npm:1.1.0"
+  version: 1.2.0
+  resolution: "@stoplight/spectral-formatters@npm:1.2.0"
   dependencies:
     "@stoplight/path": ^1.3.2
     "@stoplight/spectral-core": ^1.15.1
@@ -15396,7 +15828,7 @@ __metadata:
     strip-ansi: 6.0
     text-table: ^0.2.0
     tslib: ^2.5.0
-  checksum: a72d9ecb423af1f911b654f48ae04c19f0707e8eb8542de57090299dbff19e58a1dff8f229614056fbf2b2f44636423cd9c980189c4cceb58961d84925d9ae7b
+  checksum: e84cc06ed33348f532f513b64d7179e2e261d6b87e45be66169088bf8d4c0fbc8fcda92adcde0d3f88f03eb5f31fbf9b2c853cdd49d4d1ae809d9a76920adb16
   languageName: node
   linkType: hard
 
@@ -15445,8 +15877,8 @@ __metadata:
   linkType: hard
 
 "@stoplight/spectral-rulesets@npm:^1.16.0":
-  version: 1.16.0
-  resolution: "@stoplight/spectral-rulesets@npm:1.16.0"
+  version: 1.17.0
+  resolution: "@stoplight/spectral-rulesets@npm:1.17.0"
   dependencies:
     "@asyncapi/specs": ^4.1.0
     "@stoplight/better-ajv-errors": 1.0.3
@@ -15462,7 +15894,7 @@ __metadata:
     json-schema-traverse: ^1.0.0
     lodash: ~4.17.21
     tslib: ^2.3.0
-  checksum: d6e47d4cb96c30d10571dcdbc24ed6bf53f09bdbccbd59bc9538ceb716d82eca68595780dd489f4ca5fcd4398c9adbd5dc931894f26040dcff33fd45b67463eb
+  checksum: 3f79636fde7e2ae26f6af5f5e50e2faa385cbd7b22ea658ea15cf0f1c04a3827e168340f877310f4ab7d6bacc82910e21b2aa43f60b95a923dc430ee0978569b
   languageName: node
   linkType: hard
 
@@ -15492,12 +15924,12 @@ __metadata:
   linkType: hard
 
 "@stoplight/types@npm:^12.3.0 || ^13.0.0, @stoplight/types@npm:^13.0.0, @stoplight/types@npm:^13.14.0, @stoplight/types@npm:^13.15.0, @stoplight/types@npm:^13.6.0":
-  version: 13.15.0
-  resolution: "@stoplight/types@npm:13.15.0"
+  version: 13.20.0
+  resolution: "@stoplight/types@npm:13.20.0"
   dependencies:
     "@types/json-schema": ^7.0.4
     utility-types: ^3.10.0
-  checksum: 839f0bbedb791bd6792ef22b6a821ca504b14b705927f7c510c4cdcc591eddc8818c82b8857129501aa809d6f369b82e4487bfe18dfc5ce00e28317ecad2df9a
+  checksum: b4c7ee22a8d4377aa9b2f901887c17b4a27d1009b2b9348962b2c6a72100ca954d11293a6dd2de01920e8fdc589e31b20ad84421eb0bf5edd9aeef5b5810f04b
   languageName: node
   linkType: hard
 
@@ -15541,505 +15973,507 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@svgr/babel-plugin-add-jsx-attribute@npm:^6.5.0":
-  version: 6.5.0
-  resolution: "@svgr/babel-plugin-add-jsx-attribute@npm:6.5.0"
+"@svgr/babel-plugin-add-jsx-attribute@npm:^6.5.1":
+  version: 6.5.1
+  resolution: "@svgr/babel-plugin-add-jsx-attribute@npm:6.5.1"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: f65ca26905240b685929a7766411618700bda233673cebd74eb9a8da45af8ce8e0536074a178b37762cd23db8868db494e15067e74b2d73e377b2d247895d054
+  checksum: cab83832830a57735329ed68f67c03b57ca21fa037b0134847b0c5c0ef4beca89956d7dacfbf7b2a10fd901e7009e877512086db2ee918b8c69aee7742ae32c0
   languageName: node
   linkType: hard
 
-"@svgr/babel-plugin-remove-jsx-attribute@npm:^6.5.0":
-  version: 6.5.0
-  resolution: "@svgr/babel-plugin-remove-jsx-attribute@npm:6.5.0"
+"@svgr/babel-plugin-remove-jsx-attribute@npm:*":
+  version: 8.0.0
+  resolution: "@svgr/babel-plugin-remove-jsx-attribute@npm:8.0.0"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 7a4dfc1345f5855b010684e9c5301731842bf91d72b82ce5cc4c82c80b94de1036e447a8a00fb306a6dd575cb4c640d8ce3cfee6607ddbb804796a77284c7f22
+  checksum: ff992893c6c4ac802713ba3a97c13be34e62e6d981c813af40daabcd676df68a72a61bd1e692bb1eda3587f1b1d700ea462222ae2153bb0f46886632d4f88d08
   languageName: node
   linkType: hard
 
-"@svgr/babel-plugin-remove-jsx-empty-expression@npm:^6.5.0":
-  version: 6.5.0
-  resolution: "@svgr/babel-plugin-remove-jsx-empty-expression@npm:6.5.0"
+"@svgr/babel-plugin-remove-jsx-empty-expression@npm:*":
+  version: 8.0.0
+  resolution: "@svgr/babel-plugin-remove-jsx-empty-expression@npm:8.0.0"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 3e173f720d530f9f71f8506f3eb78583eec3d87d66e385efe1ef3b3ebfc4e3680ec30f36414726de6a163e99ca69f54886022967e49476dea522267e1986936e
+  checksum: 0fb691b63a21bac00da3aa2dccec50d0d5a5b347ff408d60803b84410d8af168f2656e4ba1ee1f24dab0ae4e4af77901f2928752bb0434c1f6788133ec599ec8
   languageName: node
   linkType: hard
 
-"@svgr/babel-plugin-replace-jsx-attribute-value@npm:^6.5.0":
-  version: 6.5.0
-  resolution: "@svgr/babel-plugin-replace-jsx-attribute-value@npm:6.5.0"
+"@svgr/babel-plugin-replace-jsx-attribute-value@npm:^6.5.1":
+  version: 6.5.1
+  resolution: "@svgr/babel-plugin-replace-jsx-attribute-value@npm:6.5.1"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: e8e77e4026f2e2f910a3495be8bd283f413865449b6e2f639318d76edc05b373e18d86e1210c808038a5477ae273858d3b313b2a7df8e6929450ed902c1441bc
+  checksum: b7d2125758e766e1ebd14b92216b800bdc976959bc696dbfa1e28682919147c1df4bb8b1b5fd037d7a83026e27e681fea3b8d3741af8d3cf4c9dfa3d412125df
   languageName: node
   linkType: hard
 
-"@svgr/babel-plugin-svg-dynamic-title@npm:^6.5.0":
-  version: 6.5.0
-  resolution: "@svgr/babel-plugin-svg-dynamic-title@npm:6.5.0"
+"@svgr/babel-plugin-svg-dynamic-title@npm:^6.5.1":
+  version: 6.5.1
+  resolution: "@svgr/babel-plugin-svg-dynamic-title@npm:6.5.1"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 55f36f6e3ef986f2d0ba4cd9e2ebf6b17d68c5c2cf98821abc0dbd551d4fd7d92cf3cda83a91898d988ad7118a9768042ac5afe534ad594bdac024fe0009bae1
+  checksum: 0fd42ebf127ae9163ef341e84972daa99bdcb9e6ed3f83aabd95ee173fddc43e40e02fa847fbc0a1058cf5549f72b7960a2c5e22c3e4ac18f7e3ac81277852ae
   languageName: node
   linkType: hard
 
-"@svgr/babel-plugin-svg-em-dimensions@npm:^6.5.0":
-  version: 6.5.0
-  resolution: "@svgr/babel-plugin-svg-em-dimensions@npm:6.5.0"
+"@svgr/babel-plugin-svg-em-dimensions@npm:^6.5.1":
+  version: 6.5.1
+  resolution: "@svgr/babel-plugin-svg-em-dimensions@npm:6.5.1"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: af6508c042a7d256081c09520e79e2d3278ecf361a74707dcc1bc61713845ec7fd6eeb52bbc3a2e114ecbbb1df49b16674caf8b97345570a6c5f0a631118cb5e
+  checksum: c1550ee9f548526fa66fd171e3ffb5696bfc4e4cd108a631d39db492c7410dc10bba4eb5a190e9df824bf806130ccc586ae7d2e43c547e6a4f93bbb29a18f344
   languageName: node
   linkType: hard
 
-"@svgr/babel-plugin-transform-react-native-svg@npm:^6.5.0":
-  version: 6.5.0
-  resolution: "@svgr/babel-plugin-transform-react-native-svg@npm:6.5.0"
+"@svgr/babel-plugin-transform-react-native-svg@npm:^6.5.1":
+  version: 6.5.1
+  resolution: "@svgr/babel-plugin-transform-react-native-svg@npm:6.5.1"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 0e7f1d85a25ef0c49b2bfacdc9ae80520959a0925304e030edc739684c75d41a7d4173ac4a1cd6ec8dee8bc618e7465da49ae59dd5638b87e75dccee05498f4c
+  checksum: 4c924af22b948b812629e80efb90ad1ec8faae26a232d8ca8a06b46b53e966a2c415a57806a3ff0ea806a622612e546422719b69ec6839717a7755dac19171d9
   languageName: node
   linkType: hard
 
-"@svgr/babel-plugin-transform-svg-component@npm:^6.5.0":
-  version: 6.5.0
-  resolution: "@svgr/babel-plugin-transform-svg-component@npm:6.5.0"
+"@svgr/babel-plugin-transform-svg-component@npm:^6.5.1":
+  version: 6.5.1
+  resolution: "@svgr/babel-plugin-transform-svg-component@npm:6.5.1"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 8613ef673b7e881d661057188729419b9a9d0b3802247954283293698a9910d76414b4fe106b5255e06fb2329c41f9da147ac5e153149b3b82024e06ab87a2b3
+  checksum: e496bb5ee871feb6bcab250b6e067322da7dd5c9c2b530b41e5586fe090f86611339b49d0a909c334d9b24cbca0fa755c949a2526c6ad03c6b5885666874cf5f
   languageName: node
   linkType: hard
 
-"@svgr/babel-preset@npm:^6.5.0":
-  version: 6.5.0
-  resolution: "@svgr/babel-preset@npm:6.5.0"
+"@svgr/babel-preset@npm:^6.5.1":
+  version: 6.5.1
+  resolution: "@svgr/babel-preset@npm:6.5.1"
   dependencies:
-    "@svgr/babel-plugin-add-jsx-attribute": ^6.5.0
-    "@svgr/babel-plugin-remove-jsx-attribute": ^6.5.0
-    "@svgr/babel-plugin-remove-jsx-empty-expression": ^6.5.0
-    "@svgr/babel-plugin-replace-jsx-attribute-value": ^6.5.0
-    "@svgr/babel-plugin-svg-dynamic-title": ^6.5.0
-    "@svgr/babel-plugin-svg-em-dimensions": ^6.5.0
-    "@svgr/babel-plugin-transform-react-native-svg": ^6.5.0
-    "@svgr/babel-plugin-transform-svg-component": ^6.5.0
+    "@svgr/babel-plugin-add-jsx-attribute": ^6.5.1
+    "@svgr/babel-plugin-remove-jsx-attribute": "*"
+    "@svgr/babel-plugin-remove-jsx-empty-expression": "*"
+    "@svgr/babel-plugin-replace-jsx-attribute-value": ^6.5.1
+    "@svgr/babel-plugin-svg-dynamic-title": ^6.5.1
+    "@svgr/babel-plugin-svg-em-dimensions": ^6.5.1
+    "@svgr/babel-plugin-transform-react-native-svg": ^6.5.1
+    "@svgr/babel-plugin-transform-svg-component": ^6.5.1
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 987f6eafebc347b061bfab7d15f87b48601eecdf7cde9ff0e4e99c44acad3bb126e554996b0c48f1ccf24d5e6785226b1662850bb4e2182927b2ded24f226ae8
+  checksum: 9f124be39a8e64f909162f925b3a63ddaa5a342a5e24fc0b7f7d9d4d7f7e3b916596c754fb557dc259928399cad5366a27cb231627a0d2dcc4b13ac521cf05af
   languageName: node
   linkType: hard
 
-"@svgr/core@npm:6.5.x, @svgr/core@npm:^6.5.0":
-  version: 6.5.0
-  resolution: "@svgr/core@npm:6.5.0"
+"@svgr/core@npm:6.5.x, @svgr/core@npm:^6.5.1":
+  version: 6.5.1
+  resolution: "@svgr/core@npm:6.5.1"
   dependencies:
-    "@babel/core": ^7.18.5
-    "@svgr/babel-preset": ^6.5.0
-    "@svgr/plugin-jsx": ^6.5.0
+    "@babel/core": ^7.19.6
+    "@svgr/babel-preset": ^6.5.1
+    "@svgr/plugin-jsx": ^6.5.1
     camelcase: ^6.2.0
     cosmiconfig: ^7.0.1
-  checksum: 235747a1d1c0e8918aa16da7e44c9dd2024a9ebaadc6bdff00001756d604566437b25e42d61e521f6f38a32c386d44a18dee57a77a92aedef1116f2410b504e6
+  checksum: fd6d6d5da5aeb956703310480b626c1fb3e3973ad9fe8025efc1dcf3d895f857b70d100c63cf32cebb20eb83c9607bafa464c9436e18fe6fe4fafdc73ed6b1a5
   languageName: node
   linkType: hard
 
-"@svgr/hast-util-to-babel-ast@npm:^6.5.0":
-  version: 6.5.0
-  resolution: "@svgr/hast-util-to-babel-ast@npm:6.5.0"
+"@svgr/hast-util-to-babel-ast@npm:^6.5.1":
+  version: 6.5.1
+  resolution: "@svgr/hast-util-to-babel-ast@npm:6.5.1"
   dependencies:
-    "@babel/types": ^7.18.4
-    entities: ^4.3.0
-  checksum: 77dcadb467eded0ce5cba71dbd4cbb4c7ffd7961f351828a4066ab6105d466d55533506bc3bc7db78f938af6692008ceda9fa2ea3dda75fd54e2b736b81ae458
+    "@babel/types": ^7.20.0
+    entities: ^4.4.0
+  checksum: 37923cce1b3f4e2039077b0c570b6edbabe37d1cf1a6ee35e71e0fe00f9cffac450eec45e9720b1010418131a999cb0047331ba1b6d1d2c69af1b92ac785aacf
   languageName: node
   linkType: hard
 
-"@svgr/plugin-jsx@npm:6.5.x, @svgr/plugin-jsx@npm:^6.5.0":
-  version: 6.5.0
-  resolution: "@svgr/plugin-jsx@npm:6.5.0"
+"@svgr/plugin-jsx@npm:6.5.x, @svgr/plugin-jsx@npm:^6.5.1":
+  version: 6.5.1
+  resolution: "@svgr/plugin-jsx@npm:6.5.1"
   dependencies:
-    "@babel/core": ^7.18.5
-    "@svgr/babel-preset": ^6.5.0
-    "@svgr/hast-util-to-babel-ast": ^6.5.0
+    "@babel/core": ^7.19.6
+    "@svgr/babel-preset": ^6.5.1
+    "@svgr/hast-util-to-babel-ast": ^6.5.1
     svg-parser: ^2.0.4
   peerDependencies:
     "@svgr/core": ^6.0.0
-  checksum: dec7cd47f16cc1b23dd37e333594d596401e7e49825545f4d808c74fe0a3a12a56c1bd55f507794addd6675e1b81dd58346bac4f752daa04016d3edac03e1625
+  checksum: 42f22847a6bdf930514d7bedd3c5e1fd8d53eb3594779f9db16cb94c762425907c375cd8ec789114e100a4d38068aca6c7ab5efea4c612fba63f0630c44cc859
   languageName: node
   linkType: hard
 
-"@svgr/plugin-svgo@npm:6.5.x, @svgr/plugin-svgo@npm:^6.5.0":
-  version: 6.5.0
-  resolution: "@svgr/plugin-svgo@npm:6.5.0"
+"@svgr/plugin-svgo@npm:6.5.x, @svgr/plugin-svgo@npm:^6.5.1":
+  version: 6.5.1
+  resolution: "@svgr/plugin-svgo@npm:6.5.1"
   dependencies:
     cosmiconfig: ^7.0.1
     deepmerge: ^4.2.2
     svgo: ^2.8.0
   peerDependencies:
-    "@svgr/core": ^6.0.0
-  checksum: d1a0ee79283a997aa4af2c2848f502dff71a9fd99623b47b0b2476effd7fe53077456afd1ff54283512a7dd10f30df91736f5d20eb931a462b34f281c90347e0
+    "@svgr/core": "*"
+  checksum: cd2833530ac0485221adc2146fd992ab20d79f4b12eebcd45fa859721dd779483158e11dfd9a534858fe468416b9412416e25cbe07ac7932c44ed5fa2021c72e
   languageName: node
   linkType: hard
 
 "@svgr/rollup@npm:6.5.x":
-  version: 6.5.0
-  resolution: "@svgr/rollup@npm:6.5.0"
+  version: 6.5.1
+  resolution: "@svgr/rollup@npm:6.5.1"
   dependencies:
-    "@babel/core": ^7.18.5
-    "@babel/plugin-transform-react-constant-elements": ^7.17.12
-    "@babel/preset-env": ^7.18.2
-    "@babel/preset-react": ^7.17.12
-    "@babel/preset-typescript": ^7.17.12
+    "@babel/core": ^7.19.6
+    "@babel/plugin-transform-react-constant-elements": ^7.18.12
+    "@babel/preset-env": ^7.19.4
+    "@babel/preset-react": ^7.18.6
+    "@babel/preset-typescript": ^7.18.6
     "@rollup/pluginutils": ^4.2.1
-    "@svgr/core": ^6.5.0
-    "@svgr/plugin-jsx": ^6.5.0
-    "@svgr/plugin-svgo": ^6.5.0
-  checksum: a3a043034689a335aa9657580251a8636225002439a4667c31fe2b0faa043980182b28aac7da0219804609ef19c0b3b397626850f056a7065c20f61c2f17b4f8
+    "@svgr/core": ^6.5.1
+    "@svgr/plugin-jsx": ^6.5.1
+    "@svgr/plugin-svgo": ^6.5.1
+  checksum: 809198a655c280b434d762829aeab0c48e545daaa7a520ac87d5e7cfe96402eb4d0c01f8b25959fcc37a2ce4aa1a53c9e1c4ccb1206cd5833883a34db5799dd4
   languageName: node
   linkType: hard
 
 "@svgr/webpack@npm:6.5.x":
-  version: 6.5.0
-  resolution: "@svgr/webpack@npm:6.5.0"
+  version: 6.5.1
+  resolution: "@svgr/webpack@npm:6.5.1"
   dependencies:
-    "@babel/core": ^7.18.5
-    "@babel/plugin-transform-react-constant-elements": ^7.17.12
-    "@babel/preset-env": ^7.18.2
-    "@babel/preset-react": ^7.17.12
-    "@babel/preset-typescript": ^7.17.12
-    "@svgr/core": ^6.5.0
-    "@svgr/plugin-jsx": ^6.5.0
-    "@svgr/plugin-svgo": ^6.5.0
-  checksum: 2c0b18b20694b1301e86893e488269882ae136259cc17b4ab47c208c6edcdfeaefa23894b3fe68d36384e26380eafde23571b0cb143aadf538c027d72eb1d702
+    "@babel/core": ^7.19.6
+    "@babel/plugin-transform-react-constant-elements": ^7.18.12
+    "@babel/preset-env": ^7.19.4
+    "@babel/preset-react": ^7.18.6
+    "@babel/preset-typescript": ^7.18.6
+    "@svgr/core": ^6.5.1
+    "@svgr/plugin-jsx": ^6.5.1
+    "@svgr/plugin-svgo": ^6.5.1
+  checksum: d10582eb4fa82a5b6d314cb49f2c640af4fd3a60f5b76095d2b14e383ef6a43a6f4674b68774a21787dbde69dec0a251cfcfc3f9a96c82754ba5d5c6daf785f0
   languageName: node
   linkType: hard
 
-"@swagger-api/apidom-ast@npm:^0.70.0":
-  version: 0.70.0
-  resolution: "@swagger-api/apidom-ast@npm:0.70.0"
+"@swagger-api/apidom-ast@npm:^0.74.1":
+  version: 0.74.1
+  resolution: "@swagger-api/apidom-ast@npm:0.74.1"
   dependencies:
     "@babel/runtime-corejs3": ^7.20.7
-    "@types/ramda": ~0.29.1
+    "@types/ramda": ~0.29.3
     ramda: ~0.29.0
     ramda-adjunct: ^4.0.0
     stampit: ^4.3.2
-    unraw: ^2.0.1
-  checksum: f1dfd5eae236ee42880dd474943d4a6deb04c7c1bd72f7bc7c30b8d348455b8cbd1c56a07d4417714b5221d3473469a1edcfcab869838987cc91332157561fd3
+    unraw: ^3.0.0
+  checksum: 453880bafb11c9c53768629bf0c9c3cfdab76625dbd4eb34ec146c23eb782dace3c279ca4cff665ac20f3fae229ba96bff2bdbacba383630107f23522183f130
   languageName: node
   linkType: hard
 
-"@swagger-api/apidom-core@npm:>=0.70.0 <1.0.0, @swagger-api/apidom-core@npm:^0.70.0":
-  version: 0.70.0
-  resolution: "@swagger-api/apidom-core@npm:0.70.0"
+"@swagger-api/apidom-core@npm:>=0.74.1 <1.0.0, @swagger-api/apidom-core@npm:^0.74.1":
+  version: 0.74.1
+  resolution: "@swagger-api/apidom-core@npm:0.74.1"
   dependencies:
     "@babel/runtime-corejs3": ^7.20.7
-    "@swagger-api/apidom-ast": ^0.70.0
-    "@types/ramda": ~0.29.1
+    "@swagger-api/apidom-ast": ^0.74.1
+    "@types/ramda": ~0.29.3
     minim: ~0.23.8
     ramda: ~0.29.0
     ramda-adjunct: ^4.0.0
     short-unique-id: ^4.4.4
     stampit: ^4.3.2
-  checksum: 1db75c4e62ecaef9e788919c808dbd6f1c38781e4529639e4b10a2a8325677c335f4f1f650b9e581a6736dbccb6c0035c664145d6f6a39e954f8eb699d51553a
+  checksum: 8369c45198a2d955dd84a55564f89411394df388c2cf277208fbfcaf3014ae596f4de9916b55d918683b13fc18f0c54a0e190bf34206cf4c16c10a1a7e50ab07
   languageName: node
   linkType: hard
 
-"@swagger-api/apidom-json-pointer@npm:>=0.70.0 <1.0.0, @swagger-api/apidom-json-pointer@npm:^0.70.0":
-  version: 0.70.0
-  resolution: "@swagger-api/apidom-json-pointer@npm:0.70.0"
+"@swagger-api/apidom-json-pointer@npm:>=0.74.1 <1.0.0, @swagger-api/apidom-json-pointer@npm:^0.74.1":
+  version: 0.74.1
+  resolution: "@swagger-api/apidom-json-pointer@npm:0.74.1"
   dependencies:
     "@babel/runtime-corejs3": ^7.20.7
-    "@swagger-api/apidom-core": ^0.70.0
-    "@types/ramda": ~0.29.1
+    "@swagger-api/apidom-core": ^0.74.1
+    "@types/ramda": ~0.29.3
     ramda: ~0.29.0
     ramda-adjunct: ^4.0.0
-  checksum: dfa3b49e454d78d7ec5281c59537bfc2e99ba9b5fa1875cd5d600c2499298742c6a9e41e415937c2de99661f6cd27b7dc5b9900b75dc042e96e506266f409860
+  checksum: 2adbbb735cd559b975fa58d11b7d99844eb5eb48282842cb6048e61742229198519cfbcf90f48c38cfbbad089b9d71a258c9aeb92c3fbec8abe392756e4816f0
   languageName: node
   linkType: hard
 
-"@swagger-api/apidom-ns-api-design-systems@npm:^0.70.0":
-  version: 0.70.0
-  resolution: "@swagger-api/apidom-ns-api-design-systems@npm:0.70.0"
+"@swagger-api/apidom-ns-api-design-systems@npm:^0.74.1":
+  version: 0.74.1
+  resolution: "@swagger-api/apidom-ns-api-design-systems@npm:0.74.1"
   dependencies:
     "@babel/runtime-corejs3": ^7.20.7
-    "@swagger-api/apidom-core": ^0.70.0
-    "@swagger-api/apidom-ns-openapi-3-1": ^0.70.0
-    "@types/ramda": ~0.29.1
+    "@swagger-api/apidom-core": ^0.74.1
+    "@swagger-api/apidom-ns-openapi-3-1": ^0.74.1
+    "@types/ramda": ~0.29.3
     ramda: ~0.29.0
     ramda-adjunct: ^4.0.0
     stampit: ^4.3.2
-  checksum: 8b08d5d99a0ff6497a5e3e093daaa9e47d79c2c216ce5397992348438b8ab4a53b789b31caf11a71855496bdb379c5d159cbc3c05e269ba97a086f3fddaa390c
+  checksum: 83bb664015243a9fb342d81f1700f7dde12015a3c34c45ac0575fc79388eeec99dd97f6139207437b883b0e3c261916ebb931571c1c0e0240f84ea7fd57d8c93
   languageName: node
   linkType: hard
 
-"@swagger-api/apidom-ns-asyncapi-2@npm:^0.70.0":
-  version: 0.70.0
-  resolution: "@swagger-api/apidom-ns-asyncapi-2@npm:0.70.0"
+"@swagger-api/apidom-ns-asyncapi-2@npm:^0.74.1":
+  version: 0.74.1
+  resolution: "@swagger-api/apidom-ns-asyncapi-2@npm:0.74.1"
   dependencies:
     "@babel/runtime-corejs3": ^7.20.7
-    "@swagger-api/apidom-core": ^0.70.0
-    "@swagger-api/apidom-ns-json-schema-draft-7": ^0.70.0
-    "@types/ramda": ~0.29.1
+    "@swagger-api/apidom-core": ^0.74.1
+    "@swagger-api/apidom-ns-json-schema-draft-7": ^0.74.1
+    "@types/ramda": ~0.29.3
     ramda: ~0.29.0
     ramda-adjunct: ^4.0.0
     stampit: ^4.3.2
-  checksum: d2d38354132b7894427222b5dbc924c9a36966795710cede1010496b2a3649362c110b57730e8ebea93a662d442fe29c2adc174e27b91f9056189604c2953e8b
+  checksum: 8577a17410f4bcc9d1a921f6e567c611b71316a6aba4bc3e06a11316b915d053a589693d44350ded7de67f8f6c58b4b0075cabee88a2603ce9790e54be2a1946
   languageName: node
   linkType: hard
 
-"@swagger-api/apidom-ns-json-schema-draft-4@npm:^0.70.0":
-  version: 0.70.0
-  resolution: "@swagger-api/apidom-ns-json-schema-draft-4@npm:0.70.0"
+"@swagger-api/apidom-ns-json-schema-draft-4@npm:^0.74.1":
+  version: 0.74.1
+  resolution: "@swagger-api/apidom-ns-json-schema-draft-4@npm:0.74.1"
   dependencies:
     "@babel/runtime-corejs3": ^7.20.7
-    "@swagger-api/apidom-core": ^0.70.0
-    "@types/ramda": ~0.29.1
+    "@swagger-api/apidom-ast": ^0.74.1
+    "@swagger-api/apidom-core": ^0.74.1
+    "@types/ramda": ~0.29.3
     ramda: ~0.29.0
     ramda-adjunct: ^4.0.0
     stampit: ^4.3.2
-  checksum: b7289bba4712ea601f6874d052172218b853a14868b603414018860a203bdcd7b12944920e790db04720d7b6117d0a8859d583e6f0ec66bf525475b91ac5691c
+  checksum: 1d07a05dee36b1fdb238f57a22b620814fcaae21bbf46b83296048a1806a4be66901bc5aefbc42e4928d058a5df9203f9ad3fdf3f57476b6b61bb985f82bd99b
   languageName: node
   linkType: hard
 
-"@swagger-api/apidom-ns-json-schema-draft-6@npm:^0.70.0":
-  version: 0.70.0
-  resolution: "@swagger-api/apidom-ns-json-schema-draft-6@npm:0.70.0"
+"@swagger-api/apidom-ns-json-schema-draft-6@npm:^0.74.1":
+  version: 0.74.1
+  resolution: "@swagger-api/apidom-ns-json-schema-draft-6@npm:0.74.1"
   dependencies:
     "@babel/runtime-corejs3": ^7.20.7
-    "@swagger-api/apidom-core": ^0.70.0
-    "@swagger-api/apidom-ns-json-schema-draft-4": ^0.70.0
-    "@types/ramda": ~0.29.1
+    "@swagger-api/apidom-core": ^0.74.1
+    "@swagger-api/apidom-ns-json-schema-draft-4": ^0.74.1
+    "@types/ramda": ~0.29.3
     ramda: ~0.29.0
     ramda-adjunct: ^4.0.0
     stampit: ^4.3.2
-  checksum: 1368fe2906aca8766265f95f8847b7f49b17ecd973ef8126ad7f24636f76cec8a2961cdac846548dbccef8202a94354b8ce5358e3b76dedc625bb23b63169fd0
+  checksum: d2460a3afaebfbb304aa610e4dd5dc5fdab4325dd9ce14d393b13bb7399e3b37f4bde837266ba9876c973b6dfc5eb179c27346c2941ad2fe77923b743b3a4ebc
   languageName: node
   linkType: hard
 
-"@swagger-api/apidom-ns-json-schema-draft-7@npm:^0.70.0":
-  version: 0.70.0
-  resolution: "@swagger-api/apidom-ns-json-schema-draft-7@npm:0.70.0"
+"@swagger-api/apidom-ns-json-schema-draft-7@npm:^0.74.1":
+  version: 0.74.1
+  resolution: "@swagger-api/apidom-ns-json-schema-draft-7@npm:0.74.1"
   dependencies:
     "@babel/runtime-corejs3": ^7.20.7
-    "@swagger-api/apidom-core": ^0.70.0
-    "@swagger-api/apidom-ns-json-schema-draft-6": ^0.70.0
-    "@types/ramda": ~0.29.1
+    "@swagger-api/apidom-core": ^0.74.1
+    "@swagger-api/apidom-ns-json-schema-draft-6": ^0.74.1
+    "@types/ramda": ~0.29.3
     ramda: ~0.29.0
     ramda-adjunct: ^4.0.0
     stampit: ^4.3.2
-  checksum: 0c54517aad52db2661dc083fc9593f15f57bc99f36ed601c5a1162b71010397c8d6065650959a7fb72ec4b5a06f052140c642d126e01a2061dd0d08972c68af4
+  checksum: cefc04786f2ce5640397e84141ab02e921d578ae5ebd9b3d06d8ad405f1ebc8589f2069f4c57cbdf5e8b911cb6a39fd248bfb7567a66968fe62542f6f64e52eb
   languageName: node
   linkType: hard
 
-"@swagger-api/apidom-ns-openapi-3-0@npm:^0.70.0":
-  version: 0.70.0
-  resolution: "@swagger-api/apidom-ns-openapi-3-0@npm:0.70.0"
+"@swagger-api/apidom-ns-openapi-3-0@npm:^0.74.1":
+  version: 0.74.1
+  resolution: "@swagger-api/apidom-ns-openapi-3-0@npm:0.74.1"
   dependencies:
     "@babel/runtime-corejs3": ^7.20.7
-    "@swagger-api/apidom-core": ^0.70.0
-    "@swagger-api/apidom-ns-json-schema-draft-4": ^0.70.0
-    "@types/ramda": ~0.29.1
+    "@swagger-api/apidom-core": ^0.74.1
+    "@swagger-api/apidom-ns-json-schema-draft-4": ^0.74.1
+    "@types/ramda": ~0.29.3
     ramda: ~0.29.0
     ramda-adjunct: ^4.0.0
     stampit: ^4.3.2
-  checksum: 89140a077fc90612f0bd89106d9828e65ac9637d303d142388ac566e7d5b1496be0480257a268bdc3005ab603eb7af40a3368cd6c6bbb824fba112c665b1f58c
+  checksum: 4c482714ce82287493d54cd454633bb044ca02659f3080084f34fc93f2f6f162cc5809499ced20a4db33092d30396d22fc80c63db080320306216a84077e26f5
   languageName: node
   linkType: hard
 
-"@swagger-api/apidom-ns-openapi-3-1@npm:>=0.70.0 <1.0.0, @swagger-api/apidom-ns-openapi-3-1@npm:^0.70.0":
-  version: 0.70.0
-  resolution: "@swagger-api/apidom-ns-openapi-3-1@npm:0.70.0"
+"@swagger-api/apidom-ns-openapi-3-1@npm:>=0.74.1 <1.0.0, @swagger-api/apidom-ns-openapi-3-1@npm:^0.74.1":
+  version: 0.74.1
+  resolution: "@swagger-api/apidom-ns-openapi-3-1@npm:0.74.1"
   dependencies:
     "@babel/runtime-corejs3": ^7.20.7
-    "@swagger-api/apidom-core": ^0.70.0
-    "@swagger-api/apidom-ns-openapi-3-0": ^0.70.0
-    "@types/ramda": ~0.29.1
+    "@swagger-api/apidom-ast": ^0.74.1
+    "@swagger-api/apidom-core": ^0.74.1
+    "@swagger-api/apidom-ns-openapi-3-0": ^0.74.1
+    "@types/ramda": ~0.29.3
     ramda: ~0.29.0
     ramda-adjunct: ^4.0.0
     stampit: ^4.3.2
-  checksum: e4fd4a24fc92f753e435ef179899d27732f10065cb5c2a89b66149778bd3fa6132c2456da04a14d5441bcf4b1bb41ed86233ac981a6ae5e9f79094ca19f1598c
+  checksum: 1de6568ad876481ab83cec6755854314511d45bfd67f5b65f2fc44238e4bd7269f688d1931b31d939fdddfa2b29ba3442e3fe778736a777462fc517a54b8c0d9
   languageName: node
   linkType: hard
 
-"@swagger-api/apidom-parser-adapter-api-design-systems-json@npm:^0.70.0":
-  version: 0.70.0
-  resolution: "@swagger-api/apidom-parser-adapter-api-design-systems-json@npm:0.70.0"
+"@swagger-api/apidom-parser-adapter-api-design-systems-json@npm:^0.74.1":
+  version: 0.74.1
+  resolution: "@swagger-api/apidom-parser-adapter-api-design-systems-json@npm:0.74.1"
   dependencies:
     "@babel/runtime-corejs3": ^7.20.7
-    "@swagger-api/apidom-core": ^0.70.0
-    "@swagger-api/apidom-ns-api-design-systems": ^0.70.0
-    "@swagger-api/apidom-parser-adapter-json": ^0.70.0
-    "@types/ramda": ~0.29.1
+    "@swagger-api/apidom-core": ^0.74.1
+    "@swagger-api/apidom-ns-api-design-systems": ^0.74.1
+    "@swagger-api/apidom-parser-adapter-json": ^0.74.1
+    "@types/ramda": ~0.29.3
     ramda: ~0.29.0
     ramda-adjunct: ^4.0.0
-  checksum: 3bcaefa2f890f5f0783ccaff3c88da0c9eeff549182a34d74dcc4e91a14c0a36f11eafd7950141d9525295856ea68f44dded7b7d758114a9a9fa66e3f6d86984
+  checksum: 223720aac5979da9ccd931cebddfa6be944c5ba269ddddde4c5a9bec24627f0cc3655d83ea54b60bc093603c2d5fb169a451d356e5dafe49be66b150c6542a8b
   languageName: node
   linkType: hard
 
-"@swagger-api/apidom-parser-adapter-api-design-systems-yaml@npm:^0.70.0":
-  version: 0.70.0
-  resolution: "@swagger-api/apidom-parser-adapter-api-design-systems-yaml@npm:0.70.0"
+"@swagger-api/apidom-parser-adapter-api-design-systems-yaml@npm:^0.74.1":
+  version: 0.74.1
+  resolution: "@swagger-api/apidom-parser-adapter-api-design-systems-yaml@npm:0.74.1"
   dependencies:
     "@babel/runtime-corejs3": ^7.20.7
-    "@swagger-api/apidom-core": ^0.70.0
-    "@swagger-api/apidom-ns-api-design-systems": ^0.70.0
-    "@swagger-api/apidom-parser-adapter-yaml-1-2": ^0.70.0
-    "@types/ramda": ~0.29.1
+    "@swagger-api/apidom-core": ^0.74.1
+    "@swagger-api/apidom-ns-api-design-systems": ^0.74.1
+    "@swagger-api/apidom-parser-adapter-yaml-1-2": ^0.74.1
+    "@types/ramda": ~0.29.3
     ramda: ~0.29.0
     ramda-adjunct: ^4.0.0
-  checksum: c4b06f70be760f7e840d20032a582abe55a9d06ba810ab2b5d0f71bdfd39c46fe1ac2691155731821fbc7ffd1c2fa135331151c5bfdaa73850ab2fe352c00f13
+  checksum: 0072ec50f650c8e8758e87deafffd86805bb858edcb83301739301a4e8f24e6a563311b65e261573c1858f1e7772cd3a6f9a78102ade9da225f9079ebbe5fdb5
   languageName: node
   linkType: hard
 
-"@swagger-api/apidom-parser-adapter-asyncapi-json-2@npm:^0.70.0":
-  version: 0.70.0
-  resolution: "@swagger-api/apidom-parser-adapter-asyncapi-json-2@npm:0.70.0"
+"@swagger-api/apidom-parser-adapter-asyncapi-json-2@npm:^0.74.1":
+  version: 0.74.1
+  resolution: "@swagger-api/apidom-parser-adapter-asyncapi-json-2@npm:0.74.1"
   dependencies:
     "@babel/runtime-corejs3": ^7.20.7
-    "@swagger-api/apidom-core": ^0.70.0
-    "@swagger-api/apidom-ns-asyncapi-2": ^0.70.0
-    "@swagger-api/apidom-parser-adapter-json": ^0.70.0
-    "@types/ramda": ~0.29.1
+    "@swagger-api/apidom-core": ^0.74.1
+    "@swagger-api/apidom-ns-asyncapi-2": ^0.74.1
+    "@swagger-api/apidom-parser-adapter-json": ^0.74.1
+    "@types/ramda": ~0.29.3
     ramda: ~0.29.0
     ramda-adjunct: ^4.0.0
-  checksum: 06c1c3bc9d29644476b082652021e1d81b448a516a826e867c13b55b229b503d618ad2cc63bfb9a544656e1b098197e1cda89025a6c0f63c3617ffc04bc51c40
+  checksum: 0ba020d883cd305fd11dde0d25714bf2b59ba7772a67b743ae15b5efd204b48be8654c2f3fd10879cb84550aa53bba0ab0186ddd3de6c590f7da5a620f416c1a
   languageName: node
   linkType: hard
 
-"@swagger-api/apidom-parser-adapter-asyncapi-yaml-2@npm:^0.70.0":
-  version: 0.70.0
-  resolution: "@swagger-api/apidom-parser-adapter-asyncapi-yaml-2@npm:0.70.0"
+"@swagger-api/apidom-parser-adapter-asyncapi-yaml-2@npm:^0.74.1":
+  version: 0.74.1
+  resolution: "@swagger-api/apidom-parser-adapter-asyncapi-yaml-2@npm:0.74.1"
   dependencies:
     "@babel/runtime-corejs3": ^7.20.7
-    "@swagger-api/apidom-core": ^0.70.0
-    "@swagger-api/apidom-ns-asyncapi-2": ^0.70.0
-    "@swagger-api/apidom-parser-adapter-yaml-1-2": ^0.70.0
-    "@types/ramda": ~0.29.1
+    "@swagger-api/apidom-core": ^0.74.1
+    "@swagger-api/apidom-ns-asyncapi-2": ^0.74.1
+    "@swagger-api/apidom-parser-adapter-yaml-1-2": ^0.74.1
+    "@types/ramda": ~0.29.3
     ramda: ~0.29.0
     ramda-adjunct: ^4.0.0
-  checksum: ec71cdbc0701d62b6a15c6ab9278dfc1bf1e40ef4cbf22acc0a9fb9c3b624a8b80fe0670f61e6729989c4a2e5ca5a65c03cb9cee318494eb0f1eaa6b84ce3fbe
+  checksum: b446ffa2ce7189df644259dbbc9bcfef39e8327fb2c47febff0abea58889069f45a47143dfc5b846c90ca9258e64d277f436b1166bdfe67c22c935170301e22c
   languageName: node
   linkType: hard
 
-"@swagger-api/apidom-parser-adapter-json@npm:^0.70.0":
-  version: 0.70.0
-  resolution: "@swagger-api/apidom-parser-adapter-json@npm:0.70.0"
+"@swagger-api/apidom-parser-adapter-json@npm:^0.74.1":
+  version: 0.74.1
+  resolution: "@swagger-api/apidom-parser-adapter-json@npm:0.74.1"
   dependencies:
     "@babel/runtime-corejs3": ^7.20.7
-    "@swagger-api/apidom-ast": ^0.70.0
-    "@swagger-api/apidom-core": ^0.70.0
-    "@types/ramda": ~0.29.1
+    "@swagger-api/apidom-ast": ^0.74.1
+    "@swagger-api/apidom-core": ^0.74.1
+    "@types/ramda": ~0.29.3
     node-gyp: latest
     ramda: ~0.29.0
     ramda-adjunct: ^4.0.0
     stampit: ^4.3.2
-    tree-sitter: =0.20.1
+    tree-sitter: =0.20.4
     tree-sitter-json: =0.20.0
-    web-tree-sitter: =0.20.7
-  checksum: ca256e274eeded6c64985d8b3c12ebeb94849440b58513b4e0fb20a66a1b51961b76b343f3e71b2e0e9f91fedf1c62542f52a3fa9674b62b86fdd5584f18f254
+    web-tree-sitter: =0.20.3
+  checksum: d80a2f9880a73b6cf6dec91bdb119eb52d57d4bce5431e4b344c734878ebec91e3350f9220b7f7eca2987ae955f236c92884f617b50631ddf97477d4bef4ab5b
   languageName: node
   linkType: hard
 
-"@swagger-api/apidom-parser-adapter-openapi-json-3-0@npm:^0.70.0":
-  version: 0.70.0
-  resolution: "@swagger-api/apidom-parser-adapter-openapi-json-3-0@npm:0.70.0"
+"@swagger-api/apidom-parser-adapter-openapi-json-3-0@npm:^0.74.1":
+  version: 0.74.1
+  resolution: "@swagger-api/apidom-parser-adapter-openapi-json-3-0@npm:0.74.1"
   dependencies:
     "@babel/runtime-corejs3": ^7.20.7
-    "@swagger-api/apidom-core": ^0.70.0
-    "@swagger-api/apidom-ns-openapi-3-0": ^0.70.0
-    "@swagger-api/apidom-parser-adapter-json": ^0.70.0
-    "@types/ramda": ~0.29.1
+    "@swagger-api/apidom-core": ^0.74.1
+    "@swagger-api/apidom-ns-openapi-3-0": ^0.74.1
+    "@swagger-api/apidom-parser-adapter-json": ^0.74.1
+    "@types/ramda": ~0.29.3
     ramda: ~0.29.0
     ramda-adjunct: ^4.0.0
-  checksum: 6c97390eda94565545cee33d6f39b2131c3ffd7331a37b5a5164bd6417bc2bcf5e52345d335c025ea3cbcb8d76b6c5f95cb49520291f9c54fd6c3e4b979307ec
+  checksum: 223e6f8589b792b47a7c21006cdfe08f4472c3e085fdc66a99528a479a46fedef536e6f27e89b75bd8f3cd983749eabaabcba60700599dad8c041ba1417600a8
   languageName: node
   linkType: hard
 
-"@swagger-api/apidom-parser-adapter-openapi-json-3-1@npm:^0.70.0":
-  version: 0.70.0
-  resolution: "@swagger-api/apidom-parser-adapter-openapi-json-3-1@npm:0.70.0"
+"@swagger-api/apidom-parser-adapter-openapi-json-3-1@npm:^0.74.1":
+  version: 0.74.1
+  resolution: "@swagger-api/apidom-parser-adapter-openapi-json-3-1@npm:0.74.1"
   dependencies:
     "@babel/runtime-corejs3": ^7.20.7
-    "@swagger-api/apidom-core": ^0.70.0
-    "@swagger-api/apidom-ns-openapi-3-1": ^0.70.0
-    "@swagger-api/apidom-parser-adapter-json": ^0.70.0
-    "@types/ramda": ~0.29.1
+    "@swagger-api/apidom-core": ^0.74.1
+    "@swagger-api/apidom-ns-openapi-3-1": ^0.74.1
+    "@swagger-api/apidom-parser-adapter-json": ^0.74.1
+    "@types/ramda": ~0.29.3
     ramda: ~0.29.0
     ramda-adjunct: ^4.0.0
-  checksum: b3051e10683fa89c34f4cb415f01b16c0dbc9fb1d855bcb5d0737b2a46f7b3b4f9799597c69a4fec8b547bfb2802348f38675c658d35fee4b3016ea6e73c2b95
+  checksum: defdbd6e641317bd0d6508b4f92dca0216e041a6672fc48c998aef53c08aeb89591954d6a348ead1be728b9cefcc9e9e786bcba3aa7bc2659cce7e47e08b31a0
   languageName: node
   linkType: hard
 
-"@swagger-api/apidom-parser-adapter-openapi-yaml-3-0@npm:^0.70.0":
-  version: 0.70.0
-  resolution: "@swagger-api/apidom-parser-adapter-openapi-yaml-3-0@npm:0.70.0"
+"@swagger-api/apidom-parser-adapter-openapi-yaml-3-0@npm:^0.74.1":
+  version: 0.74.1
+  resolution: "@swagger-api/apidom-parser-adapter-openapi-yaml-3-0@npm:0.74.1"
   dependencies:
     "@babel/runtime-corejs3": ^7.20.7
-    "@swagger-api/apidom-core": ^0.70.0
-    "@swagger-api/apidom-ns-openapi-3-0": ^0.70.0
-    "@swagger-api/apidom-parser-adapter-yaml-1-2": ^0.70.0
-    "@types/ramda": ~0.29.1
+    "@swagger-api/apidom-core": ^0.74.1
+    "@swagger-api/apidom-ns-openapi-3-0": ^0.74.1
+    "@swagger-api/apidom-parser-adapter-yaml-1-2": ^0.74.1
+    "@types/ramda": ~0.29.3
     ramda: ~0.29.0
     ramda-adjunct: ^4.0.0
-  checksum: 1cd68a65e21eb1df397093d56ff39344cb6d1812b9c498f7142719efb5f2e7446e3288ea7f255b3c33cddec4b4ad75f04b1b9333e9816f492af5e9d96b771561
+  checksum: c63fcb9501f28a1a9c6815fc71a1a5200f49822fe101665bb5ffbe4fcb52f67e68c072f268a334d5495bac4cea261206add12d0deb08594cb934d897cd1cf604
   languageName: node
   linkType: hard
 
-"@swagger-api/apidom-parser-adapter-openapi-yaml-3-1@npm:^0.70.0":
-  version: 0.70.0
-  resolution: "@swagger-api/apidom-parser-adapter-openapi-yaml-3-1@npm:0.70.0"
+"@swagger-api/apidom-parser-adapter-openapi-yaml-3-1@npm:^0.74.1":
+  version: 0.74.1
+  resolution: "@swagger-api/apidom-parser-adapter-openapi-yaml-3-1@npm:0.74.1"
   dependencies:
     "@babel/runtime-corejs3": ^7.20.7
-    "@swagger-api/apidom-core": ^0.70.0
-    "@swagger-api/apidom-ns-openapi-3-1": ^0.70.0
-    "@swagger-api/apidom-parser-adapter-yaml-1-2": ^0.70.0
-    "@types/ramda": ~0.29.1
+    "@swagger-api/apidom-core": ^0.74.1
+    "@swagger-api/apidom-ns-openapi-3-1": ^0.74.1
+    "@swagger-api/apidom-parser-adapter-yaml-1-2": ^0.74.1
+    "@types/ramda": ~0.29.3
     ramda: ~0.29.0
     ramda-adjunct: ^4.0.0
-  checksum: 15ff89007ada9b38d88321aa4fddd5741d88095888e37bacb1feb31ecd1a112878e73027f3d158b9ba2a77279751dcf1a64dc8f8d56fb45c0f6c58196ef9c64a
+  checksum: 11893a6477013377bc60785f4e2769c5c7ddd403358c3ad2def037b75227d661cc26ec85d5a5dad9cae906696fe9091cdaab9a1d822c80c627f5cd99af1ed295
   languageName: node
   linkType: hard
 
-"@swagger-api/apidom-parser-adapter-yaml-1-2@npm:^0.70.0":
-  version: 0.70.0
-  resolution: "@swagger-api/apidom-parser-adapter-yaml-1-2@npm:0.70.0"
+"@swagger-api/apidom-parser-adapter-yaml-1-2@npm:^0.74.1":
+  version: 0.74.1
+  resolution: "@swagger-api/apidom-parser-adapter-yaml-1-2@npm:0.74.1"
   dependencies:
     "@babel/runtime-corejs3": ^7.20.7
-    "@swagger-api/apidom-ast": ^0.70.0
-    "@swagger-api/apidom-core": ^0.70.0
-    "@types/ramda": ~0.29.1
+    "@swagger-api/apidom-ast": ^0.74.1
+    "@swagger-api/apidom-core": ^0.74.1
+    "@types/ramda": ~0.29.3
     node-gyp: latest
     ramda: ~0.29.0
     ramda-adjunct: ^4.0.0
     stampit: ^4.3.2
-    tree-sitter: =0.20.1
+    tree-sitter: =0.20.4
     tree-sitter-yaml: =0.5.0
-    web-tree-sitter: =0.20.7
-  checksum: 9f63b3053d1853fb742847171bd1eb69163f665bcd080018c283bbd8355058eb96f5ed0b2216d3c9c934e14c9dcd5202f921d033d6d240d37edaade13c1008cd
+    web-tree-sitter: =0.20.3
+  checksum: 145a1f248f9de7a7f31593f7a9ad593c653948414e3fe70349d54b2301a7bb501765ccd595db318d00fcb5d9eafaa394e514fc68c4f69741096b750ad4f3affe
   languageName: node
   linkType: hard
 
-"@swagger-api/apidom-reference@npm:>=0.70.0 <1.0.0":
-  version: 0.70.0
-  resolution: "@swagger-api/apidom-reference@npm:0.70.0"
+"@swagger-api/apidom-reference@npm:>=0.74.1 <1.0.0":
+  version: 0.74.1
+  resolution: "@swagger-api/apidom-reference@npm:0.74.1"
   dependencies:
     "@babel/runtime-corejs3": ^7.20.7
-    "@swagger-api/apidom-core": ^0.70.0
-    "@swagger-api/apidom-json-pointer": ^0.70.0
-    "@swagger-api/apidom-ns-asyncapi-2": ^0.70.0
-    "@swagger-api/apidom-ns-openapi-3-0": ^0.70.0
-    "@swagger-api/apidom-ns-openapi-3-1": ^0.70.0
-    "@swagger-api/apidom-parser-adapter-api-design-systems-json": ^0.70.0
-    "@swagger-api/apidom-parser-adapter-api-design-systems-yaml": ^0.70.0
-    "@swagger-api/apidom-parser-adapter-asyncapi-json-2": ^0.70.0
-    "@swagger-api/apidom-parser-adapter-asyncapi-yaml-2": ^0.70.0
-    "@swagger-api/apidom-parser-adapter-json": ^0.70.0
-    "@swagger-api/apidom-parser-adapter-openapi-json-3-0": ^0.70.0
-    "@swagger-api/apidom-parser-adapter-openapi-json-3-1": ^0.70.0
-    "@swagger-api/apidom-parser-adapter-openapi-yaml-3-0": ^0.70.0
-    "@swagger-api/apidom-parser-adapter-openapi-yaml-3-1": ^0.70.0
-    "@swagger-api/apidom-parser-adapter-yaml-1-2": ^0.70.0
-    "@types/ramda": ~0.29.1
+    "@swagger-api/apidom-core": ^0.74.1
+    "@swagger-api/apidom-json-pointer": ^0.74.1
+    "@swagger-api/apidom-ns-asyncapi-2": ^0.74.1
+    "@swagger-api/apidom-ns-openapi-3-0": ^0.74.1
+    "@swagger-api/apidom-ns-openapi-3-1": ^0.74.1
+    "@swagger-api/apidom-parser-adapter-api-design-systems-json": ^0.74.1
+    "@swagger-api/apidom-parser-adapter-api-design-systems-yaml": ^0.74.1
+    "@swagger-api/apidom-parser-adapter-asyncapi-json-2": ^0.74.1
+    "@swagger-api/apidom-parser-adapter-asyncapi-yaml-2": ^0.74.1
+    "@swagger-api/apidom-parser-adapter-json": ^0.74.1
+    "@swagger-api/apidom-parser-adapter-openapi-json-3-0": ^0.74.1
+    "@swagger-api/apidom-parser-adapter-openapi-json-3-1": ^0.74.1
+    "@swagger-api/apidom-parser-adapter-openapi-yaml-3-0": ^0.74.1
+    "@swagger-api/apidom-parser-adapter-openapi-yaml-3-1": ^0.74.1
+    "@swagger-api/apidom-parser-adapter-yaml-1-2": ^0.74.1
+    "@types/ramda": ~0.29.3
     axios: ^1.4.0
     minimatch: ^7.4.3
     process: ^0.11.10
@@ -16075,94 +16509,95 @@ __metadata:
       optional: true
     "@swagger-api/apidom-parser-adapter-yaml-1-2":
       optional: true
-  checksum: ea8de1fa634f4f6092da5a19c015e64a7ffe45097e580dedfe1941b931a7352b3cb07410b5c83396ab10ff22fef4ad6a631a42517677e68824dc883270218ed7
+  checksum: dda3f3da4fcea911bd19136635293c07e62d3ba6d4248fe3fee22eb659250631809f045a439cad03b6afc5a5472bd4ee3168bfe5be1bf53bfbd3dceed7ef60f4
   languageName: node
   linkType: hard
 
-"@swc/core-darwin-arm64@npm:1.3.74":
-  version: 1.3.74
-  resolution: "@swc/core-darwin-arm64@npm:1.3.74"
+"@swc/core-darwin-arm64@npm:1.3.82":
+  version: 1.3.82
+  resolution: "@swc/core-darwin-arm64@npm:1.3.82"
   conditions: os=darwin & cpu=arm64
   languageName: node
   linkType: hard
 
-"@swc/core-darwin-x64@npm:1.3.74":
-  version: 1.3.74
-  resolution: "@swc/core-darwin-x64@npm:1.3.74"
+"@swc/core-darwin-x64@npm:1.3.82":
+  version: 1.3.82
+  resolution: "@swc/core-darwin-x64@npm:1.3.82"
   conditions: os=darwin & cpu=x64
   languageName: node
   linkType: hard
 
-"@swc/core-linux-arm-gnueabihf@npm:1.3.74":
-  version: 1.3.74
-  resolution: "@swc/core-linux-arm-gnueabihf@npm:1.3.74"
+"@swc/core-linux-arm-gnueabihf@npm:1.3.82":
+  version: 1.3.82
+  resolution: "@swc/core-linux-arm-gnueabihf@npm:1.3.82"
   conditions: os=linux & cpu=arm
   languageName: node
   linkType: hard
 
-"@swc/core-linux-arm64-gnu@npm:1.3.74":
-  version: 1.3.74
-  resolution: "@swc/core-linux-arm64-gnu@npm:1.3.74"
+"@swc/core-linux-arm64-gnu@npm:1.3.82":
+  version: 1.3.82
+  resolution: "@swc/core-linux-arm64-gnu@npm:1.3.82"
   conditions: os=linux & cpu=arm64 & libc=glibc
   languageName: node
   linkType: hard
 
-"@swc/core-linux-arm64-musl@npm:1.3.74":
-  version: 1.3.74
-  resolution: "@swc/core-linux-arm64-musl@npm:1.3.74"
+"@swc/core-linux-arm64-musl@npm:1.3.82":
+  version: 1.3.82
+  resolution: "@swc/core-linux-arm64-musl@npm:1.3.82"
   conditions: os=linux & cpu=arm64 & libc=musl
   languageName: node
   linkType: hard
 
-"@swc/core-linux-x64-gnu@npm:1.3.74":
-  version: 1.3.74
-  resolution: "@swc/core-linux-x64-gnu@npm:1.3.74"
+"@swc/core-linux-x64-gnu@npm:1.3.82":
+  version: 1.3.82
+  resolution: "@swc/core-linux-x64-gnu@npm:1.3.82"
   conditions: os=linux & cpu=x64 & libc=glibc
   languageName: node
   linkType: hard
 
-"@swc/core-linux-x64-musl@npm:1.3.74":
-  version: 1.3.74
-  resolution: "@swc/core-linux-x64-musl@npm:1.3.74"
+"@swc/core-linux-x64-musl@npm:1.3.82":
+  version: 1.3.82
+  resolution: "@swc/core-linux-x64-musl@npm:1.3.82"
   conditions: os=linux & cpu=x64 & libc=musl
   languageName: node
   linkType: hard
 
-"@swc/core-win32-arm64-msvc@npm:1.3.74":
-  version: 1.3.74
-  resolution: "@swc/core-win32-arm64-msvc@npm:1.3.74"
+"@swc/core-win32-arm64-msvc@npm:1.3.82":
+  version: 1.3.82
+  resolution: "@swc/core-win32-arm64-msvc@npm:1.3.82"
   conditions: os=win32 & cpu=arm64
   languageName: node
   linkType: hard
 
-"@swc/core-win32-ia32-msvc@npm:1.3.74":
-  version: 1.3.74
-  resolution: "@swc/core-win32-ia32-msvc@npm:1.3.74"
+"@swc/core-win32-ia32-msvc@npm:1.3.82":
+  version: 1.3.82
+  resolution: "@swc/core-win32-ia32-msvc@npm:1.3.82"
   conditions: os=win32 & cpu=ia32
   languageName: node
   linkType: hard
 
-"@swc/core-win32-x64-msvc@npm:1.3.74":
-  version: 1.3.74
-  resolution: "@swc/core-win32-x64-msvc@npm:1.3.74"
+"@swc/core-win32-x64-msvc@npm:1.3.82":
+  version: 1.3.82
+  resolution: "@swc/core-win32-x64-msvc@npm:1.3.82"
   conditions: os=win32 & cpu=x64
   languageName: node
   linkType: hard
 
 "@swc/core@npm:^1.3.46":
-  version: 1.3.74
-  resolution: "@swc/core@npm:1.3.74"
+  version: 1.3.82
+  resolution: "@swc/core@npm:1.3.82"
   dependencies:
-    "@swc/core-darwin-arm64": 1.3.74
-    "@swc/core-darwin-x64": 1.3.74
-    "@swc/core-linux-arm-gnueabihf": 1.3.74
-    "@swc/core-linux-arm64-gnu": 1.3.74
-    "@swc/core-linux-arm64-musl": 1.3.74
-    "@swc/core-linux-x64-gnu": 1.3.74
-    "@swc/core-linux-x64-musl": 1.3.74
-    "@swc/core-win32-arm64-msvc": 1.3.74
-    "@swc/core-win32-ia32-msvc": 1.3.74
-    "@swc/core-win32-x64-msvc": 1.3.74
+    "@swc/core-darwin-arm64": 1.3.82
+    "@swc/core-darwin-x64": 1.3.82
+    "@swc/core-linux-arm-gnueabihf": 1.3.82
+    "@swc/core-linux-arm64-gnu": 1.3.82
+    "@swc/core-linux-arm64-musl": 1.3.82
+    "@swc/core-linux-x64-gnu": 1.3.82
+    "@swc/core-linux-x64-musl": 1.3.82
+    "@swc/core-win32-arm64-msvc": 1.3.82
+    "@swc/core-win32-ia32-msvc": 1.3.82
+    "@swc/core-win32-x64-msvc": 1.3.82
+    "@swc/types": ^0.1.4
   peerDependencies:
     "@swc/helpers": ^0.5.0
   dependenciesMeta:
@@ -16189,7 +16624,7 @@ __metadata:
   peerDependenciesMeta:
     "@swc/helpers":
       optional: true
-  checksum: fd61d65fbfceb372178a14cfa998c649481a728e33b68bad90fed0ff05b34fb432f88dafb0c2257d54c4de49cdcdd12d2b5fe66f79abc553656445910f163adb
+  checksum: 4c4adbed22071c0af935129a6fe7cc35d1688a5c1a069efdd8c97740930fa7eaf324e75dc88634a4ea0520330f6c88101d5aa5cf7ed6e02d336cc46ee7131ea3
   languageName: node
   linkType: hard
 
@@ -16203,14 +16638,21 @@ __metadata:
   linkType: hard
 
 "@swc/jest@npm:^0.2.22":
-  version: 0.2.27
-  resolution: "@swc/jest@npm:0.2.27"
+  version: 0.2.29
+  resolution: "@swc/jest@npm:0.2.29"
   dependencies:
     "@jest/create-cache-key-function": ^27.4.2
     jsonc-parser: ^3.2.0
   peerDependencies:
     "@swc/core": "*"
-  checksum: db258e13f9eb9441d4d924684452939fb49016a4a2eaf7700cbf5eb4f90dff96bb7ce240ed539adbcd41b45fe62bacdc1d3f3d995403af44d54501b41f1ec72f
+  checksum: 9eaad322310f34e81f67d41411a7d60663341af1bd9fb65456faa914c936d849d6f643fa3b942a187d52e71e62c33097098c639d25c2047fa874f49bf51cec76
+  languageName: node
+  linkType: hard
+
+"@swc/types@npm:^0.1.4":
+  version: 0.1.4
+  resolution: "@swc/types@npm:0.1.4"
+  checksum: 9b09de7dca8e4b19bfb43f9e332c771855158cb761d26000807fe858447ecbc5342a6c257b26d9aa5497f7138fc58913693e2bee222e5042e0e8f57c2979ae66
   languageName: node
   linkType: hard
 
@@ -16223,18 +16665,18 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@tanstack/query-core@npm:4.29.19":
-  version: 4.29.19
-  resolution: "@tanstack/query-core@npm:4.29.19"
-  checksum: 91a79dbebebc139d118542a5fe83fb54a6f6448bbe1563db1a0bed0c6d44e1d023613efde3c4ac747c72d067110013ac56f90611bf8affc390eda1ac3f99066e
+"@tanstack/query-core@npm:4.33.0":
+  version: 4.33.0
+  resolution: "@tanstack/query-core@npm:4.33.0"
+  checksum: fae325f1d79b936435787797c32367331d5b8e9c5ced84852bf2085115e3aafef57a7ae530a6b0af46da4abafb4b0afaef885926b71715a0e6f166d74da61c7f
   languageName: node
   linkType: hard
 
 "@tanstack/react-query@npm:^4.1.3":
-  version: 4.29.19
-  resolution: "@tanstack/react-query@npm:4.29.19"
+  version: 4.33.0
+  resolution: "@tanstack/react-query@npm:4.33.0"
   dependencies:
-    "@tanstack/query-core": 4.29.19
+    "@tanstack/query-core": 4.33.0
     use-sync-external-store: ^1.2.0
   peerDependencies:
     react: ^16.8.0 || ^17.0.0 || ^18.0.0
@@ -16245,7 +16687,7 @@ __metadata:
       optional: true
     react-native:
       optional: true
-  checksum: 2780ac35b4d1dabcd3e708b95891376e7e609109270d40442b33f4747c508c23e46bcadc692f997f81d38f62b5ab31f8e42bc9a785dfa4afe0c390adb6f37e52
+  checksum: b3cf4afa427435e464e077b3f23c891e38e5f78873518f15c1d061ad55f1464d6241ecd92d796a5dbc9412b4fd7eb30b01f2a9cfc285ee9f30dfdd2ca0ecaf4b
   languageName: node
   linkType: hard
 
@@ -16274,7 +16716,7 @@ __metadata:
     fs-extra: ^10.0.1
     global-agent: ^3.0.0
     http-proxy: ^1.18.1
-    nodemon: ^2.0.2
+    nodemon: ^3.0.1
     react-dev-utils: ^12.0.0-next.60
     serve-handler: ^6.1.3
     techdocs-cli-embedded-app: "link:../techdocs-cli-embedded-app"
@@ -16553,6 +16995,19 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@types/body-parser-xml@npm:^2.0.2":
+  version: 2.0.2
+  resolution: "@types/body-parser-xml@npm:2.0.2"
+  dependencies:
+    "@types/body-parser": "*"
+    "@types/connect": "*"
+    "@types/express-serve-static-core": "*"
+    "@types/node": "*"
+    "@types/xml2js": "*"
+  checksum: ddac93399bc85b7402193004954215b9152374cd3e0e54e6f500ea71e8bf962ff091300a265551832c863e63539af1a2d9483838073ff43362d0bdf867802a50
+  languageName: node
+  linkType: hard
+
 "@types/body-parser@npm:*, @types/body-parser@npm:^1.19.0":
   version: 1.19.2
   resolution: "@types/body-parser@npm:1.19.2"
@@ -16608,11 +17063,11 @@ __metadata:
   linkType: hard
 
 "@types/codemirror@npm:^5.0.0":
-  version: 5.60.8
-  resolution: "@types/codemirror@npm:5.60.8"
+  version: 5.60.10
+  resolution: "@types/codemirror@npm:5.60.10"
   dependencies:
     "@types/tern": "*"
-  checksum: bc3a63eab0308b3ef5ed2ca22afb7f1c0b8acde6477e1d569df7e93f3fe4f78754d28a3e081c72931259fe1bf906a319b54bcdeba74600b989e5558d32478496
+  checksum: c5977db03939f2a208f0ec7958be70b4fb205dd3f3122b2175ff28287a5424da95f9030b2838c61d37e6278ec53795861dec12439967c1e1da885b2b2a65b299
   languageName: node
   linkType: hard
 
@@ -16633,18 +17088,18 @@ __metadata:
   linkType: hard
 
 "@types/color@npm:^3.0.1":
-  version: 3.0.3
-  resolution: "@types/color@npm:3.0.3"
+  version: 3.0.4
+  resolution: "@types/color@npm:3.0.4"
   dependencies:
     "@types/color-convert": "*"
-  checksum: 4a54a6eca687b1f19d393c6c44e292009e913fa2377b5b815d1cd04470131087d7a799718d9e66a970f43e6ba16e7056a5b40b49d2d0d1d0f1530aff23864528
+  checksum: 46935626ddeb8ae8877488b1f8f2f71b17a529c113673301a1dd7a64d917cb7a748545ac34ed30c188d66a2cd09c33abc24c87bd5b3a80d520cf1f35aaa2e476
   languageName: node
   linkType: hard
 
 "@types/command-exists@npm:^1.2.0":
-  version: 1.2.0
-  resolution: "@types/command-exists@npm:1.2.0"
-  checksum: 7c5a626c38898d0267375dbf24ea374e6fcc8a85837f38eeb4485a5699a905eda89941059ea4f82ffc92b2207b29bdd7f7ab8dcbae95ed661b65cafe958e3fb1
+  version: 1.2.1
+  resolution: "@types/command-exists@npm:1.2.1"
+  checksum: 51e5d13cb06b9a5780e85e0612b924eda01d00919a75b6645fbdc7344c610ac19e8e122e2da9db5e91473cf88a3d71cfd93a294f1c31f2beabb835b6ab7e85d1
   languageName: node
   linkType: hard
 
@@ -16658,11 +17113,11 @@ __metadata:
   linkType: hard
 
 "@types/compression@npm:^1.7.0, @types/compression@npm:^1.7.2":
-  version: 1.7.2
-  resolution: "@types/compression@npm:1.7.2"
+  version: 1.7.3
+  resolution: "@types/compression@npm:1.7.3"
   dependencies:
     "@types/express": "*"
-  checksum: 3457f9d39ed73d58387bccf15bcfe8e140298c5d6e90fe354dfeb24ec7828432658caebee8ab6f4e4ac39a7d03bc0a6a52686d7fb2fe405fbdefede41d6b5834
+  checksum: 9a65519e8cc894246466fc8828a82045d0d3db97a3d7367381855c8fd10080d752ac10c2274de4668985225c72f3124bf5aeee75656b992837a21c64f8eb1789
   languageName: node
   linkType: hard
 
@@ -16695,11 +17150,11 @@ __metadata:
   linkType: hard
 
 "@types/cookie-parser@npm:^1.4.2":
-  version: 1.4.3
-  resolution: "@types/cookie-parser@npm:1.4.3"
+  version: 1.4.4
+  resolution: "@types/cookie-parser@npm:1.4.4"
   dependencies:
     "@types/express": "*"
-  checksum: f390f3af1b1711190dee2c2ecd9af33af81fbde8d81ee820dadb6fe1e0d80c3faba40af37c6ed36fb88b04b64870f6a021f7e9edceecd17c42fe22abe0af5005
+  checksum: 5c81ac4b7d90a567e0c7a904ecbc09c82c43e30c6b5b507aee5147bc06bc8c6418e6719d63fcf68e6a83c71870485ab3fc579a30891b56a0be05d64753e3f74a
   languageName: node
   linkType: hard
 
@@ -16718,18 +17173,18 @@ __metadata:
   linkType: hard
 
 "@types/core-js@npm:^2.5.4":
-  version: 2.5.5
-  resolution: "@types/core-js@npm:2.5.5"
-  checksum: 54eb91dc52206d8e524771cd079be4bed6a41947d08183a7954df7a3dc25ae21c8b7176143dc7203df82a6e5ff1df8998edc8d407c4a082bdbf0ede35369c5c3
+  version: 2.5.6
+  resolution: "@types/core-js@npm:2.5.6"
+  checksum: 05cfeea4c918c88afcff5949e05a66c9c6cccd67f3de80732609d2546da0fdbd4350d6ecb415d4301f877e5ae1073c8afc0d500233f2b8826dd66d14c6e0c854
   languageName: node
   linkType: hard
 
 "@types/cors@npm:^2.8.6":
-  version: 2.8.13
-  resolution: "@types/cors@npm:2.8.13"
+  version: 2.8.14
+  resolution: "@types/cors@npm:2.8.14"
   dependencies:
     "@types/node": "*"
-  checksum: 7ef197ea19d2e5bf1313b8416baa6f3fd6dd887fd70191da1f804f557395357dafd8bc8bed0ac60686923406489262a7c8a525b55748f7b2b8afa686700de907
+  checksum: 119b8ea5760db58542cc66635e8b98b9e859d615e9fc7bfd520c0e2c94063e87759033a4242360e2aa66df2d7d092a406838ac35e8ca7034debf1c69abc27811
   languageName: node
   linkType: hard
 
@@ -16744,11 +17199,11 @@ __metadata:
   linkType: hard
 
 "@types/cross-spawn@npm:^6.0.2":
-  version: 6.0.2
-  resolution: "@types/cross-spawn@npm:6.0.2"
+  version: 6.0.3
+  resolution: "@types/cross-spawn@npm:6.0.3"
   dependencies:
     "@types/node": "*"
-  checksum: fa9edd32178878cab3ea8d6d0260639e0fe4860ddb3887b8de53d6e8036e154fc5f313c653f690975aa25025aea8beb83fb0870b931bf8d9202c3ac530a24c9d
+  checksum: 06d50fa1e1370ef60b9c9085b76adec7d7bc20728fbb02b3c2061d4d922312acf1ba56a7c94d88c27a22fc6241ab6b970c936f3294038a9c97a719fbc8eb8a76
   languageName: node
   linkType: hard
 
@@ -16781,9 +17236,9 @@ __metadata:
   linkType: hard
 
 "@types/d3-force@npm:^3.0.0":
-  version: 3.0.4
-  resolution: "@types/d3-force@npm:3.0.4"
-  checksum: 779fb597fb41e7bc6a5e1b8969d500deb95c4a73428c7c268bf0ca6f3ed668dd2ed6aa652de7af14d2f9c192dad4f6e7badf2c5bc330624bd8405ac88440b278
+  version: 3.0.5
+  resolution: "@types/d3-force@npm:3.0.5"
+  checksum: 09aa0e999841f69b34296fa92273b5b251c50f74c1b7ec2bdef7a3a7fd2d756467e4ede7cc0dcfc4151c04bde0f3feaa48d9b669c38620fb51cee2d7faa01e24
   languageName: node
   linkType: hard
 
@@ -16820,9 +17275,9 @@ __metadata:
   linkType: hard
 
 "@types/d3-selection@npm:*, @types/d3-selection@npm:^3.0.1":
-  version: 3.0.5
-  resolution: "@types/d3-selection@npm:3.0.5"
-  checksum: 77ea35c92273cd2d736355ab5a4cf6477086b064a1f608489a6fef4198ee6bc1d5440e5dfd880099265ac96c4f4b4fda659d89fbaaef37ba03708663196ba8ad
+  version: 3.0.6
+  resolution: "@types/d3-selection@npm:3.0.6"
+  checksum: 01f9f3a41b98280947109911bcc6ebffff5c8c3e617695979c04ef9beef445a8cdc48a9fbdb3c9cff45a7345e83e8a5d6b346d7ceedca6ebc11dfd9717dbff6b
   languageName: node
   linkType: hard
 
@@ -16836,11 +17291,11 @@ __metadata:
   linkType: hard
 
 "@types/d3-shape@npm:^3.0.1, @types/d3-shape@npm:^3.1.0":
-  version: 3.1.1
-  resolution: "@types/d3-shape@npm:3.1.1"
+  version: 3.1.2
+  resolution: "@types/d3-shape@npm:3.1.2"
   dependencies:
     "@types/d3-path": "*"
-  checksum: 8f1762ecdeb4833a3802be1c65363cbc7cca753d0b836a3855fde4ba12f8e6fc142dba3c5f6d669a9e89374cc6dc414464e4f2d04e72fafd4bc64819ce30bb63
+  checksum: 17399a78872aa89cab600cb7977405136a72798dbbb59a4b3684012c2a2ffb9b62720cceaaedc412088b7da086518a6722c909e03cb81e3e238569722feb60f9
   languageName: node
   linkType: hard
 
@@ -16859,12 +17314,12 @@ __metadata:
   linkType: hard
 
 "@types/d3-zoom@npm:^3.0.1":
-  version: 3.0.3
-  resolution: "@types/d3-zoom@npm:3.0.3"
+  version: 3.0.4
+  resolution: "@types/d3-zoom@npm:3.0.4"
   dependencies:
     "@types/d3-interpolate": "*"
     "@types/d3-selection": "*"
-  checksum: 1c828538e2b04c47f659ead552824bed1c545dd1934f38abfec95f4a3c1cb4eaf7e107959ebd05a3dfec0166fa98677037ede6f633383c6502b1a05eaeb1d418
+  checksum: 6330b8411822b979ab0fd5a7a7755295377b4dfc61fd8f925d97e5b388e3dd604b455c0009b0eda3320c14c4ea367f740a04991a71d35befdca5f75218492a68
   languageName: node
   linkType: hard
 
@@ -16978,14 +17433,14 @@ __metadata:
   linkType: hard
 
 "@types/express-serve-static-core@npm:*, @types/express-serve-static-core@npm:^4.17.30, @types/express-serve-static-core@npm:^4.17.33, @types/express-serve-static-core@npm:^4.17.5":
-  version: 4.17.35
-  resolution: "@types/express-serve-static-core@npm:4.17.35"
+  version: 4.17.36
+  resolution: "@types/express-serve-static-core@npm:4.17.36"
   dependencies:
     "@types/node": "*"
     "@types/qs": "*"
     "@types/range-parser": "*"
     "@types/send": "*"
-  checksum: cc8995d10c6feda475ec1b3a0e69eb0f35f21ab6b49129ad5c6f279e0bc5de8175bc04ec51304cb79a43eec3ed2f5a1e01472eb6d5f827b8c35c6ca8ad24eb6e
+  checksum: 410b13cbd663f18c0f8729e7f2ff54d960d96de76ebbae7cadb612972f85cc66c54051e00d32f11aa230c0a683d81a6d6fc7f7e4e383a95c0801494c517f36e1
   languageName: node
   linkType: hard
 
@@ -16998,16 +17453,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/express-xml-bodyparser@npm:^0.3.2":
-  version: 0.3.2
-  resolution: "@types/express-xml-bodyparser@npm:0.3.2"
-  dependencies:
-    "@types/express": "*"
-    "@types/xml2js": "*"
-  checksum: 5d40669bf8b1f031c405e7172f12ecf53ccff5a35a7d08a7824a79f5a33bf450204bc1fa4c5bc618e32c9826dbf81170118f9aa6db7d0f2fa007ddc59e21929f
-  languageName: node
-  linkType: hard
-
 "@types/express@npm:*, @types/express@npm:^4.17.13, @types/express@npm:^4.17.17, @types/express@npm:^4.17.6":
   version: 4.17.17
   resolution: "@types/express@npm:4.17.17"
@@ -17235,11 +17680,11 @@ __metadata:
   linkType: hard
 
 "@types/jquery@npm:^3.3.34":
-  version: 3.5.16
-  resolution: "@types/jquery@npm:3.5.16"
+  version: 3.5.18
+  resolution: "@types/jquery@npm:3.5.18"
   dependencies:
     "@types/sizzle": "*"
-  checksum: 13c995f15d1c2f1d322103dc1cb0a22b95eecc3e7546f00279b8731aea21d7ec04550af40e609ee48e755d4e11bf61c25b4aa9f53df3bcbec4b8fe8e81471732
+  checksum: 6576bc9a6d35671ceb464e8f937b7eb916227b38b4edf8769a0bc628cfbb9f211b61ccd4158d42aa31591f2c6766b7095430f820d374f70245258ac6cec3e439
   languageName: node
   linkType: hard
 
@@ -17371,9 +17816,9 @@ __metadata:
   linkType: hard
 
 "@types/libsodium-wrappers@npm:^0.7.10":
-  version: 0.7.10
-  resolution: "@types/libsodium-wrappers@npm:0.7.10"
-  checksum: 717054ebcb5fa553e378144b8d564bed8b691905c0d4e90b95c64d77ba24ec9fe798cb2c58cd61dad545ceacb1f05ab69b5597217f9829f2da7a23f0688d11d0
+  version: 0.7.11
+  resolution: "@types/libsodium-wrappers@npm:0.7.11"
+  checksum: e3c3acdfc178a466a04d81c030ba1b748abc9335b1d66421125eb55b32cbaf6a9076e32a98744fcb84ba2fa2af342203ff29054262dcc465c12c4feddddb64ac
   languageName: node
   linkType: hard
 
@@ -17385,9 +17830,9 @@ __metadata:
   linkType: hard
 
 "@types/lodash@npm:^4.14.151, @types/lodash@npm:^4.14.173, @types/lodash@npm:^4.14.175":
-  version: 4.14.196
-  resolution: "@types/lodash@npm:4.14.196"
-  checksum: 201d17c3e62ae02a93c99ec78e024b2be9bd75564dd8fd8c26f6ac51a985ab280d28ce2688c3bcdfe785b0991cd9814edff19ee000234c7b45d9a697f09feb6a
+  version: 4.14.198
+  resolution: "@types/lodash@npm:4.14.198"
+  checksum: b290e4480707151bcec738bca40527915defe52a0d8e26c83685c674163a265e1a88cb2ee56b0fb587a89819d0cd5df86ada836aec3e9c2e4bf516e7d348d524
   languageName: node
   linkType: hard
 
@@ -17399,16 +17844,16 @@ __metadata:
   linkType: hard
 
 "@types/lunr@npm:^2.3.3":
-  version: 2.3.4
-  resolution: "@types/lunr@npm:2.3.4"
-  checksum: 251dfefec4a24831999b052968f93b0f2066992554a1ff5ea3c6f7a581691b26e03d9d892293d2042bbf48dd9885c8f706e52e63ec2258878547c86b7283618e
+  version: 2.3.5
+  resolution: "@types/lunr@npm:2.3.5"
+  checksum: c68c2bdb0af765e05ebb67ac773e98423080bbe5f7c7456ade9259dbb6bd808bd50d2c91e61ca216c4f36dc799d3058e97d514b76cdeb221b3fb20799fe266fa
   languageName: node
   linkType: hard
 
-"@types/luxon@npm:*, @types/luxon@npm:^3.0.0":
-  version: 3.2.0
-  resolution: "@types/luxon@npm:3.2.0"
-  checksum: 051bfbf841c6ce98728df6538342ce4aaddfcf0ec6e8b473e0195dcfc3ba6b1fe4b3ce17f2ba6d25344f41cb70032c1debe96da9e384e5f6e639665c1e6d368c
+"@types/luxon@npm:*, @types/luxon@npm:^3.0.0, @types/luxon@npm:~3.3.0":
+  version: 3.3.2
+  resolution: "@types/luxon@npm:3.3.2"
+  checksum: b9111132720eae0269538872a5a496b29587ecfc8edc3b0ff7d269aa93a5ff00a131b23d1e9d1f12ec39f2c779ad21bd8d9f90b122c85a182771aabde7f676b8
   languageName: node
   linkType: hard
 
@@ -17490,11 +17935,11 @@ __metadata:
   linkType: hard
 
 "@types/morgan@npm:^1.9.0":
-  version: 1.9.4
-  resolution: "@types/morgan@npm:1.9.4"
+  version: 1.9.5
+  resolution: "@types/morgan@npm:1.9.5"
   dependencies:
     "@types/node": "*"
-  checksum: d1e99c66a43501dcdf6e94e013dfff4e6c152cbb5f782d954bb722d230a9c1c0fe06fab6df3f3dfa3547735a7598f9471633cc6813d794e9562fd022e217c6ae
+  checksum: f98deb4c7f2ad6049ad34ed7b0f0d427546bdf2358011070af9d597de1b0a03b38cc10cfe65ef2e7673e569c384303d949e76df701acefe288d547f614142973
   languageName: node
   linkType: hard
 
@@ -17544,16 +17989,9 @@ __metadata:
   linkType: hard
 
 "@types/node@npm:*, @types/node@npm:>=12.12.47, @types/node@npm:>=13.7.0":
-  version: 20.4.8
-  resolution: "@types/node@npm:20.4.8"
-  checksum: 86a3963c0c7af3410553d1dfa4b018a20b3cb3ab4d8e8ffe27408b6338c5de0374b0bf379bc705da2205b466daa751ccfe062f453ba9bde34fdb0e5163ca6a68
-  languageName: node
-  linkType: hard
-
-"@types/node@npm:12.20.24":
-  version: 12.20.24
-  resolution: "@types/node@npm:12.20.24"
-  checksum: e7a13460e2f5b0b5a32c0f3af7daf1a05201552a66d542d3cc3b1ea8b52d4730250f9eb1961d755e31cfe5d03c78340911a6242657a0a9a17d6f7e341fc9f366
+  version: 20.5.9
+  resolution: "@types/node@npm:20.5.9"
+  checksum: 717490e94131722144878b4ca1a963ede1673bb8f2ef78c2f5b50b918df6dc9b35e7f8283e5c2a7a9f137730f7c08dc6228e53d4494a94c9ee16881e6ce6caed
   languageName: node
   linkType: hard
 
@@ -17565,9 +18003,9 @@ __metadata:
   linkType: hard
 
 "@types/node@npm:^14.14.31":
-  version: 14.18.54
-  resolution: "@types/node@npm:14.18.54"
-  checksum: 9fd66f91fcd8e9b25067f784a9c60bd710ef86a89c838c131ab2b1921398adc53b1c70d741bceed48bb2403b75c434b1bbbb255240773819cde36295c4b6abf1
+  version: 14.18.58
+  resolution: "@types/node@npm:14.18.58"
+  checksum: 45767bb137acdd1d1486bcce279d149ab1c44089401f124e8b7044f4cd7511aa841ae8fac030e81b988b45df21cfb4eca44281c6d7f75c87f803748a30cb9043
   languageName: node
   linkType: hard
 
@@ -17579,16 +18017,16 @@ __metadata:
   linkType: hard
 
 "@types/node@npm:^16.0.0, @types/node@npm:^16.11.26, @types/node@npm:^16.9.2":
-  version: 16.18.39
-  resolution: "@types/node@npm:16.18.39"
-  checksum: eac9b202b76013256cb517ca8d3e3f61df206edb1615ca8d8df4c80616e92879fe4d3f8570a11d60f4216a82724a3265d5888b24c6994c80b057a0423c9ff1d2
+  version: 16.18.48
+  resolution: "@types/node@npm:16.18.48"
+  checksum: 5b725fe918197e4395cc88de17d67efeb02436e29c0d3b212ed63dfc51509ed398e9155ae15d1a8cd6f1c891463f2cf074dcea320d8cd392e25a9a11ce53dd6c
   languageName: node
   linkType: hard
 
 "@types/node@npm:^18.11.17":
-  version: 18.17.3
-  resolution: "@types/node@npm:18.17.3"
-  checksum: 884fb68936b2b0ff90863fcf80610dd2f3d9fe1947897248b0138df05fe41ee6ce62941b37b565e3b3fd77601cd3977a64de858654c6ab9064413b171740d6ba
+  version: 18.17.14
+  resolution: "@types/node@npm:18.17.14"
+  checksum: f96ce1e588426a26cf82440193084f8bbab47bfb3c2e668cf174095f99ce808a20654b2137448c7e88cfd7b6c2b8521ffb6f714f521b3502ac595a0df0bff679
   languageName: node
   linkType: hard
 
@@ -17629,6 +18067,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@types/parse-link-header@npm:^2.0.1":
+  version: 2.0.1
+  resolution: "@types/parse-link-header@npm:2.0.1"
+  checksum: f76678612511365aefc23704f00f3262fcb1d6bd9c4dd83f783a38e50e3ccf26615f9a62c757952cab5af6f2bd8b3b1763ce391376458afce5fe47c6fe2b80e1
+  languageName: node
+  linkType: hard
+
 "@types/passport-auth0@npm:^1.0.5":
   version: 1.0.5
   resolution: "@types/passport-auth0@npm:1.0.5"
@@ -17728,10 +18173,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/pluralize@npm:^0.0.29":
-  version: 0.0.29
-  resolution: "@types/pluralize@npm:0.0.29"
-  checksum: db7732b733ba1dc59f080f87364c9f985c1ae9f1e5ec5fcefb83c1327149e01ecac42766352eb7b19b117cf39defa99cf514629f3666968a3bdeb00e74f2a97e
+"@types/pluralize@npm:^0.0.30":
+  version: 0.0.30
+  resolution: "@types/pluralize@npm:0.0.30"
+  checksum: 7a9a4a24aac1f74bd63e592a824ebec114486e0635a94496e92aa37fa388fac585be108d3ccfc7b2c490963679ec4900fbf394d22fa6cbf419f22cc499ab5a29
   languageName: node
   linkType: hard
 
@@ -17765,12 +18210,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/ramda@npm:~0.29.1":
-  version: 0.29.2
-  resolution: "@types/ramda@npm:0.29.2"
+"@types/ramda@npm:~0.29.3":
+  version: 0.29.3
+  resolution: "@types/ramda@npm:0.29.3"
   dependencies:
-    types-ramda: ^0.29.3
-  checksum: 152151848a02aca8b7eb7e95e247a10c8e0f12e07d096a25c4c230cc3bd704009670c735737d3f843373a4598869c2b2d6f81e425fa17c762e4b57808400d968
+    types-ramda: ^0.29.4
+  checksum: 172b18d62473d4bffb1e4e92fa293e56fa4f85fcf91b1b2c9178955f775e34065cc408e93f1171436b52e240599ecb1be51955dab07ca389bf2da98f85f820a9
   languageName: node
   linkType: hard
 
@@ -17782,11 +18227,11 @@ __metadata:
   linkType: hard
 
 "@types/react-dom@npm:^17":
-  version: 17.0.17
-  resolution: "@types/react-dom@npm:17.0.17"
+  version: 17.0.20
+  resolution: "@types/react-dom@npm:17.0.20"
   dependencies:
     "@types/react": ^17
-  checksum: 23caf98aa03e968811560f92a2c8f451694253ebe16b670929b24eaf0e7fa62ba549abe9db0ac028a9d8a9086acd6ab9c6c773f163fa21224845edbc00ba6232
+  checksum: 525439fb14a033fc5dbe74711ecc50ec82273a528df9656594066a6219401e975101dafffd15d9a1a57a9442d52ea0c92eaacae09554dde27cd792e773f67467
   languageName: node
   linkType: hard
 
@@ -17808,12 +18253,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/react-is@npm:^16.7.1 || ^17.0.0":
-  version: 17.0.3
-  resolution: "@types/react-is@npm:17.0.3"
+"@types/react-is@npm:^18.2.1":
+  version: 18.2.1
+  resolution: "@types/react-is@npm:18.2.1"
   dependencies:
     "@types/react": "*"
-  checksum: 6abb7c47d54f012272650df8a962a28bd82f219291e5ef8b4dfa7fe0bb98ae243b060bf9fbe8ceff6213141794855a006db194b490b00ffd15842ae19d0ce1f0
+  checksum: b44c3262efa2c68fa6fe2beb9ef86170b18305469461a3f97aa14943cc033cb21a26944f718bdb6434eea6e8f7fcba251c4f45b65b897a3fcf751b5a6003cf82
   languageName: node
   linkType: hard
 
@@ -17839,11 +18284,11 @@ __metadata:
   linkType: hard
 
 "@types/react-syntax-highlighter@npm:^15.0.0":
-  version: 15.5.6
-  resolution: "@types/react-syntax-highlighter@npm:15.5.6"
+  version: 15.5.7
+  resolution: "@types/react-syntax-highlighter@npm:15.5.7"
   dependencies:
     "@types/react": "*"
-  checksum: 81a9f26da41606ff595d42a064ec4097cd17c4ef242558aa5b3b76a1063729b2ae73f063350069a4692218cf6843d7ea59d3eaeac4df2a4894d969d911fb80b2
+  checksum: 1918d01baaa9bf485093fb04167d0dc87131be708bd68d32d3f614c0e7dba05de765fc62df139fa1972836b13e27983a2d89552eda5b5a38691a4ec300949648
   languageName: node
   linkType: hard
 
@@ -17865,12 +18310,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/react-transition-group@npm:^4.2.0, @types/react-transition-group@npm:^4.4.5":
-  version: 4.4.5
-  resolution: "@types/react-transition-group@npm:4.4.5"
+"@types/react-transition-group@npm:^4.2.0, @types/react-transition-group@npm:^4.4.6":
+  version: 4.4.6
+  resolution: "@types/react-transition-group@npm:4.4.6"
   dependencies:
     "@types/react": "*"
-  checksum: 265f1c74061556708ffe8d15559e35c60d6c11478c9950d3735575d2c116ca69f461d85effa06d73a613eb8b73c84fd32682feb57cf7c5f9e4284021dbca25b0
+  checksum: 0872143821d7ee20a1d81e965f8b1e837837f11cd2206973f1f98655751992d9390304d58bac192c9cd923eca95bff107d8c9e3364a180240d5c2a6fd70fd7c3
   languageName: node
   linkType: hard
 
@@ -17893,13 +18338,13 @@ __metadata:
   linkType: hard
 
 "@types/react@npm:^17":
-  version: 17.0.52
-  resolution: "@types/react@npm:17.0.52"
+  version: 17.0.65
+  resolution: "@types/react@npm:17.0.65"
   dependencies:
     "@types/prop-types": "*"
     "@types/scheduler": "*"
     csstype: ^3.0.2
-  checksum: a51b98dd87838d161278fdf9dd78e6a4ff8c018f406d6647f77963e144fb52a8beee40c89fd0e7e840eaeaa8bd9fe2f34519410540b1a52d43a6f8b4d2fbce33
+  checksum: bb862f0f97a49e690cd5c62743307d17398ee62b87bbb2c85c1b01cb992244c0aef4ecdedaab0e8d33c6315d5a8f067cf90e7f1c366b8819678c59204e202932
   languageName: node
   linkType: hard
 
@@ -18021,9 +18466,9 @@ __metadata:
   linkType: hard
 
 "@types/semver@npm:^7.3.12, @types/semver@npm:^7.3.8, @types/semver@npm:^7.5.0":
-  version: 7.5.0
-  resolution: "@types/semver@npm:7.5.0"
-  checksum: 0a64b9b9c7424d9a467658b18dd70d1d781c2d6f033096a6e05762d20ebbad23c1b69b0083b0484722aabf35640b78ccc3de26368bcae1129c87e9df028a22e2
+  version: 7.5.1
+  resolution: "@types/semver@npm:7.5.1"
+  checksum: 2fffe938c7ac168711f245a16e1856a3578d77161ca17e29a05c3e02c7be3e9c5beefa29a3350f6c1bd982fb70aa28cc52e4845eb7d36246bcdc0377170d584d
   languageName: node
   linkType: hard
 
@@ -18065,12 +18510,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/set-cookie-parser@npm:^2.4.0":
-  version: 2.4.0
-  resolution: "@types/set-cookie-parser@npm:2.4.0"
+"@types/set-cookie-parser@npm:^2.4.0, @types/set-cookie-parser@npm:^2.4.3":
+  version: 2.4.3
+  resolution: "@types/set-cookie-parser@npm:2.4.3"
   dependencies:
     "@types/node": "*"
-  checksum: dfd9f31079e44ad5922c142564e8cfc43c8ed61dafd4f22ab3862dd76971398a6063b4e8e89a047607e7a0ff0914a0e4b16a51ff2fc9b73c4196744666762685
+  checksum: 8c0ded364c5a53598dc58f6c668d6fdbefa3bb78fcb1181202b92f4d8495ca33b4317f54ac0fe42824278e789d730ee5cbd2f7f864466e708589ff4eab2bf457
   languageName: node
   linkType: hard
 
@@ -18255,9 +18700,9 @@ __metadata:
   linkType: hard
 
 "@types/trusted-types@npm:*":
-  version: 2.0.2
-  resolution: "@types/trusted-types@npm:2.0.2"
-  checksum: 3371eef5f1c50e1c3c07a127c1207b262ba65b83dd167a1c460fc1b135a3fb0c97b9f508efebd383f239cc5dd5b7169093686a692a501fde9c3f7208657d9b0d
+  version: 2.0.3
+  resolution: "@types/trusted-types@npm:2.0.3"
+  checksum: 4794804bc4a4a173d589841b6d26cf455ff5dc4f3e704e847de7d65d215f2e7043d8757e4741ce3a823af3f08260a8d04a1a6e9c5ec9b20b7b04586956a6b005
   languageName: node
   linkType: hard
 
@@ -18316,13 +18761,13 @@ __metadata:
   linkType: hard
 
 "@types/webpack@npm:^5.28.0":
-  version: 5.28.1
-  resolution: "@types/webpack@npm:5.28.1"
+  version: 5.28.2
+  resolution: "@types/webpack@npm:5.28.2"
   dependencies:
     "@types/node": "*"
     tapable: ^2.2.0
     webpack: ^5
-  checksum: 9f9bfe041382acfab36015f95011f6539705ba116fd9b3b8d7599a6396d996b7efcdb71947dba6d24a1a1bf397d15fdfb3c50d2f73e0aa5366a76198d5ec98b3
+  checksum: 0b147aaaaa8992417a5ed65af83eb0df9b5247c38ab482f3c844495935a29c474cb21bc865ca36052c353034f40d14c8d232f0c831fdc1a6956baa985d7b1135
   languageName: node
   linkType: hard
 
@@ -18333,21 +18778,21 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@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"
+"@types/ws@npm:^8.0.0, @types/ws@npm:^8.5.3, @types/ws@npm:^8.5.5":
+  version: 8.5.5
+  resolution: "@types/ws@npm:8.5.5"
   dependencies:
     "@types/node": "*"
-  checksum: fefbad20d211929bb996285c4e6f699b12192548afedbe4930ab4384f8a94577c9cd421acaad163cacd36b88649509970a05a0b8f20615b30c501ed5269038d1
+  checksum: d00bf8070e6938e3ccf933010921c6ce78ac3606696ce37a393b27a9a603f7bd93ea64f3c5fa295a2f743575ba9c9a9fdb904af0f5fe2229bf2adf0630386e4a
   languageName: node
   linkType: hard
 
 "@types/xml2js@npm:*, @types/xml2js@npm:^0.4.7":
-  version: 0.4.11
-  resolution: "@types/xml2js@npm:0.4.11"
+  version: 0.4.12
+  resolution: "@types/xml2js@npm:0.4.12"
   dependencies:
     "@types/node": "*"
-  checksum: d0e7d2a8c7e0a53147c777a6756bdea0eb26a3de0d3c1f42c17e63332e4e2dc532f687c19ca26a0518336f5de60e1ec4345d7ef71e7ba0656fcf3390c9388eb5
+  checksum: 6197f6d51d70ba7e6d3169ef6d58adacfeddeb2d8cfe4d2bb24eda86223c7dd77c82896c3aa3c636b3b1442cebc6d05959d1e65fa206dac2caeb99aa2c943716
   languageName: node
   linkType: hard
 
@@ -18377,9 +18822,9 @@ __metadata:
   linkType: hard
 
 "@types/yarnpkg__lockfile@npm:^1.1.4":
-  version: 1.1.5
-  resolution: "@types/yarnpkg__lockfile@npm:1.1.5"
-  checksum: 2aa761eebea2e8780ddc9d2819a356451d04166e3ea4fad3fd43d81e25a68806edf884f71aef12f77f0a256eb98aa152d32a8af16e32d04a918424d10cb6d858
+  version: 1.1.6
+  resolution: "@types/yarnpkg__lockfile@npm:1.1.6"
+  checksum: c0983d88c479f7b00a66d927fda9f8972e072745d5d16922cf381807aa6e88553319bb9f2b21b58f9e1ebea1a198a22d4da3111d93c81288589371ebb00d65f5
   languageName: node
   linkType: hard
 
@@ -18400,9 +18845,9 @@ __metadata:
   linkType: hard
 
 "@types/zen-observable@npm:^0.8.0, @types/zen-observable@npm:^0.8.2":
-  version: 0.8.3
-  resolution: "@types/zen-observable@npm:0.8.3"
-  checksum: 08c88354abcf03a2176a2ec32e07da1f25fdad94fbc2f419bea53d77deb04ad4759518b4fe3fc695e61065dd4bdf7c8bd26b5211a6cd5be2233872806bdee48d
+  version: 0.8.4
+  resolution: "@types/zen-observable@npm:0.8.4"
+  checksum: 784bae5554de07c9b0beda9ff0b81dfa4b52dee2f112d1c874e942114be00133b8159b413c5ba2503b8f0b1baa281c33e91028fe00b44abca0a22552c536e3ec
   languageName: node
   linkType: hard
 
@@ -18590,9 +19035,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@uiw/codemirror-extensions-basic-setup@npm:4.21.9":
-  version: 4.21.9
-  resolution: "@uiw/codemirror-extensions-basic-setup@npm:4.21.9"
+"@uiw/codemirror-extensions-basic-setup@npm:4.21.13":
+  version: 4.21.13
+  resolution: "@uiw/codemirror-extensions-basic-setup@npm:4.21.13"
   dependencies:
     "@codemirror/autocomplete": ^6.0.0
     "@codemirror/commands": ^6.0.0
@@ -18609,19 +19054,19 @@ __metadata:
     "@codemirror/search": ">=6.0.0"
     "@codemirror/state": ">=6.0.0"
     "@codemirror/view": ">=6.0.0"
-  checksum: e7f2a78dd26a919b00247ad85211a09b8242d57585c7689cc44ea9de99e02e8fd8dd281ebf48e61c4126704b031babb5a596307299015bb0aa8e561a0ad2d9b1
+  checksum: 94a1ef335ed12fd1eb201e3d94892824d16a01d5a531c1962ed3b9a2d379dc3261abb4647208254a5a69763467b8a4f677ae0201fc8e67e5b60b1da9b12bae34
   languageName: node
   linkType: hard
 
 "@uiw/react-codemirror@npm:^4.9.3":
-  version: 4.21.9
-  resolution: "@uiw/react-codemirror@npm:4.21.9"
+  version: 4.21.13
+  resolution: "@uiw/react-codemirror@npm:4.21.13"
   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.21.9
+    "@uiw/codemirror-extensions-basic-setup": 4.21.13
     codemirror: ^6.0.0
   peerDependencies:
     "@babel/runtime": ">=7.11.0"
@@ -18631,7 +19076,7 @@ __metadata:
     codemirror: ">=6.0.0"
     react: ">=16.8.0"
     react-dom: ">=16.8.0"
-  checksum: c09a121e0c37f0dfb720e05f080b5f420eaec9bf1502cad38a100f2cefc731f50e854d682898163ad23aaefefcb505b57f4621b9724eca39d334258e0f25fddb
+  checksum: 5e8dafa3837eeb4a6909f463f92ac2dd4143a5db79bf03b3d1782759940e7de6fc459ac60d9f01c9ce2e37771e83d4894e236810a788b38eebf1f312659f2764
   languageName: node
   linkType: hard
 
@@ -18854,34 +19299,25 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@wry/context@npm:^0.7.0":
-  version: 0.7.0
-  resolution: "@wry/context@npm:0.7.0"
+"@wry/context@npm:^0.7.0, @wry/context@npm:^0.7.3":
+  version: 0.7.3
+  resolution: "@wry/context@npm:0.7.3"
   dependencies:
     tslib: ^2.3.0
-  checksum: f4ff78023a0b949122037aae766232b7d2284dc415204d22d9ea6d7969ff8f5f29b18128bc9a40e68dc054c8a12b1bf5868a357fdb50c398c447290c3a5b0496
+  checksum: 91c1e9eee9046c48ff857d60dcbb59f22246ce0f9bb2d9b190e0555227e7ba3f86024032cc057f3f5141d3bee93fc6b2a15ce2c79fa512569d3432eb8e1af02b
   languageName: node
   linkType: hard
 
-"@wry/equality@npm:^0.5.0":
-  version: 0.5.3
-  resolution: "@wry/equality@npm:0.5.3"
+"@wry/equality@npm:^0.5.6":
+  version: 0.5.6
+  resolution: "@wry/equality@npm:0.5.6"
   dependencies:
     tslib: ^2.3.0
-  checksum: 7ea8ded51462911217183b93cc3ffbb4d18dc02a62d4a79e0d9983463739bf54106aaeb25649bf33168120bd044b61d135018bfcf4fefad8099c13eac9238aa6
+  checksum: 9addf8891bdff5e23eecff03641846e7a56c1de3c9362c25e69c0b2ee3303e74b22e9a0376920283cd9d3bdd1bada12df54be5eaa29c2d801d33d94992672e14
   languageName: node
   linkType: hard
 
-"@wry/trie@npm:^0.3.0":
-  version: 0.3.2
-  resolution: "@wry/trie@npm:0.3.2"
-  dependencies:
-    tslib: ^2.3.0
-  checksum: 151d06b519e1ff1c3acf6ee6846161b1d7d50bbecd4c48e5cd1b05f9e37c30602aff02e88f20105f6e6c54ae4123f9c4eb7715044d7fd927d4ba4ec3e755cd36
-  languageName: node
-  linkType: hard
-
-"@wry/trie@npm:^0.4.0":
+"@wry/trie@npm:^0.4.3":
   version: 0.4.3
   resolution: "@wry/trie@npm:0.4.3"
   dependencies:
@@ -18890,10 +19326,10 @@ __metadata:
   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"
-  checksum: 66e37b7800132f891b885b2eceeeebc53f60b69789da10276f1584256b963d79a28c7ae2071bc53a9cd842d9b03554c761b2701fe8036d6052f26bcd0ae8f2bb
+"@xmldom/xmldom@npm:^0.7.0, @xmldom/xmldom@npm:^0.7.5, @xmldom/xmldom@npm:^0.7.6, @xmldom/xmldom@npm:^0.7.9":
+  version: 0.7.13
+  resolution: "@xmldom/xmldom@npm:0.7.13"
+  checksum: b4054078530e5fa8ede9677425deff0fce6d965f4c477ca73f8490d8a089e60b8498a15560425a1335f5ff99ecb851ed2c734b0a9a879299a5694302f212f37a
   languageName: node
   linkType: hard
 
@@ -19235,6 +19671,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"ansi-escapes@npm:^5.0.0":
+  version: 5.0.0
+  resolution: "ansi-escapes@npm:5.0.0"
+  dependencies:
+    type-fest: ^1.0.2
+  checksum: d4b5eb8207df38367945f5dd2ef41e08c28edc192dc766ef18af6b53736682f49d8bfcfa4e4d6ecbc2e2f97c258fda084fb29a9e43b69170b71090f771afccac
+  languageName: node
+  linkType: hard
+
 "ansi-html-community@npm:^0.0.8":
   version: 0.0.8
   resolution: "ansi-html-community@npm:0.0.8"
@@ -19251,17 +19696,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"ansi-regex@npm:^2.0.0":
-  version: 2.1.1
-  resolution: "ansi-regex@npm:2.1.1"
-  checksum: 190abd03e4ff86794f338a31795d262c1dfe8c91f7e01d04f13f646f1dcb16c5800818f886047876f1272f065570ab86b24b99089f8b68a0e11ff19aed4ca8f1
-  languageName: node
-  linkType: hard
-
 "ansi-regex@npm:^4.1.0":
-  version: 4.1.0
-  resolution: "ansi-regex@npm:4.1.0"
-  checksum: 97aa4659538d53e5e441f5ef2949a3cffcb838e57aeaad42c4194e9d7ddb37246a6526c4ca85d3940a9d1e19b11cc2e114530b54c9d700c8baf163c31779baf8
+  version: 4.1.1
+  resolution: "ansi-regex@npm:4.1.1"
+  checksum: b1a6ee44cb6ecdabaa770b2ed500542714d4395d71c7e5c25baa631f680fb2ad322eb9ba697548d498a6fd366949fc8b5bfcf48d49a32803611f648005b01888
   languageName: node
   linkType: hard
 
@@ -19321,6 +19759,23 @@ __metadata:
   languageName: node
   linkType: hard
 
+"app-next-example-plugin@workspace:^, app-next-example-plugin@workspace:packages/app-next-example-plugin":
+  version: 0.0.0-use.local
+  resolution: "app-next-example-plugin@workspace:packages/app-next-example-plugin"
+  dependencies:
+    "@backstage/cli": "workspace:^"
+    "@backstage/core-components": "workspace:^"
+    "@backstage/frontend-plugin-api": "workspace:^"
+    "@material-ui/icons": ^4.9.1
+    cross-fetch: ^3.1.5
+    msw: ^1.0.0
+  peerDependencies:
+    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
+  languageName: unknown
+  linkType: soft
+
 "append-field@npm:^1.0.0":
   version: 1.0.0
   resolution: "append-field@npm:1.0.0"
@@ -19328,13 +19783,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"aproba@npm:^1.0.3":
-  version: 1.2.0
-  resolution: "aproba@npm:1.2.0"
-  checksum: 0fca141966559d195072ed047658b6e6c4fe92428c385dd38e288eacfc55807e7b4989322f030faff32c0f46bb0bc10f1e0ac32ec22d25315a1e5bbc0ebb76dc
-  languageName: node
-  linkType: hard
-
 "aproba@npm:^1.0.3 || ^2.0.0":
   version: 2.0.0
   resolution: "aproba@npm:2.0.0"
@@ -19368,17 +19816,17 @@ __metadata:
   linkType: hard
 
 "archiver@npm:^5.0.2, archiver@npm:^5.3.1":
-  version: 5.3.1
-  resolution: "archiver@npm:5.3.1"
+  version: 5.3.2
+  resolution: "archiver@npm:5.3.2"
   dependencies:
     archiver-utils: ^2.1.0
-    async: ^3.2.3
+    async: ^3.2.4
     buffer-crc32: ^0.2.1
     readable-stream: ^3.6.0
-    readdir-glob: ^1.0.0
+    readdir-glob: ^1.1.2
     tar-stream: ^2.2.0
     zip-stream: ^4.1.0
-  checksum: 905b198ed04d26c951b80545d45c7f2e0432ef89977a93af8a762501d659886e39dda0fbffb0d517ff3fa450a3d09a29146e4273c2170624e1988f889fb5302c
+  checksum: 7d3b9b9b51cf54d88c89fbca9b0847c120bfcf9776c7025c52dd0b62f6603dc63dc0f3f1a09582f936f67e3906b46d58954cc762a255be45e8d3e14e3cb0b0b1
   languageName: node
   linkType: hard
 
@@ -19402,16 +19850,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"are-we-there-yet@npm:~1.1.2":
-  version: 1.1.5
-  resolution: "are-we-there-yet@npm:1.1.5"
-  dependencies:
-    delegates: ^1.0.0
-    readable-stream: ^2.0.6
-  checksum: 9a746b1dbce4122f44002b0c39fbba5b2c6f52c00e88b6ccba6fc68652323f8a1355a20e8ab94846995626d8de3bf67669a3b4a037dff0885db14607168f2b15
-  languageName: node
-  linkType: hard
-
 "arg@npm:^4.1.0":
   version: 4.1.3
   resolution: "arg@npm:4.1.3"
@@ -19463,6 +19901,16 @@ __metadata:
   languageName: node
   linkType: hard
 
+"array-buffer-byte-length@npm:^1.0.0":
+  version: 1.0.0
+  resolution: "array-buffer-byte-length@npm:1.0.0"
+  dependencies:
+    call-bind: ^1.0.2
+    is-array-buffer: ^3.0.1
+  checksum: 044e101ce150f4804ad19c51d6c4d4cfa505c5b2577bd179256e4aa3f3f6a0a5e9874c78cd428ee566ac574c8a04d7ce21af9fe52e844abfdccb82b33035a7c3
+  languageName: node
+  linkType: hard
+
 "array-differ@npm:^3.0.0":
   version: 3.0.0
   resolution: "array-differ@npm:3.0.0"
@@ -19511,6 +19959,19 @@ __metadata:
   languageName: node
   linkType: hard
 
+"array.prototype.findlastindex@npm:^1.2.2":
+  version: 1.2.2
+  resolution: "array.prototype.findlastindex@npm:1.2.2"
+  dependencies:
+    call-bind: ^1.0.2
+    define-properties: ^1.1.4
+    es-abstract: ^1.20.4
+    es-shim-unscopables: ^1.0.0
+    get-intrinsic: ^1.1.3
+  checksum: 8a166359f69a2a751c843f26b9c8cd03d0dc396a92cdcb85f4126b5f1cecdae5b2c0c616a71ea8aff026bde68165b44950b3664404bb73db0673e288495ba264
+  languageName: node
+  linkType: hard
+
 "array.prototype.flat@npm:^1.2.3, array.prototype.flat@npm:^1.3.1":
   version: 1.3.1
   resolution: "array.prototype.flat@npm:1.3.1"
@@ -19548,6 +20009,20 @@ __metadata:
   languageName: node
   linkType: hard
 
+"arraybuffer.prototype.slice@npm:^1.0.1":
+  version: 1.0.1
+  resolution: "arraybuffer.prototype.slice@npm:1.0.1"
+  dependencies:
+    array-buffer-byte-length: ^1.0.0
+    call-bind: ^1.0.2
+    define-properties: ^1.2.0
+    get-intrinsic: ^1.2.1
+    is-array-buffer: ^3.0.2
+    is-shared-array-buffer: ^1.0.2
+  checksum: e3e9b2a3e988ebfeddce4c7e8f69df730c9e48cb04b0d40ff0874ce3d86b3d1339dd520ffde5e39c02610bc172ecfbd4bc93324b1cabd9554c44a56b131ce0ce
+  languageName: node
+  linkType: hard
+
 "arrify@npm:^1.0.1":
   version: 1.0.1
   resolution: "arrify@npm:1.0.1"
@@ -19686,10 +20161,19 @@ __metadata:
   languageName: node
   linkType: hard
 
-"async@npm:^3.2.0, async@npm:^3.2.3":
-  version: 3.2.3
-  resolution: "async@npm:3.2.3"
-  checksum: c4bee57ab2249af3dc83ca3ef9acfa8e822c0d5e5aa41bae3eaf7f673648343cd64ecd7d26091ffd357f3f044428b17b5f00098494b6cf8b6b3e9681f0636ca1
+"async@npm:^3.2.0, async@npm:^3.2.3, async@npm:^3.2.4":
+  version: 3.2.4
+  resolution: "async@npm:3.2.4"
+  checksum: 43d07459a4e1d09b84a20772414aa684ff4de085cbcaec6eea3c7a8f8150e8c62aa6cd4e699fe8ee93c3a5b324e777d34642531875a0817a35697522c1b02e89
+  languageName: node
+  linkType: hard
+
+"asynciterator.prototype@npm:^1.0.0":
+  version: 1.0.0
+  resolution: "asynciterator.prototype@npm:1.0.0"
+  dependencies:
+    has-symbols: ^1.0.3
+  checksum: e8ebfd9493ac651cf9b4165e9d64030b3da1d17181bb1963627b59e240cdaf021d9b59d44b827dc1dde4e22387ec04c2d0f8720cf58a1c282e34e40cc12721b3
   languageName: node
   linkType: hard
 
@@ -19822,13 +20306,13 @@ __metadata:
   linkType: hard
 
 "axios@npm:^1.4.0":
-  version: 1.4.0
-  resolution: "axios@npm:1.4.0"
+  version: 1.5.0
+  resolution: "axios@npm:1.5.0"
   dependencies:
     follow-redirects: ^1.15.0
     form-data: ^4.0.0
     proxy-from-env: ^1.1.0
-  checksum: 7fb6a4313bae7f45e89d62c70a800913c303df653f19eafec88e56cea2e3821066b8409bc68be1930ecca80e861c52aa787659df0ffec6ad4d451c7816b9386b
+  checksum: e7405a5dbbea97760d0e6cd58fecba311b0401ddb4a8efbc4108f5537da9b3f278bde566deb777935a960beec4fa18e7b8353881f2f465e4f2c0e949fead35be
   languageName: node
   linkType: hard
 
@@ -19877,15 +20361,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"babel-plugin-dynamic-import-node@npm:^2.3.3":
-  version: 2.3.3
-  resolution: "babel-plugin-dynamic-import-node@npm:2.3.3"
-  dependencies:
-    object.assign: ^4.1.0
-  checksum: c9d24415bcc608d0db7d4c8540d8002ac2f94e2573d2eadced137a29d9eab7e25d2cbb4bc6b9db65cf6ee7430f7dd011d19c911a9a778f0533b4a05ce8292c9b
-  languageName: node
-  linkType: hard
-
 "babel-plugin-istanbul@npm:^6.1.1":
   version: 6.1.1
   resolution: "babel-plugin-istanbul@npm:6.1.1"
@@ -19922,39 +20397,39 @@ __metadata:
   languageName: node
   linkType: hard
 
-"babel-plugin-polyfill-corejs2@npm:^0.3.1":
-  version: 0.3.1
-  resolution: "babel-plugin-polyfill-corejs2@npm:0.3.1"
+"babel-plugin-polyfill-corejs2@npm:^0.4.5":
+  version: 0.4.5
+  resolution: "babel-plugin-polyfill-corejs2@npm:0.4.5"
   dependencies:
-    "@babel/compat-data": ^7.13.11
-    "@babel/helper-define-polyfill-provider": ^0.3.1
-    semver: ^6.1.1
+    "@babel/compat-data": ^7.22.6
+    "@babel/helper-define-polyfill-provider": ^0.4.2
+    semver: ^6.3.1
   peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: ca873f14ccd6d2942013345a956de8165d0913556ec29756a748157140f5312f79eed487674e0ca562285880f05829b3712d72e1e4b412c2ce46bd6a50b4b975
+    "@babel/core": ^7.4.0 || ^8.0.0-0 <8.0.0
+  checksum: 33a8e06aa54e2858d211c743d179f0487b03222f9ca1bfd7c4865bca243fca942a3358cb75f6bb894ed476cbddede834811fbd6903ff589f055821146f053e1a
   languageName: node
   linkType: hard
 
-"babel-plugin-polyfill-corejs3@npm:^0.5.2":
+"babel-plugin-polyfill-corejs3@npm:^0.8.3":
+  version: 0.8.3
+  resolution: "babel-plugin-polyfill-corejs3@npm:0.8.3"
+  dependencies:
+    "@babel/helper-define-polyfill-provider": ^0.4.2
+    core-js-compat: ^3.31.0
+  peerDependencies:
+    "@babel/core": ^7.4.0 || ^8.0.0-0 <8.0.0
+  checksum: dcbb30e551702a82cfd4d2c375da2c317658e55f95e9edcda93b9bbfdcc8fb6e5344efcb144e04d3406859e7682afce7974c60ededd9f12072a48a83dd22a0da
+  languageName: node
+  linkType: hard
+
+"babel-plugin-polyfill-regenerator@npm:^0.5.2":
   version: 0.5.2
-  resolution: "babel-plugin-polyfill-corejs3@npm:0.5.2"
+  resolution: "babel-plugin-polyfill-regenerator@npm:0.5.2"
   dependencies:
-    "@babel/helper-define-polyfill-provider": ^0.3.1
-    core-js-compat: ^3.21.0
+    "@babel/helper-define-polyfill-provider": ^0.4.2
   peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: 2f3184c73f80f00ac876a5ebcad945fd8d2ae70e5f85b7ab6cc3bc69bc74025f4f7070de7abbb2a7274c78e130bd34fc13f4c85342da28205930364a1ef0aa21
-  languageName: node
-  linkType: hard
-
-"babel-plugin-polyfill-regenerator@npm:^0.3.1":
-  version: 0.3.1
-  resolution: "babel-plugin-polyfill-regenerator@npm:0.3.1"
-  dependencies:
-    "@babel/helper-define-polyfill-provider": ^0.3.1
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: f1473df7b700d6795ca41301b1e65a0aff15ce6c1463fc0ce2cf0c821114b0330920f59d4cebf52976363ee817ba29ad2758544a4661a724b08191080b9fe1da
+    "@babel/core": ^7.4.0 || ^8.0.0-0 <8.0.0
+  checksum: d962200f604016a9a09bc9b4aaf60a3db7af876bb65bcefaeac04d44ac9d9ec4037cf24ce117760cc141d7046b6394c7eb0320ba9665cb4a2ee64df2be187c93
   languageName: node
   linkType: hard
 
@@ -20198,13 +20673,13 @@ __metadata:
   linkType: hard
 
 "better-sqlite3@npm:^8.0.0":
-  version: 8.5.0
-  resolution: "better-sqlite3@npm:8.5.0"
+  version: 8.6.0
+  resolution: "better-sqlite3@npm:8.6.0"
   dependencies:
     bindings: ^1.5.0
     node-gyp: latest
-    prebuild-install: ^7.1.0
-  checksum: 98243cb08a410fad0b5c443410428c8ea00376a4eb7d2c9a8a5a695970bc7a2a4007221930460939594d728e7d6bcb1889f46ec11a3bbb2257b996c80fbaacb1
+    prebuild-install: ^7.1.1
+  checksum: 9ebdfd675352347cda1ba30d620a3c512d9db827a1eba66460fd48203a7ad8138b0195893bbf47d40f704bcdd598710041271d4ed69779979b6f784c0d3579a1
   languageName: node
   linkType: hard
 
@@ -20310,7 +20785,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"bluebird@npm:3.7.2, bluebird@npm:^3.3.5, bluebird@npm:^3.5.5, bluebird@npm:^3.7.2":
+"bluebird@npm:3.7.2, bluebird@npm:^3.5.5, bluebird@npm:^3.7.2":
   version: 3.7.2
   resolution: "bluebird@npm:3.7.2"
   checksum: 869417503c722e7dc54ca46715f70e15f4d9c602a423a02c825570862d12935be59ed9c7ba34a9b31f186c017c23cac6b54e35446f8353059c101da73eac22ef
@@ -20324,6 +20799,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"body-parser-xml@npm:^2.0.5":
+  version: 2.0.5
+  resolution: "body-parser-xml@npm:2.0.5"
+  dependencies:
+    xml2js: ^0.5.0
+  checksum: 57133dbe6439f74f2ffb814b54ab806596a31c51e0d93e045b3068402ae184d4fcb799b2966414d1f393f8dcc8342529d4d3ce4cdeaa219c3af140d961c56dfd
+  languageName: node
+  linkType: hard
+
 "body-parser@npm:1.20.1":
   version: 1.20.1
   resolution: "body-parser@npm:1.20.1"
@@ -20540,17 +21024,17 @@ __metadata:
   languageName: node
   linkType: hard
 
-"browserslist@npm:^4.0.0, browserslist@npm:^4.14.5, browserslist@npm:^4.16.0, browserslist@npm:^4.16.6, browserslist@npm:^4.18.1, browserslist@npm:^4.21.2, browserslist@npm:^4.21.3":
-  version: 4.21.4
-  resolution: "browserslist@npm:4.21.4"
+"browserslist@npm:^4.0.0, browserslist@npm:^4.14.5, browserslist@npm:^4.16.0, browserslist@npm:^4.16.6, browserslist@npm:^4.18.1, browserslist@npm:^4.21.10, browserslist@npm:^4.21.9":
+  version: 4.21.10
+  resolution: "browserslist@npm:4.21.10"
   dependencies:
-    caniuse-lite: ^1.0.30001400
-    electron-to-chromium: ^1.4.251
-    node-releases: ^2.0.6
-    update-browserslist-db: ^1.0.9
+    caniuse-lite: ^1.0.30001517
+    electron-to-chromium: ^1.4.477
+    node-releases: ^2.0.13
+    update-browserslist-db: ^1.0.11
   bin:
     browserslist: cli.js
-  checksum: 4af3793704dbb4615bcd29059ab472344dc7961c8680aa6c4bb84f05340e14038d06a5aead58724eae69455b8fade8b8c69f1638016e87e5578969d74c078b79
+  checksum: 1e27c0f111a35d1dd0e8fc2c61781b0daefabc2c9471b0b10537ce54843014bceb2a1ce4571af1a82b2bf1e6e6e05d38865916689a158f03bc2c7a4ec2577db8
   languageName: node
   linkType: hard
 
@@ -20850,13 +21334,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"camelcase@npm:^3.0.0":
-  version: 3.0.0
-  resolution: "camelcase@npm:3.0.0"
-  checksum: ae4fe1c17c8442a3a345a6b7d2393f028ab7a7601af0c352ad15d1ab97ca75112e19e29c942b2a214898e160194829b68923bce30e018d62149c6d84187f1673
-  languageName: node
-  linkType: hard
-
 "camelcase@npm:^5.0.0, camelcase@npm:^5.3.1":
   version: 5.3.1
   resolution: "camelcase@npm:5.3.1"
@@ -20890,10 +21367,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"caniuse-lite@npm:^1.0.0, caniuse-lite@npm:^1.0.30001400":
-  version: 1.0.30001407
-  resolution: "caniuse-lite@npm:1.0.30001407"
-  checksum: e1c449d22f120a708accc956c1780f1da01af6c226cb6a324e531dc9f26f53075bff98e6c9cfce806157cdeede459aa8de03a3407b05f71d292a57b2910018b1
+"caniuse-lite@npm:^1.0.0, caniuse-lite@npm:^1.0.30001517":
+  version: 1.0.30001523
+  resolution: "caniuse-lite@npm:1.0.30001523"
+  checksum: 3a007dc8147d4b5a6c22661d424e6d4e4e9595d0dcb279d25b93161cc7d54363eb12d053f40a186ba7e42a8bc4f59e6e121474b7aa339bf7ec200258400d39bc
   languageName: node
   linkType: hard
 
@@ -20943,7 +21420,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"chalk@npm:2.4.2, chalk@npm:^2.0.0, chalk@npm:^2.1.0, chalk@npm:^2.3.2":
+"chalk@npm:2.4.2, chalk@npm:^2.1.0, chalk@npm:^2.3.2, chalk@npm:^2.4.2":
   version: 2.4.2
   resolution: "chalk@npm:2.4.2"
   dependencies:
@@ -20954,16 +21431,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"chalk@npm:4.1.1":
-  version: 4.1.1
-  resolution: "chalk@npm:4.1.1"
-  dependencies:
-    ansi-styles: ^4.1.0
-    supports-color: ^7.1.0
-  checksum: 036e973e665ba1a32c975e291d5f3d549bceeb7b1b983320d4598fb75d70fe20c5db5d62971ec0fe76cdbce83985a00ee42372416abfc3a5584465005a7855ed
-  languageName: node
-  linkType: hard
-
 "chalk@npm:4.1.2, chalk@npm:^4.0.0, chalk@npm:^4.0.2, chalk@npm:^4.1.0, chalk@npm:^4.1.1, chalk@npm:^4.1.2":
   version: 4.1.2
   resolution: "chalk@npm:4.1.2"
@@ -20974,10 +21441,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"chalk@npm:5.2.0":
-  version: 5.2.0
-  resolution: "chalk@npm:5.2.0"
-  checksum: 03d8060277de6cf2fd567dc25fcf770593eb5bb85f460ce443e49255a30ff1242edd0c90a06a03803b0466ff0687a939b41db1757bec987113e83de89a003caa
+"chalk@npm:5.3.0":
+  version: 5.3.0
+  resolution: "chalk@npm:5.3.0"
+  checksum: 623922e077b7d1e9dedaea6f8b9e9352921f8ae3afe739132e0e00c275971bdd331268183b2628cf4ab1727c45ea1f28d7e24ac23ce1db1eb653c414ca8a5a80
   languageName: node
   linkType: hard
 
@@ -21157,17 +21624,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"ci-info@npm:^2.0.0":
-  version: 2.0.0
-  resolution: "ci-info@npm:2.0.0"
-  checksum: 3b374666a85ea3ca43fa49aa3a048d21c9b475c96eb13c133505d2324e7ae5efd6a454f41efe46a152269e9b6a00c9edbe63ec7fa1921957165aae16625acd67
-  languageName: node
-  linkType: hard
-
-"ci-info@npm:^3.1.0, ci-info@npm:^3.2.0":
-  version: 3.3.2
-  resolution: "ci-info@npm:3.3.2"
-  checksum: fd81f1edd2d3b0f6cb077b2e84365136d87b9db8c055928c1ad69da8a76c2c2f19cba8ea51b90238302157ca927f91f92b653e933f2398dde4867500f08d6e62
+"ci-info@npm:^3.1.0, ci-info@npm:^3.2.0, ci-info@npm:^3.7.0":
+  version: 3.8.0
+  resolution: "ci-info@npm:3.8.0"
+  checksum: d0a4d3160497cae54294974a7246202244fff031b0a6ea20dd57b10ec510aa17399c41a1b0982142c105f3255aff2173e5c0dd7302ee1b2f28ba3debda375098
   languageName: node
   linkType: hard
 
@@ -21245,6 +21705,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"cli-cursor@npm:^4.0.0":
+  version: 4.0.0
+  resolution: "cli-cursor@npm:4.0.0"
+  dependencies:
+    restore-cursor: ^4.0.0
+  checksum: ab3f3ea2076e2176a1da29f9d64f72ec3efad51c0960898b56c8a17671365c26e67b735920530eaf7328d61f8bd41c27f46b9cf6e4e10fe2fa44b5e8c0e392cc
+  languageName: node
+  linkType: hard
+
 "cli-spinners@npm:^2.5.0":
   version: 2.5.0
   resolution: "cli-spinners@npm:2.5.0"
@@ -21301,6 +21770,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"client-only@npm:^0.0.1":
+  version: 0.0.1
+  resolution: "client-only@npm:0.0.1"
+  checksum: 0c16bf660dadb90610553c1d8946a7fdfb81d624adea073b8440b7d795d5b5b08beb3c950c6a2cf16279365a3265158a236876d92bce16423c485c322d7dfaf8
+  languageName: node
+  linkType: hard
+
 "clipboard@npm:^2.0.4":
   version: 2.0.11
   resolution: "clipboard@npm:2.0.11"
@@ -21323,17 +21799,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"cliui@npm:^3.2.0":
-  version: 3.2.0
-  resolution: "cliui@npm:3.2.0"
-  dependencies:
-    string-width: ^1.0.1
-    strip-ansi: ^3.0.1
-    wrap-ansi: ^2.0.0
-  checksum: c68d1dbc3e347bfe79ed19cc7f48007d5edd6cd8438342e32073e0b4e311e3c44e1f4f19221462bc6590de56c2df520e427533a9dde95dee25710bec322746ad
-  languageName: node
-  linkType: hard
-
 "cliui@npm:^6.0.0":
   version: 6.0.0
   resolution: "cliui@npm:6.0.0"
@@ -21345,6 +21810,17 @@ __metadata:
   languageName: node
   linkType: hard
 
+"cliui@npm:^8.0.1":
+  version: 8.0.1
+  resolution: "cliui@npm:8.0.1"
+  dependencies:
+    string-width: ^4.2.0
+    strip-ansi: ^6.0.1
+    wrap-ansi: ^7.0.0
+  checksum: 79648b3b0045f2e285b76fb2e24e207c6db44323581e421c3acbd0e86454cba1b37aea976ab50195a49e7384b871e6dfb2247ad7dec53c02454ac6497394cb56
+  languageName: node
+  linkType: hard
+
 "clone-buffer@npm:^1.0.0":
   version: 1.0.0
   resolution: "clone-buffer@npm:1.0.0"
@@ -21404,13 +21880,20 @@ __metadata:
   languageName: node
   linkType: hard
 
-"clsx@npm:^1.0.2, clsx@npm:^1.0.4, clsx@npm:^1.1.1, clsx@npm:^1.2.1":
+"clsx@npm:^1.0.2, clsx@npm:^1.0.4, clsx@npm:^1.1.1":
   version: 1.2.1
   resolution: "clsx@npm:1.2.1"
   checksum: 30befca8019b2eb7dbad38cff6266cf543091dae2825c856a62a8ccf2c3ab9c2907c4d12b288b73101196767f66812365400a227581484a05f968b0307cfaf12
   languageName: node
   linkType: hard
 
+"clsx@npm:^2.0.0":
+  version: 2.0.0
+  resolution: "clsx@npm:2.0.0"
+  checksum: a2cfb2351b254611acf92faa0daf15220f4cd648bdf96ce369d729813b85336993871a4bf6978ddea2b81b5a130478339c20d9d0b5c6fc287e5147f0c059276e
+  languageName: node
+  linkType: hard
+
 "cluster-key-slot@npm:^1.1.0":
   version: 1.1.0
   resolution: "cluster-key-slot@npm:1.1.0"
@@ -21448,13 +21931,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"code-point-at@npm:^1.0.0":
-  version: 1.1.0
-  resolution: "code-point-at@npm:1.1.0"
-  checksum: 17d5666611f9b16d64fdf48176d9b7fb1c7d1c1607a189f7e600040a11a6616982876af148230336adb7d8fe728a559f743a4e29db3747e3b1a32fa7f4529681
-  languageName: node
-  linkType: hard
-
 "codemirror-graphql@npm:^1.3.2":
   version: 1.3.2
   resolution: "codemirror-graphql@npm:1.3.2"
@@ -21594,13 +22070,20 @@ __metadata:
   languageName: node
   linkType: hard
 
-"colorette@npm:2.0.19, colorette@npm:^2.0.10, colorette@npm:^2.0.16, colorette@npm:^2.0.19":
+"colorette@npm:2.0.19":
   version: 2.0.19
   resolution: "colorette@npm:2.0.19"
   checksum: 888cf5493f781e5fcf54ce4d49e9d7d698f96ea2b2ef67906834bb319a392c667f9ec69f4a10e268d2946d13a9503d2d19b3abaaaf174e3451bfe91fb9d82427
   languageName: node
   linkType: hard
 
+"colorette@npm:^2.0.10, colorette@npm:^2.0.16, colorette@npm:^2.0.20":
+  version: 2.0.20
+  resolution: "colorette@npm:2.0.20"
+  checksum: 0c016fea2b91b733eb9f4bcdb580018f52c0bc0979443dad930e5037a968237ac53d9beb98e218d2e9235834f8eebce7f8e080422d6194e957454255bde71d3d
+  languageName: node
+  linkType: hard
+
 "colors@npm:1.0.3":
   version: 1.0.3
   resolution: "colors@npm:1.0.3"
@@ -21662,10 +22145,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"commander@npm:*, commander@npm:^10.0.0":
-  version: 10.0.0
-  resolution: "commander@npm:10.0.0"
-  checksum: 9f6495651f878213005ac744dd87a85fa3d9f2b8b90d1c19d0866d666bda7f735adfd7c2f10dfff345782e2f80ea258f98bb4efcef58e4e502f25f883940acfd
+"commander@npm:*, commander@npm:11.0.0":
+  version: 11.0.0
+  resolution: "commander@npm:11.0.0"
+  checksum: 6621954e1e1d078b4991c1f5bbd9439ad37aa7768d6ab4842de1dbd4d222c8a27e1b8e62108b3a92988614af45031d5bb2a2aaa92951f4d0c934d1a1ac564bb4
   languageName: node
   linkType: hard
 
@@ -21901,23 +22384,23 @@ __metadata:
   languageName: node
   linkType: hard
 
-"concurrently@npm:^7.0.0":
-  version: 7.6.0
-  resolution: "concurrently@npm:7.6.0"
+"concurrently@npm:^8.0.0":
+  version: 8.2.1
+  resolution: "concurrently@npm:8.2.1"
   dependencies:
-    chalk: ^4.1.0
-    date-fns: ^2.29.1
+    chalk: ^4.1.2
+    date-fns: ^2.30.0
     lodash: ^4.17.21
-    rxjs: ^7.0.0
-    shell-quote: ^1.7.3
-    spawn-command: ^0.0.2-1
-    supports-color: ^8.1.0
+    rxjs: ^7.8.1
+    shell-quote: ^1.8.1
+    spawn-command: 0.0.2
+    supports-color: ^8.1.1
     tree-kill: ^1.2.2
-    yargs: ^17.3.1
+    yargs: ^17.7.2
   bin:
     conc: dist/bin/concurrently.js
     concurrently: dist/bin/concurrently.js
-  checksum: f705c9a7960f1b16559ca64958043faeeef6385c0bf30a03d1375e15ab2d96dba4f8166f1bbbb1c85e8da35ca0ce3c353875d71dff2aa132b2357bb533b3332e
+  checksum: 216cb16d5b301cbd9c657b19430836d1686fe8fa9b9ef35ef7ac601e1a5cf6535166a3e57de446696dbd5e7e3f45d78fc70f33c5fd4bb565342cd5e752c5b069
   languageName: node
   linkType: hard
 
@@ -21952,7 +22435,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"console-control-strings@npm:^1.0.0, console-control-strings@npm:^1.1.0, console-control-strings@npm:~1.1.0":
+"console-control-strings@npm:^1.0.0, console-control-strings@npm:^1.1.0":
   version: 1.1.0
   resolution: "console-control-strings@npm:1.1.0"
   checksum: 8755d76787f94e6cf79ce4666f0c5519906d7f5b02d4b884cf41e11dcd759ed69c57da0670afd9236d229a46e0f9cf519db0cd829c6dca820bb5a5c3def584ed
@@ -22034,7 +22517,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"cookie-parser@npm:^1.4.5":
+"cookie-parser@npm:^1.4.5, cookie-parser@npm:^1.4.6":
   version: 1.4.6
   resolution: "cookie-parser@npm:1.4.6"
   dependencies:
@@ -22088,13 +22571,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"core-js-compat@npm:^3.21.0, core-js-compat@npm:^3.22.1":
-  version: 3.23.5
-  resolution: "core-js-compat@npm:3.23.5"
+"core-js-compat@npm:^3.31.0":
+  version: 3.32.1
+  resolution: "core-js-compat@npm:3.32.1"
   dependencies:
-    browserslist: ^4.21.2
-    semver: 7.0.0
-  checksum: c2398a39239a782ba1b9531a80b25f8d9fb8d98de8bf980f32140e9be3d2852afb797517afdf3a15f9319bcd25d594b3d3d2a500dce7c338532532565c9e83cb
+    browserslist: ^4.21.10
+  checksum: 2ce0002d6d2acabfc6f4c1ea32915683406a10051a186db354b761303cb6f5728f83887d070fb8d0072b5601bb16cb0d24555ee72bfa6df244f7b3ef74d61f76
   languageName: node
   linkType: hard
 
@@ -22120,9 +22602,9 @@ __metadata:
   linkType: hard
 
 "core-js@npm:^3.26.0, core-js@npm:^3.6.5":
-  version: 3.31.0
-  resolution: "core-js@npm:3.31.0"
-  checksum: f7cf9b3010f7ca99c026d95b61743baca1a85512742ed2b67e8f65a72ac4f4fe0b90b00057783e886bdd39d3a295f42f845d33e7cba3973ed263df978343ab79
+  version: 3.32.1
+  resolution: "core-js@npm:3.32.1"
+  checksum: e4af91d9c6be7b59235feb3f273d16705126ce09a0b4a787144d131d874f0cd10be3c24fc52e5eea7d7cb03ceabe4be7b255abcd9474b5eb1ff365d2c5611f9a
   languageName: node
   linkType: hard
 
@@ -22265,20 +22747,21 @@ __metadata:
   linkType: hard
 
 "cron@npm:^2.0.0":
-  version: 2.3.1
-  resolution: "cron@npm:2.3.1"
+  version: 2.4.3
+  resolution: "cron@npm:2.4.3"
   dependencies:
-    luxon: ^3.2.1
-  checksum: ac27c257cb8dba4b51978b4767119fc79bfc0dfa35ef0be2533bc4142ae006130515236e2102d04ee3ce44bffc2a4e37a3bee18a2152bbb303bf5ff944e25204
+    "@types/luxon": ~3.3.0
+    luxon: ~3.3.0
+  checksum: cb0ad49653b37ba125f8670ca92150ce515493512b1b8a5e08086d22bec9c54dc6d8926fcdb49ea5783f6699862ca5fdc532a440ce33c3228f9b3d565010db2f
   languageName: node
   linkType: hard
 
 "cronstrue@npm:^2.2.0":
-  version: 2.27.0
-  resolution: "cronstrue@npm:2.27.0"
+  version: 2.31.0
+  resolution: "cronstrue@npm:2.31.0"
   bin:
     cronstrue: bin/cli.js
-  checksum: 310d933c4448896519c203a434dc1ede7029967df941e810f02bafb62146045c16df4987edde344d757bafb6d45f63c9ecb7385df19b985ca91486f4efa6ff7b
+  checksum: 8001433f65751ccd471497be14924dfecd6b91992d615ec7de1fec978792e4a3ab977d05874bea7b6a478dc786ea775554735126c79c8bbe3c94535f20ebebab
   languageName: node
   linkType: hard
 
@@ -22323,19 +22806,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"cross-spawn@npm:^6.0.5":
-  version: 6.0.5
-  resolution: "cross-spawn@npm:6.0.5"
-  dependencies:
-    nice-try: ^1.0.4
-    path-key: ^2.0.1
-    semver: ^5.5.0
-    shebang-command: ^1.2.0
-    which: ^1.2.9
-  checksum: f893bb0d96cd3d5751d04e67145bdddf25f99449531a72e82dcbbd42796bbc8268c1076c6b3ea51d4d455839902804b94bc45dfb37ecbb32ea8e54a6741c3ab9
-  languageName: node
-  linkType: hard
-
 "cross-spawn@npm:^7.0.0, cross-spawn@npm:^7.0.1, cross-spawn@npm:^7.0.2, cross-spawn@npm:^7.0.3":
   version: 7.0.3
   resolution: "cross-spawn@npm:7.0.3"
@@ -22953,17 +23423,19 @@ __metadata:
   languageName: node
   linkType: hard
 
-"dataloader@npm:2.2.2, dataloader@npm:^2.0.0, dataloader@npm:^2.2.2":
+"dataloader@npm:^2.0.0, dataloader@npm:^2.2.2":
   version: 2.2.2
   resolution: "dataloader@npm:2.2.2"
   checksum: 4dabd247089c29f194e94d5434d504f99156c5c214a03463c20f3f17f40398d7e179edee69a27c16e315519ac8739042a810090087ae26449a0e685156a02c65
   languageName: node
   linkType: hard
 
-"date-fns@npm:^2.16.1, date-fns@npm:^2.18.0, date-fns@npm:^2.29.1":
-  version: 2.29.3
-  resolution: "date-fns@npm:2.29.3"
-  checksum: e01cf5b62af04e05dfff921bb9c9933310ed0e1ae9a81eb8653452e64dc841acf7f6e01e1a5ae5644d0337e9a7f936175fd2cb6819dc122fdd9c5e86c56be484
+"date-fns@npm:^2.16.1, date-fns@npm:^2.18.0, date-fns@npm:^2.30.0":
+  version: 2.30.0
+  resolution: "date-fns@npm:2.30.0"
+  dependencies:
+    "@babel/runtime": ^7.21.0
+  checksum: f7be01523282e9bb06c0cd2693d34f245247a29098527d4420628966a2d9aad154bd0e90a6b1cf66d37adcb769cd108cf8a7bd49d76db0fb119af5cdd13644f4
   languageName: node
   linkType: hard
 
@@ -23042,7 +23514,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"decamelize@npm:^1.1.0, decamelize@npm:^1.1.1, decamelize@npm:^1.2.0":
+"decamelize@npm:^1.1.0, decamelize@npm:^1.2.0":
   version: 1.2.0
   resolution: "decamelize@npm:1.2.0"
   checksum: ad8c51a7e7e0720c70ec2eeb1163b66da03e7616d7b98c9ef43cce2416395e84c1e9548dd94f5f6ffecfee9f8b94251fc57121a8b021f2ff2469b2bae247b8aa
@@ -23189,19 +23661,19 @@ __metadata:
   languageName: node
   linkType: hard
 
-"define-properties@npm:^1.1.3, define-properties@npm:^1.1.4":
-  version: 1.1.4
-  resolution: "define-properties@npm:1.1.4"
+"define-properties@npm:^1.1.3, define-properties@npm:^1.1.4, define-properties@npm:^1.2.0":
+  version: 1.2.0
+  resolution: "define-properties@npm:1.2.0"
   dependencies:
     has-property-descriptors: ^1.0.0
     object-keys: ^1.1.1
-  checksum: ce0aef3f9eb193562b5cfb79b2d2c86b6a109dfc9fdcb5f45d680631a1a908c06824ddcdb72b7573b54e26ace07f0a23420aaba0d5c627b34d2c1de8ef527e2b
+  checksum: e60aee6a19b102df4e2b1f301816804e81ab48bb91f00d0d935f269bf4b3f79c88b39e4f89eaa132890d23267335fd1140dfcd8d5ccd61031a0a2c41a54e33a6
   languageName: node
   linkType: hard
 
 "del@npm:^7.0.0":
-  version: 7.0.0
-  resolution: "del@npm:7.0.0"
+  version: 7.1.0
+  resolution: "del@npm:7.1.0"
   dependencies:
     globby: ^13.1.2
     graceful-fs: ^4.2.10
@@ -23211,7 +23683,7 @@ __metadata:
     p-map: ^5.5.0
     rimraf: ^3.0.2
     slash: ^4.0.0
-  checksum: 33e5077f18b5dfbe81971d1f8a2cd8bf676dd5ede491bab85ec17a4a1d59001bd3ec47fd38e9a4ae01a3c98c07b98c7b3dc56190b86d88926798802d7858d827
+  checksum: 93527e78e95125809ff20a112814b00648ed64af204be1a565862698060c9ec8f5c5fe1a4866725acfde9b0da6423f4b7a7642c1d38cd4b05cbeb643a7b089e3
   languageName: node
   linkType: hard
 
@@ -23309,15 +23781,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"detect-libc@npm:^1.0.3":
-  version: 1.0.3
-  resolution: "detect-libc@npm:1.0.3"
-  bin:
-    detect-libc: ./bin/detect-libc.js
-  checksum: daaaed925ffa7889bd91d56e9624e6c8033911bb60f3a50a74a87500680652969dbaab9526d1e200a4c94acf80fc862a22131841145a0a8482d60a99c24f4a3e
-  languageName: node
-  linkType: hard
-
 "detect-libc@npm:^2.0.0, detect-libc@npm:^2.0.1":
   version: 2.0.1
   resolution: "detect-libc@npm:2.0.1"
@@ -23376,10 +23839,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"diff-sequences@npm:^29.4.3":
-  version: 29.4.3
-  resolution: "diff-sequences@npm:29.4.3"
-  checksum: 28b265e04fdddcf7f9f814effe102cc95a9dec0564a579b5aed140edb24fc345c611ca52d76d725a3cab55d3888b915b5e8a4702e0f6058968a90fa5f41fcde7
+"diff-sequences@npm:^29.6.3":
+  version: 29.6.3
+  resolution: "diff-sequences@npm:29.6.3"
+  checksum: f4914158e1f2276343d98ff5b31fc004e7304f5470bf0f1adb2ac6955d85a531a6458d33e87667f98f6ae52ebd3891bb47d420bb48a5bd8b7a27ee25b20e33aa
   languageName: node
   linkType: hard
 
@@ -23604,10 +24067,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"dompurify@npm:=3.0.2":
-  version: 3.0.2
-  resolution: "dompurify@npm:3.0.2"
-  checksum: 768c3bb2f139ce1e1a53faf81aae6abe03e24d0b043e2fda0b70e91ef15bb1df854a35e82d8c519adfe5b81c24bfdad3e0b1085534bfbf427137cb742406c47f
+"dompurify@npm:=3.0.5":
+  version: 3.0.5
+  resolution: "dompurify@npm:3.0.5"
+  checksum: 2d9421570c833ce26ce7022955241749b646d41e8bf453f42ede9f22d0e98af482cedb7dfbf8129419eb48b351c1d677a08fc9f1cd91836ce7f6c1807a0676b2
   languageName: node
   linkType: hard
 
@@ -23673,7 +24136,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"dset@npm:3.1.2":
+"dset@npm:3.1.2, dset@npm:^3.1.2":
   version: 3.1.2
   resolution: "dset@npm:3.1.2"
   checksum: 4f8066f517aa0a70af688c66e9a0a5590f0aada76f6edc7ba9ddb309e27d3a6d65c0a2e31ab2a84005d4c791e5327773cdde59b8ab169050330a0dc283663e87
@@ -23715,8 +24178,9 @@ __metadata:
     cross-fetch: ^3.1.5
     fs-extra: 10.1.0
     handlebars: ^4.7.3
-    nodemon: ^2.0.2
-    pgtools: ^0.3.0
+    mysql2: ^2.2.5
+    nodemon: ^3.0.1
+    pgtools: ^1.0.0
     puppeteer: ^17.0.0
     tree-kill: ^1.2.2
     ts-node: ^10.0.0
@@ -23806,10 +24270,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"electron-to-chromium@npm:^1.4.251":
-  version: 1.4.255
-  resolution: "electron-to-chromium@npm:1.4.255"
-  checksum: 9fd4e0b4a05b072e211b5a1ad2e20b099d7cd54a47b6cbf700dc9ef2020291b5b2d179af0dd0fc71be74b3c765a71ad14f7ff20afb637c0b58e7abc26ff3b68e
+"electron-to-chromium@npm:^1.4.477":
+  version: 1.4.502
+  resolution: "electron-to-chromium@npm:1.4.502"
+  checksum: 69b63eaed50c951c371b1bd907c6775275d170adbdc6b6091b961a78766f5e223b17823afbbc5984c843addac06a5348d3b14acbcf5a746f871ca8cdee6caeba
   languageName: node
   linkType: hard
 
@@ -23963,7 +24427,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"error-ex@npm:^1.2.0, error-ex@npm:^1.3.1":
+"error-ex@npm:^1.3.1":
   version: 1.3.2
   resolution: "error-ex@npm:1.3.2"
   dependencies:
@@ -23988,35 +24452,50 @@ __metadata:
   languageName: node
   linkType: hard
 
-"es-abstract@npm:^1.19.0, es-abstract@npm:^1.19.5, es-abstract@npm:^1.20.4":
-  version: 1.20.4
-  resolution: "es-abstract@npm:1.20.4"
+"es-abstract@npm:^1.19.0, es-abstract@npm:^1.20.4, es-abstract@npm:^1.21.2, es-abstract@npm:^1.21.3":
+  version: 1.22.1
+  resolution: "es-abstract@npm:1.22.1"
   dependencies:
+    array-buffer-byte-length: ^1.0.0
+    arraybuffer.prototype.slice: ^1.0.1
+    available-typed-arrays: ^1.0.5
     call-bind: ^1.0.2
+    es-set-tostringtag: ^2.0.1
     es-to-primitive: ^1.2.1
-    function-bind: ^1.1.1
     function.prototype.name: ^1.1.5
-    get-intrinsic: ^1.1.3
+    get-intrinsic: ^1.2.1
     get-symbol-description: ^1.0.0
+    globalthis: ^1.0.3
+    gopd: ^1.0.1
     has: ^1.0.3
     has-property-descriptors: ^1.0.0
+    has-proto: ^1.0.1
     has-symbols: ^1.0.3
-    internal-slot: ^1.0.3
+    internal-slot: ^1.0.5
+    is-array-buffer: ^3.0.2
     is-callable: ^1.2.7
     is-negative-zero: ^2.0.2
     is-regex: ^1.1.4
     is-shared-array-buffer: ^1.0.2
     is-string: ^1.0.7
+    is-typed-array: ^1.1.10
     is-weakref: ^1.0.2
-    object-inspect: ^1.12.2
+    object-inspect: ^1.12.3
     object-keys: ^1.1.1
     object.assign: ^4.1.4
-    regexp.prototype.flags: ^1.4.3
+    regexp.prototype.flags: ^1.5.0
+    safe-array-concat: ^1.0.0
     safe-regex-test: ^1.0.0
-    string.prototype.trimend: ^1.0.5
-    string.prototype.trimstart: ^1.0.5
+    string.prototype.trim: ^1.2.7
+    string.prototype.trimend: ^1.0.6
+    string.prototype.trimstart: ^1.0.6
+    typed-array-buffer: ^1.0.0
+    typed-array-byte-length: ^1.0.0
+    typed-array-byte-offset: ^1.0.0
+    typed-array-length: ^1.0.4
     unbox-primitive: ^1.0.2
-  checksum: 89297cc785c31aedf961a603d5a07ed16471e435d3a1b6d070b54f157cf48454b95cda2ac55e4b86ff4fe3276e835fcffd2771578e6fa634337da49b26826141
+    which-typed-array: ^1.1.10
+  checksum: 614e2c1c3717cb8d30b6128ef12ea110e06fd7d75ad77091ca1c5dbfb00da130e62e4bbbbbdda190eada098a22b27fe0f99ae5a1171dac2c8663b1e8be8a3a9b
   languageName: node
   linkType: hard
 
@@ -24051,6 +24530,24 @@ __metadata:
   languageName: node
   linkType: hard
 
+"es-iterator-helpers@npm:^1.0.12":
+  version: 1.0.12
+  resolution: "es-iterator-helpers@npm:1.0.12"
+  dependencies:
+    asynciterator.prototype: ^1.0.0
+    es-abstract: ^1.21.3
+    es-set-tostringtag: ^2.0.1
+    function-bind: ^1.1.1
+    globalthis: ^1.0.3
+    has-proto: ^1.0.1
+    has-symbols: ^1.0.3
+    internal-slot: ^1.0.5
+    iterator.prototype: ^1.1.0
+    safe-array-concat: ^1.0.0
+  checksum: df1800a64be755e61718d2e62eef17c22590ed668c44eb3a5c9b78f874e8e01bfa7ba27a0f258b1322f577c2b2032fec194aa20912f7417ddc580c4ec31882e4
+  languageName: node
+  linkType: hard
+
 "es-module-lexer@npm:^0.9.3":
   version: 0.9.3
   resolution: "es-module-lexer@npm:0.9.3"
@@ -24065,6 +24562,17 @@ __metadata:
   languageName: node
   linkType: hard
 
+"es-set-tostringtag@npm:^2.0.1":
+  version: 2.0.1
+  resolution: "es-set-tostringtag@npm:2.0.1"
+  dependencies:
+    get-intrinsic: ^1.1.3
+    has: ^1.0.3
+    has-tostringtag: ^1.0.0
+  checksum: ec416a12948cefb4b2a5932e62093a7cf36ddc3efd58d6c58ca7ae7064475ace556434b869b0bbeb0c365f1032a8ccd577211101234b69837ad83ad204fff884
+  languageName: node
+  linkType: hard
+
 "es-shim-unscopables@npm:^1.0.0":
   version: 1.0.0
   resolution: "es-shim-unscopables@npm:1.0.0"
@@ -24332,32 +24840,32 @@ __metadata:
   languageName: node
   linkType: hard
 
-"esbuild@npm:^0.18.0":
-  version: 0.18.19
-  resolution: "esbuild@npm:0.18.19"
+"esbuild@npm:^0.19.0":
+  version: 0.19.2
+  resolution: "esbuild@npm:0.19.2"
   dependencies:
-    "@esbuild/android-arm": 0.18.19
-    "@esbuild/android-arm64": 0.18.19
-    "@esbuild/android-x64": 0.18.19
-    "@esbuild/darwin-arm64": 0.18.19
-    "@esbuild/darwin-x64": 0.18.19
-    "@esbuild/freebsd-arm64": 0.18.19
-    "@esbuild/freebsd-x64": 0.18.19
-    "@esbuild/linux-arm": 0.18.19
-    "@esbuild/linux-arm64": 0.18.19
-    "@esbuild/linux-ia32": 0.18.19
-    "@esbuild/linux-loong64": 0.18.19
-    "@esbuild/linux-mips64el": 0.18.19
-    "@esbuild/linux-ppc64": 0.18.19
-    "@esbuild/linux-riscv64": 0.18.19
-    "@esbuild/linux-s390x": 0.18.19
-    "@esbuild/linux-x64": 0.18.19
-    "@esbuild/netbsd-x64": 0.18.19
-    "@esbuild/openbsd-x64": 0.18.19
-    "@esbuild/sunos-x64": 0.18.19
-    "@esbuild/win32-arm64": 0.18.19
-    "@esbuild/win32-ia32": 0.18.19
-    "@esbuild/win32-x64": 0.18.19
+    "@esbuild/android-arm": 0.19.2
+    "@esbuild/android-arm64": 0.19.2
+    "@esbuild/android-x64": 0.19.2
+    "@esbuild/darwin-arm64": 0.19.2
+    "@esbuild/darwin-x64": 0.19.2
+    "@esbuild/freebsd-arm64": 0.19.2
+    "@esbuild/freebsd-x64": 0.19.2
+    "@esbuild/linux-arm": 0.19.2
+    "@esbuild/linux-arm64": 0.19.2
+    "@esbuild/linux-ia32": 0.19.2
+    "@esbuild/linux-loong64": 0.19.2
+    "@esbuild/linux-mips64el": 0.19.2
+    "@esbuild/linux-ppc64": 0.19.2
+    "@esbuild/linux-riscv64": 0.19.2
+    "@esbuild/linux-s390x": 0.19.2
+    "@esbuild/linux-x64": 0.19.2
+    "@esbuild/netbsd-x64": 0.19.2
+    "@esbuild/openbsd-x64": 0.19.2
+    "@esbuild/sunos-x64": 0.19.2
+    "@esbuild/win32-arm64": 0.19.2
+    "@esbuild/win32-ia32": 0.19.2
+    "@esbuild/win32-x64": 0.19.2
   dependenciesMeta:
     "@esbuild/android-arm":
       optional: true
@@ -24405,7 +24913,7 @@ __metadata:
       optional: true
   bin:
     esbuild: bin/esbuild
-  checksum: 326c38d33eff024278b293308eff52e9a6b28c897f2ee4a4f8f25a092648d16090b206cbe0f448a3680f87af80af59decea7d68051c3eea937570415087e4d9f
+  checksum: f9ad8ad4f0cbcc675c059f2676c4458d75307af20f9168859de8642accd7f2b7d6bbe8286a23633790dcba07d1d66a8f63c204ea933a0d51300c1b69d4f25d8f
   languageName: node
   linkType: hard
 
@@ -24567,13 +25075,13 @@ __metadata:
   linkType: hard
 
 "eslint-config-prettier@npm:^8.3.0":
-  version: 8.8.0
-  resolution: "eslint-config-prettier@npm:8.8.0"
+  version: 8.10.0
+  resolution: "eslint-config-prettier@npm:8.10.0"
   peerDependencies:
     eslint: ">=7.0.0"
   bin:
     eslint-config-prettier: bin/cli.js
-  checksum: 1e94c3882c4d5e41e1dcfa2c368dbccbfe3134f6ac7d40101644d3bfbe3eb2f2ffac757f3145910b5eacf20c0e85e02b91293d3126d770cbf3dc390b3564681c
+  checksum: 153266badd477e49b0759816246b2132f1dbdb6c7f313ca60a9af5822fd1071c2bc5684a3720d78b725452bbac04bb130878b2513aea5e72b1b792de5a69fec8
   languageName: node
   linkType: hard
 
@@ -24601,32 +25109,32 @@ __metadata:
   languageName: node
   linkType: hard
 
-"eslint-module-utils@npm:^2.7.4":
-  version: 2.7.4
-  resolution: "eslint-module-utils@npm:2.7.4"
+"eslint-module-utils@npm:^2.8.0":
+  version: 2.8.0
+  resolution: "eslint-module-utils@npm:2.8.0"
   dependencies:
     debug: ^3.2.7
   peerDependenciesMeta:
     eslint:
       optional: true
-  checksum: 5da13645daff145a5c922896b258f8bba560722c3767254e458d894ff5fbb505d6dfd945bffa932a5b0ae06714da2379bd41011c4c20d2d59cc83e23895360f7
+  checksum: 74c6dfea7641ebcfe174be61168541a11a14aa8d72e515f5f09af55cd0d0862686104b0524aa4b8e0ce66418a44aa38a94d2588743db5fd07a6b49ffd16921d2
   languageName: node
   linkType: hard
 
 "eslint-plugin-cypress@npm:^2.10.3":
-  version: 2.13.3
-  resolution: "eslint-plugin-cypress@npm:2.13.3"
+  version: 2.14.0
+  resolution: "eslint-plugin-cypress@npm:2.14.0"
   dependencies:
-    globals: ^11.12.0
+    globals: ^13.20.0
   peerDependencies:
     eslint: ">= 3.2.1"
-  checksum: 9affbcee29e030a4251c4794f7533e8e8c0e3b98ab3470a2c730ed059f733c5857a04c7ac214cc0ca7aeef1b11242e72595de7fc1f6b8b4d4578d9eca10af203
+  checksum: 3fa118a757aebb1aa6b419b2944744796aa4fa3cc1e2e19fa97777fd6792fba12b5ae117bf19bf7e7d9a1abdd48398cfba9ca6f2c62fd690a2108a9a02f3f2ae
   languageName: node
   linkType: hard
 
 "eslint-plugin-deprecation@npm:^1.3.2":
-  version: 1.4.1
-  resolution: "eslint-plugin-deprecation@npm:1.4.1"
+  version: 1.5.0
+  resolution: "eslint-plugin-deprecation@npm:1.5.0"
   dependencies:
     "@typescript-eslint/utils": ^5.57.0
     tslib: ^2.3.1
@@ -24634,32 +25142,34 @@ __metadata:
   peerDependencies:
     eslint: ^6.0.0 || ^7.0.0 || ^8.0.0
     typescript: ^3.7.5 || ^4.0.0 || ^5.0.0
-  checksum: 75c7535d820d1749664705724cc979d706da126a2277f2937467f70156a2c220b10c66670f18226801c9555e4cd02312d353936f14d5752c2d2c648455fe5769
+  checksum: ec0ff3df1dbbbb85d14c8f6656bb126377280db58789c2ba3c4500250b291559c651a0fb2ac29aa977408fef3a919ad41e706100b55672ceb6c1ad09550e7396
   languageName: node
   linkType: hard
 
 "eslint-plugin-import@npm:^2.25.4":
-  version: 2.27.5
-  resolution: "eslint-plugin-import@npm:2.27.5"
+  version: 2.28.1
+  resolution: "eslint-plugin-import@npm:2.28.1"
   dependencies:
     array-includes: ^3.1.6
+    array.prototype.findlastindex: ^1.2.2
     array.prototype.flat: ^1.3.1
     array.prototype.flatmap: ^1.3.1
     debug: ^3.2.7
     doctrine: ^2.1.0
     eslint-import-resolver-node: ^0.3.7
-    eslint-module-utils: ^2.7.4
+    eslint-module-utils: ^2.8.0
     has: ^1.0.3
-    is-core-module: ^2.11.0
+    is-core-module: ^2.13.0
     is-glob: ^4.0.3
     minimatch: ^3.1.2
+    object.fromentries: ^2.0.6
+    object.groupby: ^1.0.0
     object.values: ^1.1.6
-    resolve: ^1.22.1
-    semver: ^6.3.0
-    tsconfig-paths: ^3.14.1
+    semver: ^6.3.1
+    tsconfig-paths: ^3.14.2
   peerDependencies:
     eslint: ^2 || ^3 || ^4 || ^5 || ^6 || ^7.2.0 || ^8
-  checksum: f500571a380167e25d72a4d925ef9a7aae8899eada57653e5f3051ec3d3c16d08271fcefe41a30a9a2f4fefc232f066253673ee4ea77b30dba65ae173dade85d
+  checksum: e8ae6dd8f06d8adf685f9c1cfd46ac9e053e344a05c4090767e83b63a85c8421ada389807a39e73c643b9bff156715c122e89778169110ed68d6428e12607edf
   languageName: node
   linkType: hard
 
@@ -24730,13 +25240,14 @@ __metadata:
   linkType: hard
 
 "eslint-plugin-react@npm:^7.28.0":
-  version: 7.32.2
-  resolution: "eslint-plugin-react@npm:7.32.2"
+  version: 7.33.2
+  resolution: "eslint-plugin-react@npm:7.33.2"
   dependencies:
     array-includes: ^3.1.6
     array.prototype.flatmap: ^1.3.1
     array.prototype.tosorted: ^1.1.1
     doctrine: ^2.1.0
+    es-iterator-helpers: ^1.0.12
     estraverse: ^5.3.0
     jsx-ast-utils: ^2.4.1 || ^3.0.0
     minimatch: ^3.1.2
@@ -24746,11 +25257,11 @@ __metadata:
     object.values: ^1.1.6
     prop-types: ^15.8.1
     resolve: ^2.0.0-next.4
-    semver: ^6.3.0
+    semver: ^6.3.1
     string.prototype.matchall: ^4.0.8
   peerDependencies:
     eslint: ^3 || ^4 || ^5 || ^6 || ^7 || ^8
-  checksum: 2232b3b8945aa50b7773919c15cd96892acf35d2f82503667a79e2f55def90f728ed4f0e496f0f157acbe1bd4397c5615b676ae7428fe84488a544ca53feb944
+  checksum: b4c3d76390b0ae6b6f9fed78170604cc2c04b48e6778a637db339e8e3911ec9ef22510b0ae77c429698151d0f1b245f282177f384105b6830e7b29b9c9b26610
   languageName: node
   linkType: hard
 
@@ -24803,10 +25314,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"eslint-visitor-keys@npm:^3.3.0, eslint-visitor-keys@npm:^3.4.1, eslint-visitor-keys@npm:^3.4.2":
-  version: 3.4.2
-  resolution: "eslint-visitor-keys@npm:3.4.2"
-  checksum: 9e0e7e4aaea705c097ae37c97410e5f167d4d2193be2edcb1f0760762ede3df01545e4820ae314f42dcec687745f2c6dcaf6d83575c4a2a241eb0c8517d724f2
+"eslint-visitor-keys@npm:^3.3.0, eslint-visitor-keys@npm:^3.4.1, eslint-visitor-keys@npm:^3.4.3":
+  version: 3.4.3
+  resolution: "eslint-visitor-keys@npm:3.4.3"
+  checksum: 36e9ef87fca698b6fd7ca5ca35d7b2b6eeaaf106572e2f7fd31c12d3bfdaccdb587bba6d3621067e5aece31c8c3a348b93922ab8f7b2cbc6aaab5e1d89040c60
   languageName: node
   linkType: hard
 
@@ -24827,13 +25338,13 @@ __metadata:
   linkType: hard
 
 "eslint@npm:^8.33.0, eslint@npm:^8.6.0":
-  version: 8.46.0
-  resolution: "eslint@npm:8.46.0"
+  version: 8.48.0
+  resolution: "eslint@npm:8.48.0"
   dependencies:
     "@eslint-community/eslint-utils": ^4.2.0
     "@eslint-community/regexpp": ^4.6.1
-    "@eslint/eslintrc": ^2.1.1
-    "@eslint/js": ^8.46.0
+    "@eslint/eslintrc": ^2.1.2
+    "@eslint/js": 8.48.0
     "@humanwhocodes/config-array": ^0.11.10
     "@humanwhocodes/module-importer": ^1.0.1
     "@nodelib/fs.walk": ^1.2.8
@@ -24844,7 +25355,7 @@ __metadata:
     doctrine: ^3.0.0
     escape-string-regexp: ^4.0.0
     eslint-scope: ^7.2.2
-    eslint-visitor-keys: ^3.4.2
+    eslint-visitor-keys: ^3.4.3
     espree: ^9.6.1
     esquery: ^1.4.2
     esutils: ^2.0.2
@@ -24869,7 +25380,7 @@ __metadata:
     text-table: ^0.2.0
   bin:
     eslint: bin/eslint.js
-  checksum: 7a7d36b1a3bbc12e08fbb5bc36fd482a7a5a1797e62e762499dd45601b9e45aaa53a129f31ce0b4444551a9639b8b681ad535f379893dd1e3ae37b31dccd82aa
+  checksum: f20b359a4f8123fec5c033577368cc020d42978b1b45303974acd8da7a27063168ee3fe297ab5b35327162f6a93154063e3ce6577102f70f9809aff793db9bd0
   languageName: node
   linkType: hard
 
@@ -25032,6 +25543,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"eventemitter3@npm:^5.0.1":
+  version: 5.0.1
+  resolution: "eventemitter3@npm:5.0.1"
+  checksum: 543d6c858ab699303c3c32e0f0f47fc64d360bf73c3daf0ac0b5079710e340d6fe9f15487f94e66c629f5f82cd1a8678d692f3dbb6f6fcd1190e1b97fcad36f8
+  languageName: node
+  linkType: hard
+
 "events@npm:3.3.0, events@npm:^3.0.0, events@npm:^3.2.0, events@npm:^3.3.0":
   version: 3.3.0
   resolution: "events@npm:3.3.0"
@@ -25050,6 +25568,116 @@ __metadata:
   languageName: node
   linkType: hard
 
+"example-app-next@workspace:packages/app-next":
+  version: 0.0.0-use.local
+  resolution: "example-app-next@workspace:packages/app-next"
+  dependencies:
+    "@backstage/app-defaults": "workspace:^"
+    "@backstage/catalog-model": "workspace:^"
+    "@backstage/cli": "workspace:^"
+    "@backstage/config": "workspace:^"
+    "@backstage/core-app-api": "workspace:^"
+    "@backstage/core-components": "workspace:^"
+    "@backstage/core-plugin-api": "workspace:^"
+    "@backstage/frontend-app-api": "workspace:^"
+    "@backstage/frontend-plugin-api": "workspace:^"
+    "@backstage/integration-react": "workspace:^"
+    "@backstage/plugin-adr": "workspace:^"
+    "@backstage/plugin-airbrake": "workspace:^"
+    "@backstage/plugin-apache-airflow": "workspace:^"
+    "@backstage/plugin-api-docs": "workspace:^"
+    "@backstage/plugin-azure-devops": "workspace:^"
+    "@backstage/plugin-azure-sites": "workspace:^"
+    "@backstage/plugin-badges": "workspace:^"
+    "@backstage/plugin-catalog-common": "workspace:^"
+    "@backstage/plugin-catalog-graph": "workspace:^"
+    "@backstage/plugin-catalog-import": "workspace:^"
+    "@backstage/plugin-catalog-react": "workspace:^"
+    "@backstage/plugin-catalog-unprocessed-entities": "workspace:^"
+    "@backstage/plugin-circleci": "workspace:^"
+    "@backstage/plugin-cloudbuild": "workspace:^"
+    "@backstage/plugin-code-coverage": "workspace:^"
+    "@backstage/plugin-cost-insights": "workspace:^"
+    "@backstage/plugin-devtools": "workspace:^"
+    "@backstage/plugin-dynatrace": "workspace:^"
+    "@backstage/plugin-entity-feedback": "workspace:^"
+    "@backstage/plugin-explore": "workspace:^"
+    "@backstage/plugin-gcalendar": "workspace:^"
+    "@backstage/plugin-gcp-projects": "workspace:^"
+    "@backstage/plugin-github-actions": "workspace:^"
+    "@backstage/plugin-gocd": "workspace:^"
+    "@backstage/plugin-graphiql": "workspace:^"
+    "@backstage/plugin-home": "workspace:^"
+    "@backstage/plugin-jenkins": "workspace:^"
+    "@backstage/plugin-kafka": "workspace:^"
+    "@backstage/plugin-kubernetes": "workspace:^"
+    "@backstage/plugin-lighthouse": "workspace:^"
+    "@backstage/plugin-linguist": "workspace:^"
+    "@backstage/plugin-linguist-common": "workspace:^"
+    "@backstage/plugin-microsoft-calendar": "workspace:^"
+    "@backstage/plugin-newrelic": "workspace:^"
+    "@backstage/plugin-newrelic-dashboard": "workspace:^"
+    "@backstage/plugin-octopus-deploy": "workspace:^"
+    "@backstage/plugin-org": "workspace:^"
+    "@backstage/plugin-pagerduty": "workspace:^"
+    "@backstage/plugin-permission-react": "workspace:^"
+    "@backstage/plugin-playlist": "workspace:^"
+    "@backstage/plugin-puppetdb": "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:^"
+    "@backstage/plugin-sentry": "workspace:^"
+    "@backstage/plugin-shortcuts": "workspace:^"
+    "@backstage/plugin-stack-overflow": "workspace:^"
+    "@backstage/plugin-stackstorm": "workspace:^"
+    "@backstage/plugin-tech-insights": "workspace:^"
+    "@backstage/plugin-tech-radar": "workspace:^"
+    "@backstage/plugin-techdocs": "workspace:^"
+    "@backstage/plugin-techdocs-module-addons-contrib": "workspace:^"
+    "@backstage/plugin-techdocs-react": "workspace:^"
+    "@backstage/plugin-todo": "workspace:^"
+    "@backstage/plugin-user-settings": "workspace:^"
+    "@backstage/test-utils": "workspace:^"
+    "@backstage/theme": "workspace:^"
+    "@internal/plugin-catalog-customized": "workspace:^"
+    "@material-ui/core": ^4.12.2
+    "@material-ui/icons": ^4.9.1
+    "@material-ui/lab": 4.0.0-alpha.61
+    "@octokit/rest": ^19.0.3
+    "@oriflame/backstage-plugin-score-card": ^0.7.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": ^9.0.0
+    "@testing-library/dom": ^8.0.0
+    "@testing-library/jest-dom": ^5.10.1
+    "@testing-library/react": ^12.1.3
+    "@testing-library/user-event": ^14.0.0
+    "@types/jquery": ^3.3.34
+    "@types/react": "*"
+    "@types/react-dom": "*"
+    "@types/zen-observable": ^0.8.0
+    app-next-example-plugin: "workspace:^"
+    cross-env: ^7.0.0
+    cypress: ^10.0.0
+    eslint-plugin-cypress: ^2.10.3
+    history: ^5.0.0
+    lodash: ^4.17.21
+    prop-types: ^15.7.2
+    react: ^17.0.2
+    react-dom: ^17.0.2
+    react-router: ^6.3.0
+    react-router-dom: ^6.3.0
+    react-use: ^17.2.4
+    start-server-and-test: ^1.10.11
+    zen-observable: ^0.10.0
+  languageName: unknown
+  linkType: soft
+
 "example-app@link:../app::locator=example-backend%40workspace%3Apackages%2Fbackend":
   version: 0.0.0-use.local
   resolution: "example-app@link:../app::locator=example-backend%40workspace%3Apackages%2Fbackend"
@@ -25145,7 +25773,6 @@ __metadata:
     "@testing-library/react": ^12.1.3
     "@testing-library/user-event": ^14.0.0
     "@types/jquery": ^3.3.34
-    "@types/node": ^16.11.26
     "@types/react": "*"
     "@types/react-dom": "*"
     "@types/zen-observable": ^0.8.0
@@ -25169,6 +25796,7 @@ __metadata:
   resolution: "example-backend-next@workspace:packages/backend-next"
   dependencies:
     "@backstage/backend-defaults": "workspace:^"
+    "@backstage/backend-plugin-api": "workspace:^"
     "@backstage/backend-tasks": "workspace:^"
     "@backstage/cli": "workspace:^"
     "@backstage/plugin-adr-backend": "workspace:^"
@@ -25184,6 +25812,7 @@ __metadata:
     "@backstage/plugin-lighthouse-backend": "workspace:^"
     "@backstage/plugin-linguist-backend": "workspace:^"
     "@backstage/plugin-permission-backend": "workspace:^"
+    "@backstage/plugin-permission-backend-module-allow-all-policy": "workspace:^"
     "@backstage/plugin-permission-common": "workspace:^"
     "@backstage/plugin-permission-node": "workspace:^"
     "@backstage/plugin-proxy-backend": "workspace:^"
@@ -25242,8 +25871,11 @@ __metadata:
     "@backstage/plugin-scaffolder-backend-module-confluence-to-markdown": "workspace:^"
     "@backstage/plugin-scaffolder-backend-module-rails": "workspace:^"
     "@backstage/plugin-search-backend": "workspace:^"
+    "@backstage/plugin-search-backend-module-catalog": "workspace:^"
     "@backstage/plugin-search-backend-module-elasticsearch": "workspace:^"
+    "@backstage/plugin-search-backend-module-explore": "workspace:^"
     "@backstage/plugin-search-backend-module-pg": "workspace:^"
+    "@backstage/plugin-search-backend-module-techdocs": "workspace:^"
     "@backstage/plugin-search-backend-node": "workspace:^"
     "@backstage/plugin-search-common": "workspace:^"
     "@backstage/plugin-tech-insights-backend": "workspace:^"
@@ -25268,6 +25900,7 @@ __metadata:
     express-prom-bundle: ^6.3.6
     express-promise-router: ^4.1.0
     luxon: ^3.0.0
+    mysql2: ^2.2.5
     pg: ^8.3.0
     pg-connection-string: ^2.3.0
     prom-client: ^14.0.1
@@ -25309,9 +25942,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"execa@npm:^7.0.0":
-  version: 7.0.0
-  resolution: "execa@npm:7.0.0"
+"execa@npm:7.2.0":
+  version: 7.2.0
+  resolution: "execa@npm:7.2.0"
   dependencies:
     cross-spawn: ^7.0.3
     get-stream: ^6.0.1
@@ -25322,7 +25955,7 @@ __metadata:
     onetime: ^6.0.0
     signal-exit: ^3.0.7
     strip-final-newline: ^3.0.0
-  checksum: be7c7b6d1e5473f628e46888b0cf8279da483c1a6000dd494a2059cc26591ded57ba46be1c9bdde1ec895e7eb8b18911174aba425cd971d41d140a9405da9a02
+  checksum: 14fd17ba0ca8c87b277584d93b1d9fc24f2a65e5152b31d5eb159a3b814854283eaae5f51efa9525e304447e2f757c691877f7adff8fde5746aae67eb1edd1cc
   languageName: node
   linkType: hard
 
@@ -25390,8 +26023,8 @@ __metadata:
   linkType: hard
 
 "express-openapi-validator@npm:^5.0.4":
-  version: 5.0.4
-  resolution: "express-openapi-validator@npm:5.0.4"
+  version: 5.0.6
+  resolution: "express-openapi-validator@npm:5.0.6"
   dependencies:
     "@apidevtools/json-schema-ref-parser": ^9.1.2
     "@types/multer": ^1.4.7
@@ -25399,6 +26032,7 @@ __metadata:
     ajv-draft-04: ^1.0.0
     ajv-formats: ^2.1.1
     content-type: ^1.0.5
+    json-schema-traverse: ^1.0.0
     lodash.clonedeep: ^4.5.0
     lodash.get: ^4.4.2
     lodash.uniq: ^4.5.0
@@ -25407,7 +26041,7 @@ __metadata:
     multer: ^1.4.5-lts.1
     ono: ^7.1.3
     path-to-regexp: ^6.2.0
-  checksum: 5f41d632324fd4217ca74353cb9c9bf50ada6f6ecd5396e9a059f6ce05e66c4698706bb14b7a4ea5a88a4190b82327e37d899dd9a22301dfd6717e24930c81b6
+  checksum: 41a2451271fb907f1402b294a8537a8731cbdae6dfe2d2f04b0cbb2de55643b58b82e836bfd511992fe9f050524600684286284ec85a94de7e27f617eef57c31
   languageName: node
   linkType: hard
 
@@ -25456,16 +26090,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"express-xml-bodyparser@npm:^0.3.0":
-  version: 0.3.0
-  resolution: "express-xml-bodyparser@npm:0.3.0"
-  dependencies:
-    xml2js: ^0.4.11
-  checksum: 37c2d2f9bc5bd748f7481423a26a334d82c352be1d58694dbc0b149e54bdcb3fc7aa70800c3bbbbbbede29c868680f2e4d4fc6990459191b5de615e263d28fec
-  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:
@@ -25615,7 +26240,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"fast-json-patch@npm:^3.0.0-1":
+"fast-json-patch@npm:^3.0.0-1, fast-json-patch@npm:^3.1.0":
   version: 3.1.1
   resolution: "fast-json-patch@npm:3.1.1"
   checksum: c4525b61b2471df60d4b025b4118b036d99778a93431aa44d1084218182841d82ce93056f0f3bbd731a24e6a8e69820128adf1873eb2199a26c62ef58d137833
@@ -25700,6 +26325,17 @@ __metadata:
   languageName: node
   linkType: hard
 
+"fast-xml-parser@npm:^4.2.2":
+  version: 4.2.7
+  resolution: "fast-xml-parser@npm:4.2.7"
+  dependencies:
+    strnum: ^1.0.5
+  bin:
+    fxparser: src/cli/cli.js
+  checksum: d8b0c9e04756f6c43fa0399428f30149acadae21350e42e26e8fe98e24e6afa6b9b00aa554453795036b00e9fee974a1b556fe2ba18be391d51a9bf1ab790e7c
+  languageName: node
+  linkType: hard
+
 "fastest-stable-stringify@npm:^2.0.2":
   version: 2.0.2
   resolution: "fastest-stable-stringify@npm:2.0.2"
@@ -25945,16 +26581,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"find-up@npm:^1.0.0":
-  version: 1.1.2
-  resolution: "find-up@npm:1.1.2"
-  dependencies:
-    path-exists: ^2.0.0
-    pinkie-promise: ^2.0.0
-  checksum: a2cb9f4c9f06ee3a1e92ed71d5aed41ac8ae30aefa568132f6c556fac7678a5035126153b59eaec68da78ac409eef02503b2b059706bdbf232668d7245e3240a
-  languageName: node
-  linkType: hard
-
 "find-up@npm:^3.0.0":
   version: 3.0.0
   resolution: "find-up@npm:3.0.0"
@@ -26460,22 +27086,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"gauge@npm:~2.7.3":
-  version: 2.7.4
-  resolution: "gauge@npm:2.7.4"
-  dependencies:
-    aproba: ^1.0.3
-    console-control-strings: ^1.0.0
-    has-unicode: ^2.0.0
-    object-assign: ^4.1.0
-    signal-exit: ^3.0.0
-    string-width: ^1.0.1
-    strip-ansi: ^3.0.1
-    wide-align: ^1.1.0
-  checksum: a89b53cee65579b46832e050b5f3a79a832cc422c190de79c6b8e2e15296ab92faddde6ddf2d376875cbba2b043efa99b9e1ed8124e7365f61b04e3cee9d40ee
-  languageName: node
-  linkType: hard
-
 "gaxios@npm:^5.0.0, gaxios@npm:^5.0.1":
   version: 5.0.1
   resolution: "gaxios@npm:5.0.1"
@@ -26533,13 +27143,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"get-caller-file@npm:^1.0.1":
-  version: 1.0.3
-  resolution: "get-caller-file@npm:1.0.3"
-  checksum: 2b90a7f848896abcebcdc0acc627a435bcf05b9cd280599bc980ebfcdc222416c3df12c24c4845f69adc4346728e8966f70b758f9369f3534182791dfbc25c05
-  languageName: node
-  linkType: hard
-
 "get-caller-file@npm:^2.0.1, get-caller-file@npm:^2.0.5":
   version: 2.0.5
   resolution: "get-caller-file@npm:2.0.5"
@@ -26547,14 +27150,15 @@ __metadata:
   languageName: node
   linkType: hard
 
-"get-intrinsic@npm:^1.0.2, get-intrinsic@npm:^1.1.0, get-intrinsic@npm:^1.1.1, get-intrinsic@npm:^1.1.3":
-  version: 1.1.3
-  resolution: "get-intrinsic@npm:1.1.3"
+"get-intrinsic@npm:^1.0.2, get-intrinsic@npm:^1.1.0, get-intrinsic@npm:^1.1.1, get-intrinsic@npm:^1.1.3, get-intrinsic@npm:^1.2.0, get-intrinsic@npm:^1.2.1":
+  version: 1.2.1
+  resolution: "get-intrinsic@npm:1.2.1"
   dependencies:
     function-bind: ^1.1.1
     has: ^1.0.3
+    has-proto: ^1.0.1
     has-symbols: ^1.0.3
-  checksum: 152d79e87251d536cf880ba75cfc3d6c6c50e12b3a64e1ea960e73a3752b47c69f46034456eae1b0894359ce3bc64c55c186f2811f8a788b75b638b06fab228a
+  checksum: 5b61d88552c24b0cf6fa2d1b3bc5459d7306f699de060d76442cce49a4721f52b8c560a33ab392cf5575b7810277d54ded9d4d39a1ea61855619ebc005aa7e5f
   languageName: node
   linkType: hard
 
@@ -26787,19 +27391,19 @@ __metadata:
   languageName: node
   linkType: hard
 
-"globals@npm:^11.1.0, globals@npm:^11.12.0":
+"globals@npm:^11.1.0":
   version: 11.12.0
   resolution: "globals@npm:11.12.0"
   checksum: 67051a45eca3db904aee189dfc7cd53c20c7d881679c93f6146ddd4c9f4ab2268e68a919df740d39c71f4445d2b38ee360fc234428baea1dbdfe68bbcb46979e
   languageName: node
   linkType: hard
 
-"globals@npm:^13.19.0":
-  version: 13.19.0
-  resolution: "globals@npm:13.19.0"
+"globals@npm:^13.19.0, globals@npm:^13.20.0":
+  version: 13.20.0
+  resolution: "globals@npm:13.20.0"
   dependencies:
     type-fest: ^0.20.2
-  checksum: a000dbd00bcf28f0941d8a29c3522b1c3b8e4bfe4e60e262c477a550c3cbbe8dbe2925a6905f037acd40f9a93c039242e1f7079c76b0fd184bc41dcc3b5c8e2e
+  checksum: ad1ecf914bd051325faad281d02ea2c0b1df5d01bd94d368dcc5513340eac41d14b3c61af325768e3c7f8d44576e72780ec0b6f2d366121f8eec6e03c3a3b97a
   languageName: node
   linkType: hard
 
@@ -27024,16 +27628,16 @@ __metadata:
   linkType: hard
 
 "graphql-modules@npm:^2.0.0":
-  version: 2.1.2
-  resolution: "graphql-modules@npm:2.1.2"
+  version: 2.2.0
+  resolution: "graphql-modules@npm:2.2.0"
   dependencies:
-    "@graphql-tools/schema": ^9.0.0
-    "@graphql-tools/wrap": ^9.0.0
+    "@graphql-tools/schema": ^10.0.0
+    "@graphql-tools/wrap": ^10.0.0
     "@graphql-typed-document-node/core": ^3.1.0
-    ramda: ^0.28.0
+    ramda: ^0.29.0
   peerDependencies:
     graphql: ^14.0.0 || ^15.0.0 || ^16.0.0
-  checksum: 3a4732c54acb707350b7249d96952b5bb1e5a2c054090181d4e4f8adcd66d4d0675208d06f873bca75b924833df9a2c5bc7ce90aeb04b2d9e256605313a6080a
+  checksum: 81e36df3869f54274b1ab2d178d96ae649f6261724235566361caa770a6011b02633e211cdd2e57b4720b8fa61c2469618a1dc7e2ed213855bf48a2fbf30a76d
   languageName: node
   linkType: hard
 
@@ -27111,9 +27715,9 @@ __metadata:
   linkType: hard
 
 "graphql@npm:^15.0.0 || ^16.0.0, graphql@npm:^16.0.0":
-  version: 16.7.1
-  resolution: "graphql@npm:16.7.1"
-  checksum: c924d8428daf0e96a5ea43e9bc3cd1b6802899907d284478ac8f705c8fd233a0a51eef915f7569fb5de8acb2e85b802ccc6c85c2b157ad805c1e9adba5a299bd
+  version: 16.8.0
+  resolution: "graphql@npm:16.8.0"
+  checksum: d853d4085b0c911a7e2a926c3b0d379934ec61cd4329e70cdf281763102f024fd80a97db7a505b8b04fed9050cb4875f8f518150ea854557a500a0b41dcd7f4e
   languageName: node
   linkType: hard
 
@@ -27254,6 +27858,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"has-proto@npm:^1.0.1":
+  version: 1.0.1
+  resolution: "has-proto@npm:1.0.1"
+  checksum: febc5b5b531de8022806ad7407935e2135f1cc9e64636c3916c6842bd7995994ca3b29871ecd7954bd35f9e2986c17b3b227880484d22259e2f8e6ce63fd383e
+  languageName: node
+  linkType: hard
+
 "has-symbols@npm:^1.0.1, has-symbols@npm:^1.0.2, has-symbols@npm:^1.0.3":
   version: 1.0.3
   resolution: "has-symbols@npm:1.0.3"
@@ -27270,7 +27881,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"has-unicode@npm:^2.0.0, has-unicode@npm:^2.0.1":
+"has-unicode@npm:^2.0.1":
   version: 2.0.1
   resolution: "has-unicode@npm:2.0.1"
   checksum: 1eab07a7436512db0be40a710b29b5dc21fa04880b7f63c9980b706683127e3c1b57cb80ea96d47991bdae2dfe479604f6a1ba410106ee1046a41d1bd0814400
@@ -27296,10 +27907,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"hash-it@npm:^5.0.0":
-  version: 5.0.2
-  resolution: "hash-it@npm:5.0.2"
-  checksum: 18a8a934e90b123ed3cf61cd06cb22273552e03a287155a2276edb77843b18b039b7bfb0a892df215569d7b6c3cc2413453730e3913f56f9069490ad38b1dc28
+"hash-it@npm:^6.0.0":
+  version: 6.0.0
+  resolution: "hash-it@npm:6.0.0"
+  checksum: 10ca948ff7902a752344c3975c1a5c76ba9e4aa0363032f347a7235cce98473dce60fe4399b05979596aedf649adaf5b3f792a55b9b64ad59ae686e43300c2d1
   languageName: node
   linkType: hard
 
@@ -27359,10 +27970,13 @@ __metadata:
   languageName: node
   linkType: hard
 
-"headers-polyfill@npm:^3.1.0, headers-polyfill@npm:^3.1.2":
-  version: 3.1.2
-  resolution: "headers-polyfill@npm:3.1.2"
-  checksum: 510ca9637ef652404dbd432e680418f8d418ba18094ef2f64c3d8de955ebf6e68d553c7f0aeaa5fc937d130b139c1e2d7c2066cd4cf0f740a4627924eaaee9db
+"headers-polyfill@npm:^3.1.0, headers-polyfill@npm:^3.2.0":
+  version: 3.2.1
+  resolution: "headers-polyfill@npm:3.2.1"
+  dependencies:
+    "@types/set-cookie-parser": ^2.4.3
+    set-cookie-parser: ^2.6.0
+  checksum: e66d56ce34821909ce28e51356650233912b2205d00b8494c9c57b4a30d4f07d558afb5f7f6f7fedc9b9c14caf25c9e06afaf8fa60585c36801e17417f901c6b
   languageName: node
   linkType: hard
 
@@ -27521,6 +28135,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"html-parse-stringify@npm:^3.0.1":
+  version: 3.0.1
+  resolution: "html-parse-stringify@npm:3.0.1"
+  dependencies:
+    void-elements: 3.1.0
+  checksum: 334fdebd4b5c355dba8e95284cead6f62bf865a2359da2759b039db58c805646350016d2017875718bc3c4b9bf81a0d11be5ee0cf4774a3a5a7b97cde21cfd67
+  languageName: node
+  linkType: hard
+
 "html-webpack-plugin@npm:^5.3.1":
   version: 5.5.3
   resolution: "html-webpack-plugin@npm:5.5.3"
@@ -27735,9 +28358,9 @@ __metadata:
   linkType: hard
 
 "humanize-duration@npm:^3.25.1, humanize-duration@npm:^3.26.0, humanize-duration@npm:^3.27.0, humanize-duration@npm:^3.27.1":
-  version: 3.28.0
-  resolution: "humanize-duration@npm:3.28.0"
-  checksum: dde595ab4729d82147db41d8ca0afa86bf3f20d74cd1323ea52f299091a4f1dcb2a45b2d27ce78ab9bb0d9e66d8eb8f2628a67be36a535af645eb282a963ff7f
+  version: 3.29.0
+  resolution: "humanize-duration@npm:3.29.0"
+  checksum: 205e959586e774a36561072cd0f2994d727b9e2156a19ff68ee20c9c29544d9eeb3e853cdb7011a32498859043442069ef82c0bd18f1175ed27a733303ab480f
   languageName: node
   linkType: hard
 
@@ -27766,6 +28389,24 @@ __metadata:
   languageName: node
   linkType: hard
 
+"i18next-browser-languagedetector@npm:^7.0.2":
+  version: 7.1.0
+  resolution: "i18next-browser-languagedetector@npm:7.1.0"
+  dependencies:
+    "@babel/runtime": ^7.19.4
+  checksum: 36981b9a9995ed66387f3735cceffe107ed3cdb6ca278d45fa243fabc65669c0eca095ed4a55a93dac046ca1eb23fd986ec0079723be7ebb8505e6ba25f379bb
+  languageName: node
+  linkType: hard
+
+"i18next@npm:^22.4.15":
+  version: 22.5.1
+  resolution: "i18next@npm:22.5.1"
+  dependencies:
+    "@babel/runtime": ^7.20.6
+  checksum: 175f8ab7fac2abcee147b00cc2d8e7d4fa9b05cdc227f02cac841fc2fd9545ed4a6d88774f594f8ad12dc944e4d34cc8e88aa00c8b9947baef9e859d93abd305
+  languageName: node
+  linkType: hard
+
 "iconv-lite@npm:0.4.24, iconv-lite@npm:^0.4.24":
   version: 0.4.24
   resolution: "iconv-lite@npm:0.4.24"
@@ -28074,14 +28715,14 @@ __metadata:
   languageName: node
   linkType: hard
 
-"internal-slot@npm:^1.0.3":
-  version: 1.0.3
-  resolution: "internal-slot@npm:1.0.3"
+"internal-slot@npm:^1.0.3, internal-slot@npm:^1.0.5":
+  version: 1.0.5
+  resolution: "internal-slot@npm:1.0.5"
   dependencies:
-    get-intrinsic: ^1.1.0
+    get-intrinsic: ^1.2.0
     has: ^1.0.3
     side-channel: ^1.0.4
-  checksum: 1944f92e981e47aebc98a88ff0db579fd90543d937806104d0b96557b10c1f170c51fb777b97740a8b6ddeec585fca8c39ae99fd08a8e058dfc8ab70937238bf
+  checksum: 97e84046bf9e7574d0956bd98d7162313ce7057883b6db6c5c7b5e5f05688864b0978ba07610c726d15d66544ffe4b1050107d93f8a39ebc59b15d8b429b497a
   languageName: node
   linkType: hard
 
@@ -28125,13 +28766,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"invert-kv@npm:^1.0.0":
-  version: 1.0.0
-  resolution: "invert-kv@npm:1.0.0"
-  checksum: aebeee31dda3b3d25ffd242e9a050926e7fe5df642d60953ab183aca1a7d1ffb39922eb2618affb0e850cf2923116f0da1345367759d88d097df5da1f1e1590e
-  languageName: node
-  linkType: hard
-
 "ioredis@npm:^5.3.2":
   version: 5.3.2
   resolution: "ioredis@npm:5.3.2"
@@ -28149,13 +28783,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"ip-regex@npm:^2.1.0":
-  version: 2.1.0
-  resolution: "ip-regex@npm:2.1.0"
-  checksum: 331d95052aa53ce245745ea0fc3a6a1e2e3c8d6da65fa8ea52bf73768c1b22a9ac50629d1d2b08c04e7b3ac4c21b536693c149ce2c2615ee4796030e5b3e3cba
-  languageName: node
-  linkType: hard
-
 "ip@npm:^1.1.5":
   version: 1.1.5
   resolution: "ip@npm:1.1.5"
@@ -28238,14 +28865,14 @@ __metadata:
   languageName: node
   linkType: hard
 
-"is-array-buffer@npm:^3.0.1":
-  version: 3.0.1
-  resolution: "is-array-buffer@npm:3.0.1"
+"is-array-buffer@npm:^3.0.1, is-array-buffer@npm:^3.0.2":
+  version: 3.0.2
+  resolution: "is-array-buffer@npm:3.0.2"
   dependencies:
     call-bind: ^1.0.2
-    get-intrinsic: ^1.1.3
+    get-intrinsic: ^1.2.0
     is-typed-array: ^1.1.10
-  checksum: f26ab87448e698285daf707e52a533920449f7abf63714140ffab9d5571aa5a71ac2fa2677e8b793ad0d5d3e40078d4d2c8a0ab39c957e3cfc6513bb6c9dfdc9
+  checksum: dcac9dda66ff17df9cabdc58214172bf41082f956eab30bb0d86bc0fab1e44b690fc8e1f855cf2481245caf4e8a5a006a982a71ddccec84032ed41f9d8da8c14
   languageName: node
   linkType: hard
 
@@ -28263,6 +28890,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"is-async-function@npm:^2.0.0":
+  version: 2.0.0
+  resolution: "is-async-function@npm:2.0.0"
+  dependencies:
+    has-tostringtag: ^1.0.0
+  checksum: e3471d95e6c014bf37cad8a93f2f4b6aac962178e0a5041e8903147166964fdc1c5c1d2ef87e86d77322c370ca18f2ea004fa7420581fa747bcaf7c223069dbd
+  languageName: node
+  linkType: hard
+
 "is-bigint@npm:^1.0.1":
   version: 1.0.4
   resolution: "is-bigint@npm:1.0.4"
@@ -28314,17 +28950,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"is-ci@npm:^2.0.0":
-  version: 2.0.0
-  resolution: "is-ci@npm:2.0.0"
-  dependencies:
-    ci-info: ^2.0.0
-  bin:
-    is-ci: bin.js
-  checksum: 77b869057510f3efa439bbb36e9be429d53b3f51abd4776eeea79ab3b221337fe1753d1e50058a9e2c650d38246108beffb15ccfd443929d77748d8c0cc90144
-  languageName: node
-  linkType: hard
-
 "is-ci@npm:^3.0.0, is-ci@npm:^3.0.1":
   version: 3.0.1
   resolution: "is-ci@npm:3.0.1"
@@ -28336,12 +28961,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"is-core-module@npm:^2.1.0, is-core-module@npm:^2.11.0, is-core-module@npm:^2.9.0":
-  version: 2.11.0
-  resolution: "is-core-module@npm:2.11.0"
+"is-core-module@npm:^2.1.0, is-core-module@npm:^2.11.0, is-core-module@npm:^2.13.0, is-core-module@npm:^2.9.0":
+  version: 2.13.0
+  resolution: "is-core-module@npm:2.13.0"
   dependencies:
     has: ^1.0.3
-  checksum: f96fd490c6b48eb4f6d10ba815c6ef13f410b0ba6f7eb8577af51697de523e5f2cd9de1c441b51d27251bf0e4aebc936545e33a5d26d5d51f28d25698d4a8bab
+  checksum: 053ab101fb390bfeb2333360fd131387bed54e476b26860dc7f5a700bbf34a0ec4454f7c8c4d43e8a0030957e4b3db6e16d35e1890ea6fb654c833095e040355
   languageName: node
   linkType: hard
 
@@ -28384,12 +29009,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"is-fullwidth-code-point@npm:^1.0.0":
-  version: 1.0.0
-  resolution: "is-fullwidth-code-point@npm:1.0.0"
+"is-finalizationregistry@npm:^1.0.2":
+  version: 1.0.2
+  resolution: "is-finalizationregistry@npm:1.0.2"
   dependencies:
-    number-is-nan: ^1.0.0
-  checksum: 4d46a7465a66a8aebcc5340d3b63a56602133874af576a9ca42c6f0f4bd787a743605771c5f246db77da96605fefeffb65fc1dbe862dcc7328f4b4d03edf5a57
+    call-bind: ^1.0.2
+  checksum: 4f243a8e06228cd45bdab8608d2cb7abfc20f6f0189c8ac21ea8d603f1f196eabd531ce0bb8e08cbab047e9845ef2c191a3761c9a17ad5cabf8b35499c4ad35d
   languageName: node
   linkType: hard
 
@@ -28414,10 +29039,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"is-generator-function@npm:^1.0.7":
-  version: 1.0.8
-  resolution: "is-generator-function@npm:1.0.8"
-  checksum: ff6a510416885616fa57a2a1e043224a386ed37451c3686cc1ed38a63acd59b240f09b5d937aa86dedc3a7fb91ae6c0ce6477149d4b6f9be608a870e038b38bd
+"is-generator-function@npm:^1.0.10, is-generator-function@npm:^1.0.7":
+  version: 1.0.10
+  resolution: "is-generator-function@npm:1.0.10"
+  dependencies:
+    has-tostringtag: ^1.0.0
+  checksum: d54644e7dbaccef15ceb1e5d91d680eb5068c9ee9f9eb0a9e04173eb5542c9b51b5ab52c5537f5703e48d5fddfd376817c1ca07a84a407b7115b769d4bdde72b
   languageName: node
   linkType: hard
 
@@ -28769,16 +29396,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"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"
+"is-typed-array@npm:^1.1.10, is-typed-array@npm:^1.1.3, is-typed-array@npm:^1.1.9":
+  version: 1.1.12
+  resolution: "is-typed-array@npm:1.1.12"
   dependencies:
-    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
-  checksum: aac6ecb59d4c56a1cdeb69b1f129154ef462bbffe434cb8a8235ca89b42f258b7ae94073c41b3cb7bce37f6a1733ad4499f07882d5d5093a7ba84dfc4ebb8017
+    which-typed-array: ^1.1.11
+  checksum: 4c89c4a3be07186caddadf92197b17fda663a9d259ea0d44a85f171558270d36059d1c386d34a12cba22dfade5aba497ce22778e866adc9406098c8fc4771796
   languageName: node
   linkType: hard
 
@@ -28913,11 +29536,12 @@ __metadata:
   linkType: hard
 
 "isolated-vm@npm:^4.5.0":
-  version: 4.5.0
-  resolution: "isolated-vm@npm:4.5.0"
+  version: 4.6.0
+  resolution: "isolated-vm@npm:4.6.0"
   dependencies:
     node-gyp: latest
-  checksum: 86626a72d35ed0ee731e00ad19bc6e8a0433c4f34a5dd5b1d415d425f1f0f6b0d04c6d10e7a588025b2956d562fcf7a69e9e20f96746978d3a4e7862374a3806
+    prebuild-install: ^7.1.1
+  checksum: 011853d46bc934751012f5c1ed3eaba43dc4bd274672e59ff8e4c7eb0df668c93f3e0b91e3b4e812d2b8476c9ace218f34e7a3188b08b343409370e70044a874
   languageName: node
   linkType: hard
 
@@ -29064,6 +29688,19 @@ __metadata:
   languageName: node
   linkType: hard
 
+"iterator.prototype@npm:^1.1.0":
+  version: 1.1.0
+  resolution: "iterator.prototype@npm:1.1.0"
+  dependencies:
+    define-properties: ^1.1.4
+    get-intrinsic: ^1.1.3
+    has-symbols: ^1.0.3
+    has-tostringtag: ^1.0.0
+    reflect.getprototypeof: ^1.0.3
+  checksum: 462fe16c770affeb9c08620b13fc98d38307335821f4fabd489f491d38c79855c6a93d4b56f6146eaa56711f61690aa5c7eb0ce8586c95145d2f665a3834d916
+  languageName: node
+  linkType: hard
+
 "jackspeak@npm:^2.0.3":
   version: 2.2.1
   resolution: "jackspeak@npm:2.2.1"
@@ -29223,15 +29860,15 @@ __metadata:
   languageName: node
   linkType: hard
 
-"jest-diff@npm:^29.4.3":
-  version: 29.4.3
-  resolution: "jest-diff@npm:29.4.3"
+"jest-diff@npm:^29.2.0, jest-diff@npm:^29.4.3":
+  version: 29.6.3
+  resolution: "jest-diff@npm:29.6.3"
   dependencies:
     chalk: ^4.0.0
-    diff-sequences: ^29.4.3
-    jest-get-type: ^29.4.3
-    pretty-format: ^29.4.3
-  checksum: 877fd1edffef6b319688c27b152e5b28e2bc4bcda5ce0ca90d7e137f9fafda4280bae25403d4c0bfd9806c2c0b15d966aa2dfaf5f9928ec8f1ccea7fa1d08ed6
+    diff-sequences: ^29.6.3
+    jest-get-type: ^29.6.3
+    pretty-format: ^29.6.3
+  checksum: 23b0a88efeab36566386f059f3da340754d2860969cbc34805154e2377714e37e3130e21a791fc68008fb460bbf5edd7ec43c16d96d15797b32ccfae5160fe37
   languageName: node
   linkType: hard
 
@@ -29299,10 +29936,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"jest-get-type@npm:^29.4.3":
-  version: 29.4.3
-  resolution: "jest-get-type@npm:29.4.3"
-  checksum: 6ac7f2dde1c65e292e4355b6c63b3a4897d7e92cb4c8afcf6d397f2682f8080e094c8b0b68205a74d269882ec06bf696a9de6cd3e1b7333531e5ed7b112605ce
+"jest-get-type@npm:^29.4.3, jest-get-type@npm:^29.6.3":
+  version: 29.6.3
+  resolution: "jest-get-type@npm:29.6.3"
+  checksum: 88ac9102d4679d768accae29f1e75f592b760b44277df288ad76ce5bf038c3f5ce3719dea8aa0f035dac30e9eb034b848ce716b9183ad7cc222d029f03e92205
   languageName: node
   linkType: hard
 
@@ -29603,12 +30240,22 @@ __metadata:
   languageName: node
   linkType: hard
 
+"jest-websocket-mock@npm:^2.4.1":
+  version: 2.4.1
+  resolution: "jest-websocket-mock@npm:2.4.1"
+  dependencies:
+    jest-diff: ^29.2.0
+    mock-socket: ^9.1.0
+  checksum: 5091bfc1baef36146ea1d0f7e16c591d8f8cd9604b7daaeb3d61d98cb1034f4ea3825c122477eb15d55f7d7fe6ec93a8e7b58d54f39838238d7345675d0afb37
+  languageName: node
+  linkType: hard
+
 "jest-when@npm:^3.1.0":
-  version: 3.5.2
-  resolution: "jest-when@npm:3.5.2"
+  version: 3.6.0
+  resolution: "jest-when@npm:3.6.0"
   peerDependencies:
     jest: ">= 25"
-  checksum: 9ad95552d377ef4d517c96a14c38bd8626d6856f518e7efc8a01d76a45a39d3c52281392c98da781c302114c78cd1ea17556c7f638d49d15971fcce9d58306e8
+  checksum: ed32ed84e5802bb6fec98966cdf862ce59677551be33d3795e6ac7a6207acf467ed559573d671c8d94c59f7fc0780cf358d2d165d81cdc7d9611250d975ee024
   languageName: node
   linkType: hard
 
@@ -29711,9 +30358,9 @@ __metadata:
   linkType: hard
 
 "jose@npm:^4.14.4, jose@npm:^4.6.0":
-  version: 4.14.4
-  resolution: "jose@npm:4.14.4"
-  checksum: 2d820a91a8fd97c05d8bc8eedc373b944a0cd7f5fe41063086da233d0473c73fb523912a9f026ea870782bd221f4a515f441a2d3af4de48c6f2c76dac5082377
+  version: 4.14.6
+  resolution: "jose@npm:4.14.6"
+  checksum: eae81a234e7bf1446b1bd80722b3462b014e3835b155c3a7799c1c5043163a53a0dc28d347004151b031e6b7b863403aabf8814d9cc217ce21f8c2f3ebd4b335
   languageName: node
   linkType: hard
 
@@ -30028,15 +30675,15 @@ __metadata:
   linkType: hard
 
 "json-rules-engine@npm:^6.1.2":
-  version: 6.1.2
-  resolution: "json-rules-engine@npm:6.1.2"
+  version: 6.4.2
+  resolution: "json-rules-engine@npm:6.4.2"
   dependencies:
     clone: ^2.1.2
     eventemitter2: ^6.4.4
-    hash-it: ^5.0.0
-    jsonpath-plus: ^5.0.7
+    hash-it: ^6.0.0
+    jsonpath-plus: ^7.2.0
     lodash.isobjectlike: ^4.0.0
-  checksum: bb6af1e24318e7bbb098b809925918d8fc735a1887d0388a94c22f90dcf8cff8c9db5d891f8915d6c48447d31c0d505eae2a5bccbbb58e25f0e2746dee6cdec9
+  checksum: c3dcddc71db42e2e29ced8883adc7e38a99a3fa7111fd1539cd38e375a422225956e61c53346e341a8b0432507225cb1d634acc2d02faccb24b73b559a574e44
   languageName: node
   linkType: hard
 
@@ -30085,13 +30732,13 @@ __metadata:
   linkType: hard
 
 "json-schema-to-ts@npm:^2.6.2":
-  version: 2.9.1
-  resolution: "json-schema-to-ts@npm:2.9.1"
+  version: 2.9.2
+  resolution: "json-schema-to-ts@npm:2.9.2"
   dependencies:
     "@babel/runtime": ^7.18.3
     "@types/json-schema": ^7.0.9
     ts-algebra: ^1.2.0
-  checksum: c2471993484f69452eb4f1c732a3b4d73842430f8c9a1486d72fda9fc9ca6ae4761164817edddd8463204caec2d3169a95d5e9e4d9d39f1e94f7377bdafb740b
+  checksum: 64bf7226511a3719075d28e715fbd203576088b6ebcf494d6c5ee2bcf5b24d6081fa0cfce22ce254ad8798b7044603db4e4d19779c6f5765285fb9ddaa0756ef
   languageName: node
   linkType: hard
 
@@ -30123,12 +30770,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"json-stable-stringify@npm:^1.0.1":
-  version: 1.0.1
-  resolution: "json-stable-stringify@npm:1.0.1"
+"json-stable-stringify@npm:^1.0.1, json-stable-stringify@npm:^1.0.2":
+  version: 1.0.2
+  resolution: "json-stable-stringify@npm:1.0.2"
   dependencies:
-    jsonify: ~0.0.0
-  checksum: 65d6cbf0fca72a4136999f65f4401cf39a129f7aeff0fdd987ac3d3423a2113659294045fb8377e6e20d865cac32b1b8d70f3d87346c9786adcee60661d96ca5
+    jsonify: ^0.0.1
+  checksum: ec10863493fb728481ed7576551382768a173d5b884758db530def00523b862083a3fd70fee24b39e2f47f5f502e22f9a1489dd66da3535b63bf6241dbfca800
   languageName: node
   linkType: hard
 
@@ -30173,7 +30820,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"json5@npm:^1.0.1":
+"json5@npm:^1.0.1, json5@npm:^1.0.2":
   version: 1.0.2
   resolution: "json5@npm:1.0.2"
   dependencies:
@@ -30184,7 +30831,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"json5@npm:^2.1.2, json5@npm:^2.1.3, json5@npm:^2.2.0, json5@npm:^2.2.1":
+"json5@npm:^2.1.2, json5@npm:^2.1.3, json5@npm:^2.2.0, json5@npm:^2.2.3":
   version: 2.2.3
   resolution: "json5@npm:2.2.3"
   bin:
@@ -30232,10 +30879,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"jsonify@npm:~0.0.0":
-  version: 0.0.0
-  resolution: "jsonify@npm:0.0.0"
-  checksum: d8d4ed476c116e6987a460dcb82f22284686caae9f498ac87b0502c1765ac1522f4f450a4cad4cc368d202fd3b27a3860735140a82867fc6d558f5f199c38bce
+"jsonify@npm:^0.0.1":
+  version: 0.0.1
+  resolution: "jsonify@npm:0.0.1"
+  checksum: 027287e1c0294fce15f18c0ff990cfc2318e7f01fb76515f784d5cd0784abfec6fc5c2355c3a2f2cb0ad7f4aa2f5b74ebbfe4e80476c35b2d13cabdb572e1134
   languageName: node
   linkType: hard
 
@@ -30253,13 +30900,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"jsonpath-plus@npm:^5.0.7":
-  version: 5.1.0
-  resolution: "jsonpath-plus@npm:5.1.0"
-  checksum: 0ebb56b4b079e5aae574df1feff043de0fe3d00a9eafb9a258cdff7df29f2d3b4dea9c6095c2d9176ec3417a3847e3aba8268a05e5f0a90c78cf0d7297b7a3bc
-  languageName: node
-  linkType: hard
-
 "jsonpath-plus@npm:^6.0.1":
   version: 6.0.1
   resolution: "jsonpath-plus@npm:6.0.1"
@@ -30735,15 +31375,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"lcid@npm:^1.0.0":
-  version: 1.0.0
-  resolution: "lcid@npm:1.0.0"
-  dependencies:
-    invert-kv: ^1.0.0
-  checksum: e8c7a4db07663068c5c44b650938a2bc41aa992037eebb69376214320f202c1250e70b50c32f939e28345fd30c2d35b8e8cd9a19d5932c398246a864ce54843d
-  languageName: node
-  linkType: hard
-
 "ldap-filter@npm:^0.3.3":
   version: 0.3.3
   resolution: "ldap-filter@npm:0.3.3"
@@ -30908,25 +31539,41 @@ __metadata:
   linkType: hard
 
 "lint-staged@npm:^13.0.0":
-  version: 13.2.3
-  resolution: "lint-staged@npm:13.2.3"
+  version: 13.3.0
+  resolution: "lint-staged@npm:13.3.0"
   dependencies:
-    chalk: 5.2.0
-    cli-truncate: ^3.1.0
-    commander: ^10.0.0
-    debug: ^4.3.4
-    execa: ^7.0.0
+    chalk: 5.3.0
+    commander: 11.0.0
+    debug: 4.3.4
+    execa: 7.2.0
     lilconfig: 2.1.0
-    listr2: ^5.0.7
-    micromatch: ^4.0.5
-    normalize-path: ^3.0.0
-    object-inspect: ^1.12.3
-    pidtree: ^0.6.0
-    string-argv: ^0.3.1
-    yaml: ^2.2.2
+    listr2: 6.6.1
+    micromatch: 4.0.5
+    pidtree: 0.6.0
+    string-argv: 0.3.2
+    yaml: 2.3.1
   bin:
     lint-staged: bin/lint-staged.js
-  checksum: ff51a1e33072f488b28b938ed47323816a1ff278ef6d0e5cbe1704b292773a6c8ce945b504eae3a9b5702917a979523a741f17023e16077bd5fa35be687cc067
+  checksum: f7c146cc2849c9ce4f1d2808d990fcbdef5e0bb79e6e79cc895f53c91f5ac4dcefdb8c3465156b38a015dcb051f2795c6bda4f20a1e2f2fa654c7ba521b2d2e0
+  languageName: node
+  linkType: hard
+
+"listr2@npm:6.6.1":
+  version: 6.6.1
+  resolution: "listr2@npm:6.6.1"
+  dependencies:
+    cli-truncate: ^3.1.0
+    colorette: ^2.0.20
+    eventemitter3: ^5.0.1
+    log-update: ^5.0.1
+    rfdc: ^1.3.0
+    wrap-ansi: ^8.1.0
+  peerDependencies:
+    enquirer: ">= 2.3.0 < 3"
+  peerDependenciesMeta:
+    enquirer:
+      optional: true
+  checksum: 99600e8a51f838f7208bce7e16d6b3d91d361f13881e6aa91d0b561a9a093ddcf63b7bc2a7b47aec7fdbff9d0e8c9f68cb66e6dfe2d857e5b1df8ab045c26ce8
   languageName: node
   linkType: hard
 
@@ -30972,40 +31619,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"listr2@npm:^5.0.7":
-  version: 5.0.7
-  resolution: "listr2@npm:5.0.7"
-  dependencies:
-    cli-truncate: ^2.1.0
-    colorette: ^2.0.19
-    log-update: ^4.0.0
-    p-map: ^4.0.0
-    rfdc: ^1.3.0
-    rxjs: ^7.8.0
-    through: ^2.3.8
-    wrap-ansi: ^7.0.0
-  peerDependencies:
-    enquirer: ">= 2.3.0 < 3"
-  peerDependenciesMeta:
-    enquirer:
-      optional: true
-  checksum: 5c2cb6ba3f7a5cfd548f89405febe73dc937acb6060227198c05da0ed5d5285a8107c61fcc4e33884e3bbdd447411aff7580af396bd22b6a11047ceab4950fab
-  languageName: node
-  linkType: hard
-
-"load-json-file@npm:^1.0.0":
-  version: 1.1.0
-  resolution: "load-json-file@npm:1.1.0"
-  dependencies:
-    graceful-fs: ^4.1.2
-    parse-json: ^2.2.0
-    pify: ^2.0.0
-    pinkie-promise: ^2.0.0
-    strip-bom: ^2.0.0
-  checksum: 0e4e4f380d897e13aa236246a917527ea5a14e4fc34d49e01ce4e7e2a1e08e2740ee463a03fb021c04f594f29a178f4adb994087549d7c1c5315fcd29bf9934b
-  languageName: node
-  linkType: hard
-
 "load-yaml-file@npm:^0.2.0":
   version: 0.2.0
   resolution: "load-yaml-file@npm:0.2.0"
@@ -31089,13 +31702,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"lodash.assign@npm:^4.1.0, lodash.assign@npm:^4.2.0":
-  version: 4.2.0
-  resolution: "lodash.assign@npm:4.2.0"
-  checksum: 75bbc6733c9f577c448031b4051f990f068802708891f94be9d4c2faffd6a9ec67a2c49671dafc908a068d35687765464853282842b4560b662e6c903d11cc90
-  languageName: node
-  linkType: hard
-
 "lodash.camelcase@npm:^4.3.0":
   version: 4.3.0
   resolution: "lodash.camelcase@npm:4.3.0"
@@ -31342,6 +31948,19 @@ __metadata:
   languageName: node
   linkType: hard
 
+"log-update@npm:^5.0.1":
+  version: 5.0.1
+  resolution: "log-update@npm:5.0.1"
+  dependencies:
+    ansi-escapes: ^5.0.0
+    cli-cursor: ^4.0.0
+    slice-ansi: ^5.0.0
+    strip-ansi: ^7.0.1
+    wrap-ansi: ^8.0.1
+  checksum: 2c6b47dcce6f9233df6d232a37d9834cb3657a0749ef6398f1706118de74c55f158587d4128c225297ea66803f35c5ac3db4f3f617046d817233c45eedc32ef1
+  languageName: node
+  linkType: hard
+
 "logform@npm:^2.3.2, logform@npm:^2.4.0":
   version: 2.5.1
   resolution: "logform@npm:2.5.1"
@@ -31486,7 +32105,14 @@ __metadata:
   languageName: node
   linkType: hard
 
-"luxon@npm:^3.0.0, luxon@npm:^3.2.1, luxon@npm:^3.3.0":
+"luxon@npm:^3.0.0, luxon@npm:^3.3.0":
+  version: 3.4.3
+  resolution: "luxon@npm:3.4.3"
+  checksum: 3eade81506224d038ed24035a0cd0dd4887848d7eba9361dce9ad8ef81380596a68153240be3988721f9690c624fb449fcf8fd8c3fc0681a6a8496faf48e92a3
+  languageName: node
+  linkType: hard
+
+"luxon@npm:~3.3.0":
   version: 3.3.0
   resolution: "luxon@npm:3.3.0"
   checksum: 50cf17a0dc155c3dcacbeae8c0b7e80db425e0ba97b9cbdf12a7fc142d841ff1ab1560919f033af46240ed44e2f70c49f76e3422524c7fc8bb8d81ca47c66187
@@ -32390,7 +33016,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"micromatch@npm:^4.0.2, micromatch@npm:^4.0.4, micromatch@npm:^4.0.5":
+"micromatch@npm:4.0.5, micromatch@npm:^4.0.2, micromatch@npm:^4.0.4, micromatch@npm:^4.0.5":
   version: 4.0.5
   resolution: "micromatch@npm:4.0.5"
   dependencies:
@@ -32811,6 +33437,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"mock-socket@npm:^9.1.0":
+  version: 9.2.1
+  resolution: "mock-socket@npm:9.2.1"
+  checksum: daf07689563163dbcefbefe23b2a9784a75d0af31706f23ad535c6ab2abbcdefa2e91acddeb50a3c39009139e47a8f909cbb38e8137452193ccb9331637fee3e
+  languageName: node
+  linkType: hard
+
 "moment@npm:^2.29.1":
   version: 2.29.4
   resolution: "moment@npm:2.29.4"
@@ -32882,20 +33515,20 @@ __metadata:
   languageName: node
   linkType: hard
 
-"msw@npm:^1.0.0, msw@npm:^1.0.1, msw@npm:^1.2.1":
-  version: 1.2.3
-  resolution: "msw@npm:1.2.3"
+"msw@npm:^1.0.0, msw@npm:^1.0.1, msw@npm:^1.2.1, msw@npm:^1.2.3":
+  version: 1.3.0
+  resolution: "msw@npm:1.3.0"
   dependencies:
     "@mswjs/cookies": ^0.2.2
     "@mswjs/interceptors": ^0.17.5
     "@open-draft/until": ^1.0.3
     "@types/cookie": ^0.4.1
     "@types/js-levenshtein": ^1.1.1
-    chalk: 4.1.1
+    chalk: ^4.1.1
     chokidar: ^3.4.2
     cookie: ^0.4.2
     graphql: ^15.0.0 || ^16.0.0
-    headers-polyfill: ^3.1.2
+    headers-polyfill: ^3.2.0
     inquirer: ^8.2.0
     is-node-process: ^1.2.0
     js-levenshtein: ^1.1.6
@@ -32906,13 +33539,13 @@ __metadata:
     type-fest: ^2.19.0
     yargs: ^17.3.1
   peerDependencies:
-    typescript: ">= 4.4.x <= 5.1.x"
+    typescript: ">= 4.4.x <= 5.2.x"
   peerDependenciesMeta:
     typescript:
       optional: true
   bin:
     msw: cli/index.js
-  checksum: 832a6fc3973726a97e03ce2690c3b6e1774b5156d064a478657a1b33f9933e4834af833cc8a859e1b717fa9b71f1271b3e66a1ec6eed7f76bfe79406e9ec3986
+  checksum: 5ec31d58b0b8841906427738b3f20efd93c45673022f1f8f2221e2880bf76d8ce85902a4f2656727bdcd6d3124d06bb61ff7827a3f9b218ceba6a09d3f6508be
   languageName: node
   linkType: hard
 
@@ -33110,13 +33743,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"nice-try@npm:^1.0.4":
-  version: 1.0.5
-  resolution: "nice-try@npm:1.0.5"
-  checksum: 0b4af3b5bb5d86c289f7a026303d192a7eb4417231fe47245c460baeabae7277bcd8fd9c728fb6bd62c30b3e15cd6620373e2cf33353b095d8b403d3e8a15aff
-  languageName: node
-  linkType: hard
-
 "nimma@npm:0.2.2":
   version: 0.2.2
   resolution: "nimma@npm:0.2.2"
@@ -33159,15 +33785,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"node-abi@npm:^2.21.0":
-  version: 2.30.1
-  resolution: "node-abi@npm:2.30.1"
-  dependencies:
-    semver: ^5.4.1
-  checksum: 3f4b0c912ce4befcd7ceab4493ba90b51d60dfcc90f567c93f731d897ef8691add601cb64c181683b800f21d479d68f9a6e15d8ab8acd16a5706333b9e30a881
-  languageName: node
-  linkType: hard
-
 "node-abi@npm:^3.3.0":
   version: 3.8.0
   resolution: "node-abi@npm:3.8.0"
@@ -33252,8 +33869,8 @@ __metadata:
   linkType: hard
 
 "node-fetch@npm:^2.6.0, node-fetch@npm:^2.6.1, node-fetch@npm:^2.6.12, node-fetch@npm:^2.6.5, node-fetch@npm:^2.6.7":
-  version: 2.6.12
-  resolution: "node-fetch@npm:2.6.12"
+  version: 2.7.0
+  resolution: "node-fetch@npm:2.7.0"
   dependencies:
     whatwg-url: ^5.0.0
   peerDependencies:
@@ -33261,7 +33878,7 @@ __metadata:
   peerDependenciesMeta:
     encoding:
       optional: true
-  checksum: 3bc1655203d47ee8e313c0d96664b9673a3d4dd8002740318e9d27d14ef306693a4b2ef8d6525775056fd912a19e23f3ac0d7111ad8925877b7567b29a625592
+  checksum: d76d2f5edb451a3f05b15115ec89fc6be39de37c6089f1b6368df03b91e1633fd379a7e01b7ab05089a25034b2023d959b47e59759cb38d88341b2459e89d6e5
   languageName: node
   linkType: hard
 
@@ -33381,30 +33998,30 @@ __metadata:
   languageName: node
   linkType: hard
 
-"node-releases@npm:^2.0.6":
-  version: 2.0.6
-  resolution: "node-releases@npm:2.0.6"
-  checksum: e86a926dc9fbb3b41b4c4a89d998afdf140e20a4e8dbe6c0a807f7b2948b42ea97d7fd3ad4868041487b6e9ee98409829c6e4d84a734a4215dff060a7fbeb4bf
+"node-releases@npm:^2.0.13":
+  version: 2.0.13
+  resolution: "node-releases@npm:2.0.13"
+  checksum: 17ec8f315dba62710cae71a8dad3cd0288ba943d2ece43504b3b1aa8625bf138637798ab470b1d9035b0545996f63000a8a926e0f6d35d0996424f8b6d36dda3
   languageName: node
   linkType: hard
 
-"nodemon@npm:^2.0.2":
-  version: 2.0.22
-  resolution: "nodemon@npm:2.0.22"
+"nodemon@npm:^3.0.1":
+  version: 3.0.1
+  resolution: "nodemon@npm:3.0.1"
   dependencies:
     chokidar: ^3.5.2
     debug: ^3.2.7
     ignore-by-default: ^1.0.1
     minimatch: ^3.1.2
     pstree.remy: ^1.1.8
-    semver: ^5.7.1
-    simple-update-notifier: ^1.0.7
+    semver: ^7.5.3
+    simple-update-notifier: ^2.0.0
     supports-color: ^5.5.0
     touch: ^3.1.0
     undefsafe: ^2.0.5
   bin:
     nodemon: bin/nodemon.js
-  checksum: 9c987e139748f5b5c480c6c9080bdc97304ee7d29172b7b3da1a7db590b1323ad57b96346304e9b522b0e445c336dc393ccd3f9f45c73b20d476d2347890dcd0
+  checksum: 6a5d81855760d6617049eccce10ccf02bddb482dab13ceea5280ae595ec7004eee13e7b934368e3f46c37fe4d970342a8c38c99cae7e93e4d7a3ed1c1ecb6acf
   languageName: node
   linkType: hard
 
@@ -33441,7 +34058,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"normalize-package-data@npm:^2.3.2, normalize-package-data@npm:^2.5.0":
+"normalize-package-data@npm:^2.5.0":
   version: 2.5.0
   resolution: "normalize-package-data@npm:2.5.0"
   dependencies:
@@ -33607,18 +34224,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"npmlog@npm:^4.0.1, npmlog@npm:^4.1.2":
-  version: 4.1.2
-  resolution: "npmlog@npm:4.1.2"
-  dependencies:
-    are-we-there-yet: ~1.1.2
-    console-control-strings: ~1.1.0
-    gauge: ~2.7.3
-    set-blocking: ~2.0.0
-  checksum: edbda9f95ec20957a892de1839afc6fb735054c3accf6fbefe767bac9a639fd5cea2baeac6bd2bcd50a85cb54924d57d9886c81c7fbc2332c2ddd19227504192
-  languageName: node
-  linkType: hard
-
 "npmlog@npm:^5.0.1":
   version: 5.0.1
   resolution: "npmlog@npm:5.0.1"
@@ -33659,13 +34264,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"number-is-nan@npm:^1.0.0":
-  version: 1.0.1
-  resolution: "number-is-nan@npm:1.0.1"
-  checksum: 13656bc9aa771b96cef209ffca31c31a03b507ca6862ba7c3f638a283560620d723d52e626d57892c7fff475f4c36ac07f0600f14544692ff595abff214b9ffb
-  languageName: node
-  linkType: hard
-
 "nunjucks@npm:^3.2.3":
   version: 3.2.4
   resolution: "nunjucks@npm:3.2.4"
@@ -33726,7 +34324,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"object-inspect@npm:^1.12.2, object-inspect@npm:^1.12.3, object-inspect@npm:^1.9.0":
+"object-inspect@npm:^1.12.3, object-inspect@npm:^1.9.0":
   version: 1.12.3
   resolution: "object-inspect@npm:1.12.3"
   checksum: dabfd824d97a5f407e6d5d24810d888859f6be394d8b733a77442b277e0808860555176719c5905e765e3743a7cada6b8b0a3b85e5331c530fd418cc8ae991db
@@ -33750,7 +34348,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"object.assign@npm:^4.1.0, object.assign@npm:^4.1.3, object.assign@npm:^4.1.4":
+"object.assign@npm:^4.1.3, object.assign@npm:^4.1.4":
   version: 4.1.4
   resolution: "object.assign@npm:4.1.4"
   dependencies:
@@ -33784,6 +34382,18 @@ __metadata:
   languageName: node
   linkType: hard
 
+"object.groupby@npm:^1.0.0":
+  version: 1.0.0
+  resolution: "object.groupby@npm:1.0.0"
+  dependencies:
+    call-bind: ^1.0.2
+    define-properties: ^1.2.0
+    es-abstract: ^1.21.2
+    get-intrinsic: ^1.2.1
+  checksum: 64b00b287d57580111c958e7ff375c9b61811fa356f2cf0d35372d43cab61965701f00fac66c19fd8f49c4dfa28744bee6822379c69a73648ad03e09fcdeae70
+  languageName: node
+  linkType: hard
+
 "object.hasown@npm:^1.1.2":
   version: 1.1.2
   resolution: "object.hasown@npm:1.1.2"
@@ -33974,13 +34584,23 @@ __metadata:
   languageName: node
   linkType: hard
 
-"optimism@npm:^0.16.2":
-  version: 0.16.2
-  resolution: "optimism@npm:0.16.2"
+"oppa@npm:^0.4.0":
+  version: 0.4.0
+  resolution: "oppa@npm:0.4.0"
+  dependencies:
+    chalk: ^4.1.1
+  checksum: ecc43e63ede05c3ccb10e0f2c3f3020a6d72e1a3b318f3e37b8cc8a1a279e300991c043e5385d560c1eebb54a56c7f9b69bf0db0d1933acf350bcd2980c96055
+  languageName: node
+  linkType: hard
+
+"optimism@npm:^0.17.5":
+  version: 0.17.5
+  resolution: "optimism@npm:0.17.5"
   dependencies:
     "@wry/context": ^0.7.0
-    "@wry/trie": ^0.3.0
-  checksum: a98ed9a0b8ee2b031010222099b60860d52860bf8182889f2695a7cf2185f21aca59020f78e2b47c0ae7697843caa576798d792967314ff59f6aa7c5d9de7f3a
+    "@wry/trie": ^0.4.3
+    tslib: ^2.3.0
+  checksum: 5990217d989e9857dc523a64cb6e5a9205eae68c7acac78f7dde8fbe50045d0f11ca8068cdbb51b1eae15510d96ad593a99cf98c6f86c41d1b6f90e54956ff11
   languageName: node
   linkType: hard
 
@@ -34036,15 +34656,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"os-locale@npm:^1.4.0":
-  version: 1.4.0
-  resolution: "os-locale@npm:1.4.0"
-  dependencies:
-    lcid: ^1.0.0
-  checksum: 0161a1b6b5a8492f99f4b47fe465df9fc521c55ba5414fce6444c45e2500487b8ed5b40a47a98a2363fe83ff04ab033785300ed8df717255ec4c3b625e55b1fb
-  languageName: node
-  linkType: hard
-
 "os-tmpdir@npm:~1.0.2":
   version: 1.0.2
   resolution: "os-tmpdir@npm:1.0.2"
@@ -34361,15 +34972,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"parse-json@npm:^2.2.0":
-  version: 2.2.0
-  resolution: "parse-json@npm:2.2.0"
-  dependencies:
-    error-ex: ^1.2.0
-  checksum: dda78a63e57a47b713a038630868538f718a7ca0cd172a36887b0392ccf544ed0374902eb28f8bf3409e8b71d62b79d17062f8543afccf2745f9b0b2d2bb80ca
-  languageName: node
-  linkType: hard
-
 "parse-json@npm:^5.0.0, parse-json@npm:^5.2.0":
   version: 5.2.0
   resolution: "parse-json@npm:5.2.0"
@@ -34382,6 +34984,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"parse-link-header@npm:^2.0.0":
+  version: 2.0.0
+  resolution: "parse-link-header@npm:2.0.0"
+  dependencies:
+    xtend: ~4.0.1
+  checksum: 0e96c6af9910e8f92084b49b8dc6a10dd58db470847d1499f562576180c1ac5e49d18007697f0d538e5f3efdc8ce1d8777641f3ae225302b74af0dd0578b628e
+  languageName: node
+  linkType: hard
+
 "parse-path@npm:^7.0.0":
   version: 7.0.0
   resolution: "parse-path@npm:7.0.0"
@@ -34582,27 +35193,28 @@ __metadata:
   languageName: node
   linkType: hard
 
-"patch-package@npm:^6.5.1":
-  version: 6.5.1
-  resolution: "patch-package@npm:6.5.1"
+"patch-package@npm:^8.0.0":
+  version: 8.0.0
+  resolution: "patch-package@npm:8.0.0"
   dependencies:
     "@yarnpkg/lockfile": ^1.1.0
     chalk: ^4.1.2
-    cross-spawn: ^6.0.5
+    ci-info: ^3.7.0
+    cross-spawn: ^7.0.3
     find-yarn-workspace-root: ^2.0.0
     fs-extra: ^9.0.0
-    is-ci: ^2.0.0
+    json-stable-stringify: ^1.0.2
     klaw-sync: ^6.0.0
     minimist: ^1.2.6
     open: ^7.4.2
     rimraf: ^2.6.3
-    semver: ^5.6.0
+    semver: ^7.5.3
     slash: ^2.0.0
     tmp: ^0.0.33
-    yaml: ^1.10.2
+    yaml: ^2.2.2
   bin:
     patch-package: index.js
-  checksum: 8530ffa30f11136b527c6eddf6da48fa12856ee510a47edb1f9cdf8a025636adb82968f5fae778b5e04ce8c87915ebdf5911422b54add59a5a42e372a8f30eb2
+  checksum: d23cddc4d1622e2d8c7ca31b145c6eddb24bd271f69905e766de5e1f199f0b9a5479a6a6939ea857288399d4ed249285639d539a2c00fbddb7daa39934b007a2
   languageName: node
   linkType: hard
 
@@ -34637,15 +35249,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"path-exists@npm:^2.0.0":
-  version: 2.1.0
-  resolution: "path-exists@npm:2.1.0"
-  dependencies:
-    pinkie-promise: ^2.0.0
-  checksum: fdb734f1d00f225f7a0033ce6d73bff6a7f76ea08936abf0e5196fa6e54a645103538cd8aedcb90d6d8c3fa3705ded0c58a4da5948ae92aa8834892c1ab44a84
-  languageName: node
-  linkType: hard
-
 "path-exists@npm:^3.0.0":
   version: 3.0.0
   resolution: "path-exists@npm:3.0.0"
@@ -34674,13 +35277,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"path-key@npm:^2.0.1":
-  version: 2.0.1
-  resolution: "path-key@npm:2.0.1"
-  checksum: f7ab0ad42fe3fb8c7f11d0c4f849871e28fbd8e1add65c370e422512fc5887097b9cf34d09c1747d45c942a8c1e26468d6356e2df3f740bf177ab8ca7301ebfd
-  languageName: node
-  linkType: hard
-
 "path-key@npm:^3.0.0, path-key@npm:^3.1.0":
   version: 3.1.1
   resolution: "path-key@npm:3.1.1"
@@ -34765,17 +35361,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"path-type@npm:^1.0.0":
-  version: 1.1.0
-  resolution: "path-type@npm:1.1.0"
-  dependencies:
-    graceful-fs: ^4.1.2
-    pify: ^2.0.0
-    pinkie-promise: ^2.0.0
-  checksum: 59a4b2c0e566baf4db3021a1ed4ec09a8b36fca960a490b54a6bcefdb9987dafe772852982b6011cd09579478a96e57960a01f75fa78a794192853c9d468fc79
-  languageName: node
-  linkType: hard
-
 "path-type@npm:^4.0.0":
   version: 4.0.0
   resolution: "path-type@npm:4.0.0"
@@ -34847,7 +35432,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"pg-connection-string@npm:^2.3.0, pg-connection-string@npm:^2.4.0, pg-connection-string@npm:^2.6.2":
+"pg-connection-string@npm:^2.3.0, pg-connection-string@npm:^2.5.0, pg-connection-string@npm:^2.6.2":
   version: 2.6.2
   resolution: "pg-connection-string@npm:2.6.2"
   checksum: 22265882c3b6f2320785378d0760b051294a684989163d5a1cde4009e64e84448d7bf67d9a7b9e7f69440c3ee9e2212f9aa10dd17ad6773f6143c6020cebbcb5
@@ -34912,9 +35497,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"pg@npm:^8.3.0, pg@npm:^8.4.0":
-  version: 8.11.2
-  resolution: "pg@npm:8.11.2"
+"pg@npm:^8.3.0, pg@npm:^8.9.0":
+  version: 8.11.3
+  resolution: "pg@npm:8.11.3"
   dependencies:
     buffer-writer: 2.0.0
     packet-reader: 1.0.0
@@ -34932,7 +35517,7 @@ __metadata:
   peerDependenciesMeta:
     pg-native:
       optional: true
-  checksum: dfea8a2269d500dee8c17291207e5a25897163480037beb7a59be35f51e33b519c297c943ea6898b285d6a74a0d661901dc9cff2e587cc4be0bbf09b833a71a5
+  checksum: 8af9468b8969fa0d73a6b349216c8cbc953d938fcae5594f2d24043060e9226a072c8085fc4230172b5576fcab4c39c8563c655f271dc2a9209b6ad5370cafe5
   languageName: node
   linkType: hard
 
@@ -34945,25 +35530,24 @@ __metadata:
   languageName: node
   linkType: hard
 
-"pgtools@npm:^0.3.0":
-  version: 0.3.2
-  resolution: "pgtools@npm:0.3.2"
+"pgtools@npm:^1.0.0":
+  version: 1.0.1
+  resolution: "pgtools@npm:1.0.1"
   dependencies:
-    bluebird: ^3.3.5
-    pg: ^8.4.0
-    pg-connection-string: ^2.4.0
-    yargs: ^5.0.0
+    pg: ^8.9.0
+    pg-connection-string: ^2.5.0
+    yargs: ^17.7.1
   bin:
-    createdbjs: createdb.js
-    dropdbjs: dropdb.js
-  checksum: 764644cde13431070e4e3558ed08b67fe73cb92d5573d0c0017f76b76cd85b25aecdf3fa948e6d50ceabf315f50ed2cfe52275d04321c274f1a00c26fe8485b4
+    createdbjs: src/bin/createdb.js
+    dropdbjs: src/bin/dropdb.js
+  checksum: d047230e529a37f66cb0253adf505d61bc8f27aa9eb1ab88fe3ce75e3e2118b6771c408e2dbea1be8256b8ab5cc035f44298d47128085626fad6df6c33d026dc
   languageName: node
   linkType: hard
 
 "photoswipe@npm:^5.3.7":
-  version: 5.3.8
-  resolution: "photoswipe@npm:5.3.8"
-  checksum: c33fd86e1a7bb4710d2c971c6e0983a4c41f55b61bf62466d3a7fc1ae3acff3431292cf0b668a52e103092e7ea21ac548fdd90cec7286cd148c6640e915e3184
+  version: 5.3.9
+  resolution: "photoswipe@npm:5.3.9"
+  checksum: 2d9a6168d28f7d6386ff01800c4bb5189595eed0b7e4b04c24b35c8feec479885cb69a0e782225562acd0c9492e9465429dd75877a70028945b2ff1b9eae4ae6
   languageName: node
   linkType: hard
 
@@ -34981,7 +35565,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"pidtree@npm:^0.6.0":
+"pidtree@npm:0.6.0":
   version: 0.6.0
   resolution: "pidtree@npm:0.6.0"
   bin:
@@ -34990,7 +35574,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"pify@npm:^2.0.0, pify@npm:^2.2.0, pify@npm:^2.3.0":
+"pify@npm:^2.2.0, pify@npm:^2.3.0":
   version: 2.3.0
   resolution: "pify@npm:2.3.0"
   checksum: 9503aaeaf4577acc58642ad1d25c45c6d90288596238fb68f82811c08104c800e5a7870398e9f015d82b44ecbcbef3dc3d4251a1cbb582f6e5959fe09884b2ba
@@ -35018,22 +35602,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"pinkie-promise@npm:^2.0.0":
-  version: 2.0.1
-  resolution: "pinkie-promise@npm:2.0.1"
-  dependencies:
-    pinkie: ^2.0.0
-  checksum: b53a4a2e73bf56b6f421eef711e7bdcb693d6abb474d57c5c413b809f654ba5ee750c6a96dd7225052d4b96c4d053cdcb34b708a86fceed4663303abee52fcca
-  languageName: node
-  linkType: hard
-
-"pinkie@npm:^2.0.0":
-  version: 2.0.4
-  resolution: "pinkie@npm:2.0.4"
-  checksum: b12b10afea1177595aab036fc220785488f67b4b0fc49e7a27979472592e971614fa1c728e63ad3e7eb748b4ec3c3dbd780819331dad6f7d635c77c10537b9db
-  languageName: node
-  linkType: hard
-
 "pino-pretty@npm:^2.6.0":
   version: 2.6.1
   resolution: "pino-pretty@npm:2.6.1"
@@ -35586,13 +36154,13 @@ __metadata:
   linkType: hard
 
 "postcss@npm:^8.1.0, postcss@npm:^8.4.21":
-  version: 8.4.27
-  resolution: "postcss@npm:8.4.27"
+  version: 8.4.29
+  resolution: "postcss@npm:8.4.29"
   dependencies:
     nanoid: ^3.3.6
     picocolors: ^1.0.0
     source-map-js: ^1.0.2
-  checksum: 1cdd0c298849df6cd65f7e646a3ba36870a37b65f55fd59d1a165539c263e9b4872a402bf4ed1ca1bc31f58b68b2835545e33ea1a23b161a1f8aa6d5ded81e78
+  checksum: dd6daa25e781db9ae5b651d9b7bfde0ec6e60e86a37da69a18eb4773d5ddd51e28fc4ff054fbdc04636a31462e6bf09a1e50986f69ac52b10d46b7457cd36d12
   languageName: node
   linkType: hard
 
@@ -35663,30 +36231,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"prebuild-install@npm:^6.0.1":
-  version: 6.1.4
-  resolution: "prebuild-install@npm:6.1.4"
-  dependencies:
-    detect-libc: ^1.0.3
-    expand-template: ^2.0.3
-    github-from-package: 0.0.0
-    minimist: ^1.2.3
-    mkdirp-classic: ^0.5.3
-    napi-build-utils: ^1.0.1
-    node-abi: ^2.21.0
-    npmlog: ^4.0.1
-    pump: ^3.0.0
-    rc: ^1.2.7
-    simple-get: ^3.0.3
-    tar-fs: ^2.0.0
-    tunnel-agent: ^0.6.0
-  bin:
-    prebuild-install: bin.js
-  checksum: de4313eda821305912af922700a2db04bb8e77fe8aa9c2788550f1000c026cbefc82da468ec0c0a37764c5417bd8169dbd540928535fb38d00bb9bbd673dd217
-  languageName: node
-  linkType: hard
-
-"prebuild-install@npm:^7.1.0, prebuild-install@npm:^7.1.1":
+"prebuild-install@npm:^7.1.1":
   version: 7.1.1
   resolution: "prebuild-install@npm:7.1.1"
   dependencies:
@@ -35790,14 +36335,14 @@ __metadata:
   languageName: node
   linkType: hard
 
-"pretty-format@npm:^29.0.0, pretty-format@npm:^29.4.3":
-  version: 29.4.3
-  resolution: "pretty-format@npm:29.4.3"
+"pretty-format@npm:^29.0.0, pretty-format@npm:^29.4.3, pretty-format@npm:^29.6.3":
+  version: 29.6.3
+  resolution: "pretty-format@npm:29.6.3"
   dependencies:
-    "@jest/schemas": ^29.4.3
+    "@jest/schemas": ^29.6.3
     ansi-styles: ^5.0.0
     react-is: ^18.0.0
-  checksum: 3258b9a010bd79b3cf73783ad1e4592b6326fc981b6e31b742f316f14e7fbac09b48a9dbf274d092d9bde404db9fe16f518370e121837dc078a597392e6e5cc5
+  checksum: 4e1c0db48e65571c22e80ff92123925ff8b3a2a89b71c3a1683cfde711004d492de32fe60c6bc10eea8bf6c678e5cbe544ac6c56cb8096e1eb7caf856928b1c4
   languageName: node
   linkType: hard
 
@@ -36272,14 +36817,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"ramda@npm:^0.28.0":
-  version: 0.28.0
-  resolution: "ramda@npm:0.28.0"
-  checksum: 44ea6e5010bba70151b6a92d8114a91915e8b5a16105cce65fae58c9d7386b812c429645e35f21141d7087568550ce383bc10ee1a65cdec951f4b69ea457e6a4
-  languageName: node
-  linkType: hard
-
-"ramda@npm:~0.29.0":
+"ramda@npm:^0.29.0, ramda@npm:~0.29.0":
   version: 0.29.0
   resolution: "ramda@npm:0.29.0"
   checksum: 9ab26c06eb7545cbb7eebcf75526d6ee2fcaae19e338f165b2bf32772121e7b28192d6664d1ba222ff76188ba26ab307342d66e805dbb02c860560adc4d5dd57
@@ -36398,6 +36936,20 @@ __metadata:
   languageName: node
   linkType: hard
 
+"rc-progress@npm:3.5.1":
+  version: 3.5.1
+  resolution: "rc-progress@npm:3.5.1"
+  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: b0722a696396f985267e35e26f49c1c1bd6a17b4918eb93318fc36a7a5ffae9806932d4982a7da0d83349648ca85325b792003ec40240820fd6e00e0bc6f3c1d
+  languageName: node
+  linkType: hard
+
 "rc-util@npm:^5.16.1":
   version: 5.16.1
   resolution: "rc-util@npm:5.16.1"
@@ -36655,6 +37207,24 @@ __metadata:
   languageName: node
   linkType: hard
 
+"react-i18next@npm:^12.3.1":
+  version: 12.3.1
+  resolution: "react-i18next@npm:12.3.1"
+  dependencies:
+    "@babel/runtime": ^7.20.6
+    html-parse-stringify: ^3.0.1
+  peerDependencies:
+    i18next: ">= 19.0.0"
+    react: ">= 16.8.0"
+  peerDependenciesMeta:
+    react-dom:
+      optional: true
+    react-native:
+      optional: true
+  checksum: fe3f360e5184bc63861734e94bf625a09b9ec0d28fab41779a68758af258fd1737dde25ff7a88ddb66c1571a3e3de5b3403825a91b4949bf9832a00615acb87a
+  languageName: node
+  linkType: hard
+
 "react-immutable-proptypes@npm:2.2.0":
   version: 2.2.0
   resolution: "react-immutable-proptypes@npm:2.2.0"
@@ -36776,9 +37346,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"react-redux@npm:^8.0.5":
-  version: 8.0.5
-  resolution: "react-redux@npm:8.0.5"
+"react-redux@npm:^8.1.2":
+  version: 8.1.2
+  resolution: "react-redux@npm:8.1.2"
   dependencies:
     "@babel/runtime": ^7.12.1
     "@types/hoist-non-react-statics": ^3.3.1
@@ -36792,7 +37362,7 @@ __metadata:
     react: ^16.8 || ^17.0 || ^18.0
     react-dom: ^16.8 || ^17.0 || ^18.0
     react-native: ">=0.59"
-    redux: ^4
+    redux: ^4 || ^5.0.0-beta.0
   peerDependenciesMeta:
     "@types/react":
       optional: true
@@ -36804,7 +37374,7 @@ __metadata:
       optional: true
     redux:
       optional: true
-  checksum: a108f4f7ead6ac005e656d46051474a2bbdb31ede481bbbb3d8d779c1a35e1940b8655577cc5021313411864d305f67fc719aa48d6e5ed8288cf9cbe8b7042e4
+  checksum: 4d5976b0f721e4148475871fcabce2fee875cc7f70f9a292f3370d63b38aa1dd474eb303c073c5555f3e69fc732f3bac05303def60304775deb28361e3f4b7cc
   languageName: node
   linkType: hard
 
@@ -36879,15 +37449,15 @@ __metadata:
   linkType: hard
 
 "react-router-dom@npm:^6.3.0":
-  version: 6.9.0
-  resolution: "react-router-dom@npm:6.9.0"
+  version: 6.15.0
+  resolution: "react-router-dom@npm:6.15.0"
   dependencies:
-    "@remix-run/router": 1.4.0
-    react-router: 6.9.0
+    "@remix-run/router": 1.8.0
+    react-router: 6.15.0
   peerDependencies:
     react: ">=16.8"
     react-dom: ">=16.8"
-  checksum: 4d593491ab8db5611feda70002c62902baebb84d5c1c5e5b6172496f31f91130deee132bf4240dea634a88cb86c76d6da348f15b9cd5e5197be455efd88edf72
+  checksum: 95301837e293654f00934de6a4bdb27bfb06f613503e4cce7a93f19384793729832e7479d50faf3b9457d149014d4df40a3ee3a5193d7e3a3caadb7aaa6ec0f9
   languageName: node
   linkType: hard
 
@@ -36902,14 +37472,14 @@ __metadata:
   languageName: node
   linkType: hard
 
-"react-router@npm:6.9.0, react-router@npm:^6.3.0":
-  version: 6.9.0
-  resolution: "react-router@npm:6.9.0"
+"react-router@npm:6.15.0, react-router@npm:^6.3.0":
+  version: 6.15.0
+  resolution: "react-router@npm:6.15.0"
   dependencies:
-    "@remix-run/router": 1.4.0
+    "@remix-run/router": 1.8.0
   peerDependencies:
     react: ">=16.8"
-  checksum: b2a5f42e042bee7a7f116ca7817b0e58359e5353d84887c9fe7a633d7490c03b1e0ae37cd01830c2a381e3d1e7d501bb4751e53cc3d491e25f36582d3f6e0546
+  checksum: 345b29277e13997f2625f0037f537eaf1955bb9f44ebfea80dd3ff83fc06273f7b64e1be944bfc75945fd2af5af917874133a8a93ed5ecaca523be8f045ae166
   languageName: node
   linkType: hard
 
@@ -37068,12 +37638,12 @@ __metadata:
   linkType: hard
 
 "react-virtualized-auto-sizer@npm:^1.0.11, react-virtualized-auto-sizer@npm:^1.0.6":
-  version: 1.0.17
-  resolution: "react-virtualized-auto-sizer@npm:1.0.17"
+  version: 1.0.20
+  resolution: "react-virtualized-auto-sizer@npm:1.0.20"
   peerDependencies:
     react: ^15.3.0 || ^16.0.0-alpha || ^17.0.0 || ^18.0.0-rc
     react-dom: ^15.3.0 || ^16.0.0-alpha || ^17.0.0 || ^18.0.0-rc
-  checksum: a9fc3db981e34e95fa1baf278e0fb5be9c31ae34092b4d3059cb55478a4652efca3f1b0f4253d62d099594173e1c1f45a724730b5eecde34a9fc23fbc70c215c
+  checksum: 2c616ec7587de64a46aa8c6c301e75fee87eb7a39013f25d940b0fe95eee5e8a8a3c109923e241b427752d71fba80f44cd2c8557750967df0777d99ebd16ba24
   languageName: node
   linkType: hard
 
@@ -37117,16 +37687,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"read-pkg-up@npm:^1.0.1":
-  version: 1.0.1
-  resolution: "read-pkg-up@npm:1.0.1"
-  dependencies:
-    find-up: ^1.0.0
-    read-pkg: ^1.0.0
-  checksum: d18399a0f46e2da32beb2f041edd0cda49d2f2cc30195a05c759ef3ed9b5e6e19ba1ad1bae2362bdec8c6a9f2c3d18f4d5e8c369e808b03d498d5781cb9122c7
-  languageName: node
-  linkType: hard
-
 "read-pkg-up@npm:^7.0.1":
   version: 7.0.1
   resolution: "read-pkg-up@npm:7.0.1"
@@ -37138,17 +37698,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"read-pkg@npm:^1.0.0":
-  version: 1.1.0
-  resolution: "read-pkg@npm:1.1.0"
-  dependencies:
-    load-json-file: ^1.0.0
-    normalize-package-data: ^2.3.2
-    path-type: ^1.0.0
-  checksum: a0f5d5e32227ec8e6a028dd5c5134eab229768dcb7a5d9a41a284ed28ad4b9284fecc47383dc1593b5694f4de603a7ffaee84b738956b9b77e0999567485a366
-  languageName: node
-  linkType: hard
-
 "read-pkg@npm:^5.2.0":
   version: 5.2.0
   resolution: "read-pkg@npm:5.2.0"
@@ -37184,7 +37733,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"readable-stream@npm:^2.0.0, readable-stream@npm:^2.0.1, readable-stream@npm:^2.0.2, readable-stream@npm:^2.0.5, readable-stream@npm:^2.0.6, readable-stream@npm:^2.2.2, readable-stream@npm:^2.3.3, readable-stream@npm:^2.3.5, readable-stream@npm:^2.3.6":
+"readable-stream@npm:^2.0.0, readable-stream@npm:^2.0.1, readable-stream@npm:^2.0.2, readable-stream@npm:^2.0.5, readable-stream@npm:^2.2.2, readable-stream@npm:^2.3.3, readable-stream@npm:^2.3.5, readable-stream@npm:^2.3.6":
   version: 2.3.8
   resolution: "readable-stream@npm:2.3.8"
   dependencies:
@@ -37199,6 +37748,19 @@ __metadata:
   languageName: node
   linkType: hard
 
+"readable-stream@npm:^4.3.0":
+  version: 4.4.2
+  resolution: "readable-stream@npm:4.4.2"
+  dependencies:
+    abort-controller: ^3.0.0
+    buffer: ^6.0.3
+    events: ^3.3.0
+    process: ^0.11.10
+    string_decoder: ^1.3.0
+  checksum: 6f4063763dbdb52658d22d3f49ca976420e1fbe16bbd241f744383715845350b196a2f08b8d6330f8e219153dff34b140aeefd6296da828e1041a7eab1f20d5e
+  languageName: node
+  linkType: hard
+
 "readable-web-to-node-stream@npm:^3.0.0":
   version: 3.0.2
   resolution: "readable-web-to-node-stream@npm:3.0.2"
@@ -37208,12 +37770,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"readdir-glob@npm:^1.0.0":
-  version: 1.1.1
-  resolution: "readdir-glob@npm:1.1.1"
+"readdir-glob@npm:^1.1.2":
+  version: 1.1.3
+  resolution: "readdir-glob@npm:1.1.3"
   dependencies:
-    minimatch: ^3.0.4
-  checksum: 8dc4ff606aa9ac8f6ac628dfad918aed6514c8b427922928f2ef380a1be106d5b6f1d106af34607955ad504f89f39d83a9b42c5316ed8b96b5f75391e33a6afc
+    minimatch: ^5.1.0
+  checksum: 1dc0f7440ff5d9378b593abe9d42f34ebaf387516615e98ab410cf3a68f840abbf9ff1032d15e0a0dbffa78f9e2c46d4fafdbaac1ca435af2efe3264e3f21874
   languageName: node
   linkType: hard
 
@@ -37273,8 +37835,8 @@ __metadata:
   linkType: hard
 
 "recharts@npm:^2.5.0":
-  version: 2.5.0
-  resolution: "recharts@npm:2.5.0"
+  version: 2.8.0
+  resolution: "recharts@npm:2.8.0"
   dependencies:
     classnames: ^2.2.5
     eventemitter3: ^4.0.1
@@ -37289,7 +37851,7 @@ __metadata:
     prop-types: ^15.6.0
     react: ^16.0.0 || ^17.0.0 || ^18.0.0
     react-dom: ^16.0.0 || ^17.0.0 || ^18.0.0
-  checksum: a40d1788589926fa8a5844868a338aae75a2077a2bc2ac57fc5d61ad21fb62660aed6f00ae8d8a94948b9143255c1760db0d386ecb257ed8290dd7f164b5bd5f
+  checksum: 4638bd5c6c2af8f5c79de5e13cce0e38f06e0bbb0a3c4df27a9b12632fd72c0a0604c8246f55e830f323dfa84a3da7cb2634c2243bb9c775d899fd71f9d4c87a
   languageName: node
   linkType: hard
 
@@ -37397,6 +37959,20 @@ __metadata:
   languageName: node
   linkType: hard
 
+"reflect.getprototypeof@npm:^1.0.3":
+  version: 1.0.3
+  resolution: "reflect.getprototypeof@npm:1.0.3"
+  dependencies:
+    call-bind: ^1.0.2
+    define-properties: ^1.1.4
+    es-abstract: ^1.20.4
+    get-intrinsic: ^1.1.1
+    globalthis: ^1.0.3
+    which-builtin-type: ^1.1.3
+  checksum: 843e2506c013da66f83635f943c5bd41243bc6c7703298531cfb16eb6baaefd92f83031fa37140ad31c4edc86938b6eb385e6fc85bf1628e79348ed49e044f3d
+  languageName: node
+  linkType: hard
+
 "refractor@npm:^3.6.0":
   version: 3.6.0
   resolution: "refractor@npm:3.6.0"
@@ -37408,12 +37984,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"regenerate-unicode-properties@npm:^10.0.1":
-  version: 10.0.1
-  resolution: "regenerate-unicode-properties@npm:10.0.1"
+"regenerate-unicode-properties@npm:^10.1.0":
+  version: 10.1.0
+  resolution: "regenerate-unicode-properties@npm:10.1.0"
   dependencies:
     regenerate: ^1.4.2
-  checksum: 1b638b7087d8143e5be3e20e2cda197ea0440fa0bc2cc49646b2f50c5a2b1acdc54b21e4215805a5a2dd487c686b2291accd5ad00619534098d2667e76247754
+  checksum: b1a8929588433ab8b9dc1a34cf3665b3b472f79f2af6ceae00d905fc496b332b9af09c6718fb28c730918f19a00dc1d7310adbaa9b72a2ec7ad2f435da8ace17
   languageName: node
   linkType: hard
 
@@ -37438,30 +38014,30 @@ __metadata:
   languageName: node
   linkType: hard
 
-"regenerator-runtime@npm:^0.13.11":
-  version: 0.13.11
-  resolution: "regenerator-runtime@npm:0.13.11"
-  checksum: 27481628d22a1c4e3ff551096a683b424242a216fee44685467307f14d58020af1e19660bf2e26064de946bad7eff28950eae9f8209d55723e2d9351e632bbb4
+"regenerator-runtime@npm:^0.14.0":
+  version: 0.14.0
+  resolution: "regenerator-runtime@npm:0.14.0"
+  checksum: 1c977ad82a82a4412e4f639d65d22be376d3ebdd30da2c003eeafdaaacd03fc00c2320f18120007ee700900979284fc78a9f00da7fb593f6e6eeebc673fba9a3
   languageName: node
   linkType: hard
 
-"regenerator-transform@npm:^0.15.0":
-  version: 0.15.0
-  resolution: "regenerator-transform@npm:0.15.0"
+"regenerator-transform@npm:^0.15.2":
+  version: 0.15.2
+  resolution: "regenerator-transform@npm:0.15.2"
   dependencies:
     "@babel/runtime": ^7.8.4
-  checksum: 86e54849ab1167618d28bb56d214c52a983daf29b0d115c976d79840511420049b6b42c9ebdf187defa8e7129bdd74b6dd266420d0d3868c9fa7f793b5d15d49
+  checksum: 20b6f9377d65954980fe044cfdd160de98df415b4bff38fbade67b3337efaf078308c4fed943067cd759827cc8cfeca9cb28ccda1f08333b85d6a2acbd022c27
   languageName: node
   linkType: hard
 
-"regexp.prototype.flags@npm:^1.4.3":
-  version: 1.4.3
-  resolution: "regexp.prototype.flags@npm:1.4.3"
+"regexp.prototype.flags@npm:^1.4.3, regexp.prototype.flags@npm:^1.5.0":
+  version: 1.5.0
+  resolution: "regexp.prototype.flags@npm:1.5.0"
   dependencies:
     call-bind: ^1.0.2
-    define-properties: ^1.1.3
-    functions-have-names: ^1.2.2
-  checksum: 51228bae732592adb3ededd5e15426be25f289e9c4ef15212f4da73f4ec3919b6140806374b8894036a86020d054a8d2657d3fee6bb9b4d35d8939c20030b7a6
+    define-properties: ^1.2.0
+    functions-have-names: ^1.2.3
+  checksum: c541687cdbdfff1b9a07f6e44879f82c66bbf07665f9a7544c5fd16acdb3ec8d1436caab01662d2fbcad403f3499d49ab0b77fbc7ef29ef961d98cc4bc9755b4
   languageName: node
   linkType: hard
 
@@ -37472,35 +38048,28 @@ __metadata:
   languageName: node
   linkType: hard
 
-"regexpu-core@npm:^5.1.0":
-  version: 5.1.0
-  resolution: "regexpu-core@npm:5.1.0"
+"regexpu-core@npm:^5.3.1":
+  version: 5.3.2
+  resolution: "regexpu-core@npm:5.3.2"
   dependencies:
+    "@babel/regjsgen": ^0.8.0
     regenerate: ^1.4.2
-    regenerate-unicode-properties: ^10.0.1
-    regjsgen: ^0.6.0
-    regjsparser: ^0.8.2
+    regenerate-unicode-properties: ^10.1.0
+    regjsparser: ^0.9.1
     unicode-match-property-ecmascript: ^2.0.0
-    unicode-match-property-value-ecmascript: ^2.0.0
-  checksum: 7b4eb8d182d9d10537a220a93138df5bc7eaf4ed53e36b95e8427d33ed8a2b081468f1a15d3e5fcee66517e1df7f5ca180b999e046d060badd97150f2ffe87b2
+    unicode-match-property-value-ecmascript: ^2.1.0
+  checksum: 95bb97088419f5396e07769b7de96f995f58137ad75fac5811fb5fe53737766dfff35d66a0ee66babb1eb55386ef981feaef392f9df6d671f3c124812ba24da2
   languageName: node
   linkType: hard
 
-"regjsgen@npm:^0.6.0":
-  version: 0.6.0
-  resolution: "regjsgen@npm:0.6.0"
-  checksum: c5158ebd735e75074e41292ade1ff05d85566d205426cc61501e360c450a63baced8512ee3ae238e5c0a0e42969563c7875b08fa69d6f0402daf36bcb3e4d348
-  languageName: node
-  linkType: hard
-
-"regjsparser@npm:^0.8.2":
-  version: 0.8.4
-  resolution: "regjsparser@npm:0.8.4"
+"regjsparser@npm:^0.9.1":
+  version: 0.9.1
+  resolution: "regjsparser@npm:0.9.1"
   dependencies:
     jsesc: ~0.5.0
   bin:
     regjsparser: bin/parser
-  checksum: d069b932491761cda127ce11f6bd2729c3b1b394a35200ec33f1199e937423db28ceb86cf33f0a97c76ecd7c0f8db996476579eaf0d80a1f74c1934f4ca8b27a
+  checksum: 5e1b76afe8f1d03c3beaf9e0d935dd467589c3625f6d65fb8ffa14f224d783a0fed4bf49c2c1b8211043ef92b6117313419edf055a098ed8342e340586741afc
   languageName: node
   linkType: hard
 
@@ -37688,13 +38257,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"require-main-filename@npm:^1.0.1":
-  version: 1.0.1
-  resolution: "require-main-filename@npm:1.0.1"
-  checksum: 1fef30754da961f4e13c450c3eb60c7ae898a529c6ad6fa708a70bd2eed01564ceb299187b2899f5562804d797a059f39a5789884d0ac7b7ae1defc68fba4abf
-  languageName: node
-  linkType: hard
-
 "require-main-filename@npm:^2.0.0":
   version: 2.0.0
   resolution: "require-main-filename@npm:2.0.0"
@@ -37770,15 +38332,15 @@ __metadata:
   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.1, resolve@npm:~1.22.1":
-  version: 1.22.1
-  resolution: "resolve@npm:1.22.1"
+  version: 1.22.4
+  resolution: "resolve@npm:1.22.4"
   dependencies:
-    is-core-module: ^2.9.0
+    is-core-module: ^2.13.0
     path-parse: ^1.0.7
     supports-preserve-symlinks-flag: ^1.0.0
   bin:
     resolve: bin/resolve
-  checksum: 07af5fc1e81aa1d866cbc9e9460fbb67318a10fa3c4deadc35c3ad8a898ee9a71a86a65e4755ac3195e0ea0cfbe201eb323ebe655ce90526fd61917313a34e4e
+  checksum: 23f25174c2736ce24c6d918910e0d1f89b6b38fefa07a995dff864acd7863d59a7f049e691f93b4b2ee29696303390d921552b6d1b841ed4a8101f517e1d0124
   languageName: node
   linkType: hard
 
@@ -37795,15 +38357,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"resolve@npm:~1.17.0":
-  version: 1.17.0
-  resolution: "resolve@npm:1.17.0"
-  dependencies:
-    path-parse: ^1.0.6
-  checksum: 9ceaf83b3429f2d7ff5d0281b8d8f18a1f05b6ca86efea7633e76b8f76547f33800799dfdd24434942dec4fbd9e651ed3aef577d9a6b5ec87ad89c1060e24759
-  languageName: node
-  linkType: hard
-
 "resolve@npm:~1.19.0":
   version: 1.19.0
   resolution: "resolve@npm:1.19.0"
@@ -37815,15 +38368,15 @@ __metadata:
   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.1#~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"
+  version: 1.22.4
+  resolution: "resolve@patch:resolve@npm%3A1.22.4#~builtin<compat/resolve>::version=1.22.4&hash=07638b"
   dependencies:
-    is-core-module: ^2.9.0
+    is-core-module: ^2.13.0
     path-parse: ^1.0.7
     supports-preserve-symlinks-flag: ^1.0.0
   bin:
     resolve: bin/resolve
-  checksum: 5656f4d0bedcf8eb52685c1abdf8fbe73a1603bb1160a24d716e27a57f6cecbe2432ff9c89c2bd57542c3a7b9d14b1882b73bfe2e9d7849c9a4c0b8b39f02b8b
+  checksum: c45f2545fdc4d21883861b032789e20aa67a2f2692f68da320cc84d5724cd02f2923766c5354b3210897e88f1a7b3d6d2c7c22faeead8eed7078e4c783a444bc
   languageName: node
   linkType: hard
 
@@ -37840,15 +38393,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"resolve@patch:resolve@~1.17.0#~builtin<compat/resolve>":
-  version: 1.17.0
-  resolution: "resolve@patch:resolve@npm%3A1.17.0#~builtin<compat/resolve>::version=1.17.0&hash=07638b"
-  dependencies:
-    path-parse: ^1.0.6
-  checksum: 6fd799f282ddf078c4bc20ce863e3af01fa8cb218f0658d9162c57161a2dbafe092b13015b9a4c58d0e1e801cf7aa7a4f13115fea9db98c3f9a0c43e429bad6f
-  languageName: node
-  linkType: hard
-
 "resolve@patch:resolve@~1.19.0#~builtin<compat/resolve>":
   version: 1.19.0
   resolution: "resolve@patch:resolve@npm%3A1.19.0#~builtin<compat/resolve>::version=1.19.0&hash=07638b"
@@ -37885,6 +38429,16 @@ __metadata:
   languageName: node
   linkType: hard
 
+"restore-cursor@npm:^4.0.0":
+  version: 4.0.0
+  resolution: "restore-cursor@npm:4.0.0"
+  dependencies:
+    onetime: ^5.1.0
+    signal-exit: ^3.0.2
+  checksum: 5b675c5a59763bf26e604289eab35711525f11388d77f409453904e1e69c0d37ae5889295706b2c81d23bd780165084d040f9b68fffc32cc921519031c4fa4af
+  languageName: node
+  linkType: hard
+
 "ret@npm:^0.2.0, ret@npm:~0.2.0":
   version: 0.2.2
   resolution: "ret@npm:0.2.2"
@@ -38147,7 +38701,7 @@ __metadata:
     "@types/node": ^16.11.26
     "@types/webpack": ^5.28.0
     command-exists: ^1.2.9
-    concurrently: ^7.0.0
+    concurrently: ^8.0.0
     cross-env: ^7.0.0
     e2e-test: "workspace:*"
     eslint: ^8.6.0
@@ -38224,14 +38778,14 @@ __metadata:
   languageName: node
   linkType: hard
 
-"run-script-webpack-plugin@npm:^0.1.0":
-  version: 0.1.1
-  resolution: "run-script-webpack-plugin@npm:0.1.1"
-  checksum: 7c2ca7310438e7e84d1b5b43d040bc1dc8d0c731bac0312605b68fac321e41aa268cd5545c1afce9d65165f5ef6dc8a822e58fbd154c95015fb9c960946e605e
+"run-script-webpack-plugin@npm:^0.2.0":
+  version: 0.2.0
+  resolution: "run-script-webpack-plugin@npm:0.2.0"
+  checksum: 1f5df65b726e098d602b4cc27472d9e2cd88841862f7ca2112f702b01f3c4fc1cd89b54fa63780691d988c9ab36cc9adc08a6fa056cdb9c7b85b027b21ba6cdd
   languageName: node
   linkType: hard
 
-"rxjs@npm:7.8.0, rxjs@npm:^7.0.0, rxjs@npm:^7.2.0, rxjs@npm:^7.5.1, rxjs@npm:^7.5.5, rxjs@npm:^7.8.0":
+"rxjs@npm:7.8.0":
   version: 7.8.0
   resolution: "rxjs@npm:7.8.0"
   dependencies:
@@ -38249,6 +38803,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"rxjs@npm:^7.2.0, rxjs@npm:^7.5.1, rxjs@npm:^7.5.5, rxjs@npm:^7.8.0, rxjs@npm:^7.8.1":
+  version: 7.8.1
+  resolution: "rxjs@npm:7.8.1"
+  dependencies:
+    tslib: ^2.1.0
+  checksum: de4b53db1063e618ec2eca0f7965d9137cabe98cf6be9272efe6c86b47c17b987383df8574861bcced18ebd590764125a901d5506082be84a8b8e364bf05f119
+  languageName: node
+  linkType: hard
+
 "sade@npm:^1.7.3":
   version: 1.8.1
   resolution: "sade@npm:1.8.1"
@@ -38258,6 +38821,18 @@ __metadata:
   languageName: node
   linkType: hard
 
+"safe-array-concat@npm:^1.0.0":
+  version: 1.0.0
+  resolution: "safe-array-concat@npm:1.0.0"
+  dependencies:
+    call-bind: ^1.0.2
+    get-intrinsic: ^1.2.0
+    has-symbols: ^1.0.3
+    isarray: ^2.0.5
+  checksum: f43cb98fe3b566327d0c09284de2b15fb85ae964a89495c1b1a5d50c7c8ed484190f4e5e71aacc167e16231940079b326f2c0807aea633d47cc7322f40a6b57f
+  languageName: node
+  linkType: hard
+
 "safe-buffer@npm:5.1.2, safe-buffer@npm:~5.1.0, safe-buffer@npm:~5.1.1":
   version: 5.1.2
   resolution: "safe-buffer@npm:5.1.2"
@@ -38473,7 +39048,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"semver@npm:2 || 3 || 4 || 5, semver@npm:^5.4.1, semver@npm:^5.5.0, semver@npm:^5.6.0, semver@npm:^5.7.1":
+"semver@npm:2 || 3 || 4 || 5, semver@npm:^5.6.0":
   version: 5.7.2
   resolution: "semver@npm:5.7.2"
   bin:
@@ -38482,16 +39057,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"semver@npm:7.0.0, semver@npm:~7.0.0":
-  version: 7.0.0
-  resolution: "semver@npm:7.0.0"
-  bin:
-    semver: bin/semver.js
-  checksum: 272c11bf8d083274ef79fe40a81c55c184dff84dd58e3c325299d0927ba48cece1f020793d138382b85f89bab5002a35a5ba59a3a68a7eebbb597eb733838778
-  languageName: node
-  linkType: hard
-
-"semver@npm:^6.0.0, semver@npm:^6.1.1, semver@npm:^6.1.2, semver@npm:^6.3.0":
+"semver@npm:^6.0.0, semver@npm:^6.3.0, semver@npm:^6.3.1":
   version: 6.3.1
   resolution: "semver@npm:6.3.1"
   bin:
@@ -38500,7 +39066,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"semver@npm:^7.1.1, semver@npm:^7.1.2, semver@npm:^7.1.3, semver@npm:^7.3.2, semver@npm:^7.3.4, semver@npm:^7.3.5, semver@npm:^7.3.7, semver@npm:^7.3.8, semver@npm:^7.5.0, semver@npm:^7.5.3":
+"semver@npm:^7.1.1, semver@npm:^7.1.2, semver@npm:^7.1.3, semver@npm:^7.3.2, semver@npm:^7.3.4, semver@npm:^7.3.5, semver@npm:^7.3.7, semver@npm:^7.3.8, semver@npm:^7.5.0, semver@npm:^7.5.3, semver@npm:~7.5.4":
   version: 7.5.4
   resolution: "semver@npm:7.5.4"
   dependencies:
@@ -38511,17 +39077,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"semver@npm:~7.3.0":
-  version: 7.3.8
-  resolution: "semver@npm:7.3.8"
-  dependencies:
-    lru-cache: ^6.0.0
-  bin:
-    semver: bin/semver.js
-  checksum: ba9c7cbbf2b7884696523450a61fee1a09930d888b7a8d7579025ad93d459b2d1949ee5bbfeb188b2be5f4ac163544c5e98491ad6152df34154feebc2cc337c1
-  languageName: node
-  linkType: hard
-
 "send@npm:0.18.0":
   version: 0.18.0
   resolution: "send@npm:0.18.0"
@@ -38631,17 +39186,17 @@ __metadata:
   languageName: node
   linkType: hard
 
-"set-blocking@npm:^2.0.0, set-blocking@npm:~2.0.0":
+"set-blocking@npm:^2.0.0":
   version: 2.0.0
   resolution: "set-blocking@npm:2.0.0"
   checksum: 6e65a05f7cf7ebdf8b7c75b101e18c0b7e3dff4940d480efed8aad3a36a4005140b660fa1d804cb8bce911cac290441dc728084a30504d3516ac2ff7ad607b02
   languageName: node
   linkType: hard
 
-"set-cookie-parser@npm:^2.4.6":
-  version: 2.4.8
-  resolution: "set-cookie-parser@npm:2.4.8"
-  checksum: e15b5df9a56ab06d4895286033a6aff7b318ad024310df058b5821b3539cc06f716ef529618cac0dd78df40e37830de715f388c0f97f84062dd9be2326efcd0c
+"set-cookie-parser@npm:^2.4.6, set-cookie-parser@npm:^2.6.0":
+  version: 2.6.0
+  resolution: "set-cookie-parser@npm:2.6.0"
+  checksum: bf11ebc594c53d84588f1b4c04f1b8ce14e0498b1c011b3d76b5c6d5aac481bbc3f7c5260ec4ce99bdc1d9aed19f9fc315e73166a36ca74d0f12349a73f6bdc9
   languageName: node
   linkType: hard
 
@@ -38760,10 +39315,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"shell-quote@npm:^1.7.3":
-  version: 1.7.3
-  resolution: "shell-quote@npm:1.7.3"
-  checksum: aca58e73a3a5d933d02e0bdddedc53ee14f7c2ec264f97ac915b9d4482d077a38e422aa664631d60a672cd3cdb4054eb2e6c0303f54882453dacb6483e482d34
+"shell-quote@npm:^1.7.3, shell-quote@npm:^1.8.1":
+  version: 1.8.1
+  resolution: "shell-quote@npm:1.8.1"
+  checksum: 5f01201f4ef504d4c6a9d0d283fa17075f6770bfbe4c5850b074974c68062f37929ca61700d95ad2ac8822e14e8c4b990ca0e6e9272e64befd74ce5e19f0736b
   languageName: node
   linkType: hard
 
@@ -38881,12 +39436,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"simple-update-notifier@npm:^1.0.7":
-  version: 1.0.7
-  resolution: "simple-update-notifier@npm:1.0.7"
+"simple-update-notifier@npm:^2.0.0":
+  version: 2.0.0
+  resolution: "simple-update-notifier@npm:2.0.0"
   dependencies:
-    semver: ~7.0.0
-  checksum: aaadc1f158ad5101b363d1c7aed1f30fc1cac59a760aa31702633e0e6fe423348f07d0e78185aef0aad29130a7b7f0f188c21c7bc7353f897a0ea3682e051a70
+    semver: ^7.5.3
+  checksum: 9ba00d38ce6a29682f64a46213834e4eb01634c2f52c813a9a7b8873ca49cdbb703696f3290f3b27dc067de6d9418b0b84bef22c3eb074acf352529b2d6c27fd
   languageName: node
   linkType: hard
 
@@ -39149,10 +39704,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"spawn-command@npm:^0.0.2-1":
-  version: 0.0.2-1
-  resolution: "spawn-command@npm:0.0.2-1"
-  checksum: 2cac8519332193d1ed37d57298c4a1f73095e9edd20440fbab4aa47f531da83831734f2b51c44bb42b2747bf3485dec3fa2b0a1003f74c67561f2636622e328b
+"spawn-command@npm:0.0.2, spawn-command@npm:^0.0.2-1":
+  version: 0.0.2
+  resolution: "spawn-command@npm:0.0.2"
+  checksum: e35c5d28177b4d461d33c88cc11f6f3a5079e2b132c11e1746453bbb7a0c0b8a634f07541a2a234fa4758239d88203b758def509161b651e81958894c0b4b64b
   languageName: node
   linkType: hard
 
@@ -39592,10 +40147,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"string-argv@npm:^0.3.1, string-argv@npm:~0.3.1":
-  version: 0.3.1
-  resolution: "string-argv@npm:0.3.1"
-  checksum: efbd0289b599bee808ce80820dfe49c9635610715429c6b7cc50750f0437e3c2f697c81e5c390208c13b5d5d12d904a1546172a88579f6ee5cbaaaa4dc9ec5cf
+"string-argv@npm:0.3.2, string-argv@npm:~0.3.1":
+  version: 0.3.2
+  resolution: "string-argv@npm:0.3.2"
+  checksum: 8703ad3f3db0b2641ed2adbb15cf24d3945070d9a751f9e74a924966db9f325ac755169007233e8985a39a6a292f14d4fee20482989b89b96e473c4221508a0f
   languageName: node
   linkType: hard
 
@@ -39634,17 +40189,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"string-width@npm:^1.0.1, string-width@npm:^1.0.2":
-  version: 1.0.2
-  resolution: "string-width@npm:1.0.2"
-  dependencies:
-    code-point-at: ^1.0.0
-    is-fullwidth-code-point: ^1.0.0
-    strip-ansi: ^3.0.0
-  checksum: 5c79439e95bc3bd7233a332c5f5926ab2ee90b23816ed4faa380ce3b2576d7800b0a5bb15ae88ed28737acc7ea06a518c2eef39142dd727adad0e45c776cd37e
-  languageName: node
-  linkType: hard
-
 "string-width@npm:^5.0.0, string-width@npm:^5.0.1, string-width@npm:^5.1.2":
   version: 5.1.2
   resolution: "string-width@npm:5.1.2"
@@ -39679,29 +40223,40 @@ __metadata:
   languageName: node
   linkType: hard
 
-"string.prototype.trimend@npm:^1.0.5":
-  version: 1.0.5
-  resolution: "string.prototype.trimend@npm:1.0.5"
+"string.prototype.trim@npm:^1.2.7":
+  version: 1.2.7
+  resolution: "string.prototype.trim@npm:1.2.7"
   dependencies:
     call-bind: ^1.0.2
     define-properties: ^1.1.4
-    es-abstract: ^1.19.5
-  checksum: d44f543833112f57224e79182debadc9f4f3bf9d48a0414d6f0cbd2a86f2b3e8c0ca1f95c3f8e5b32ae83e91554d79d932fc746b411895f03f93d89ed3dfb6bc
+    es-abstract: ^1.20.4
+  checksum: 05b7b2d6af63648e70e44c4a8d10d8cc457536df78b55b9d6230918bde75c5987f6b8604438c4c8652eb55e4fc9725d2912789eb4ec457d6995f3495af190c09
   languageName: node
   linkType: hard
 
-"string.prototype.trimstart@npm:^1.0.5":
-  version: 1.0.5
-  resolution: "string.prototype.trimstart@npm:1.0.5"
+"string.prototype.trimend@npm:^1.0.6":
+  version: 1.0.6
+  resolution: "string.prototype.trimend@npm:1.0.6"
   dependencies:
     call-bind: ^1.0.2
     define-properties: ^1.1.4
-    es-abstract: ^1.19.5
-  checksum: a4857c5399ad709d159a77371eeaa8f9cc284469a0b5e1bfe405de16f1fd4166a8ea6f4180e55032f348d1b679b1599fd4301fbc7a8b72bdb3e795e43f7b1048
+    es-abstract: ^1.20.4
+  checksum: 0fdc34645a639bd35179b5a08227a353b88dc089adf438f46be8a7c197fc3f22f8514c1c9be4629b3cd29c281582730a8cbbad6466c60f76b5f99cf2addb132e
   languageName: node
   linkType: hard
 
-"string_decoder@npm:^1.0.0, string_decoder@npm:^1.1.1":
+"string.prototype.trimstart@npm:^1.0.6":
+  version: 1.0.6
+  resolution: "string.prototype.trimstart@npm:1.0.6"
+  dependencies:
+    call-bind: ^1.0.2
+    define-properties: ^1.1.4
+    es-abstract: ^1.20.4
+  checksum: 89080feef416621e6ef1279588994305477a7a91648d9436490d56010a1f7adc39167cddac7ce0b9884b8cdbef086987c4dcb2960209f2af8bac0d23ceff4f41
+  languageName: node
+  linkType: hard
+
+"string_decoder@npm:^1.0.0, string_decoder@npm:^1.1.1, string_decoder@npm:^1.3.0":
   version: 1.3.0
   resolution: "string_decoder@npm:1.3.0"
   dependencies:
@@ -39737,15 +40292,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"strip-ansi@npm:^3.0.0, strip-ansi@npm:^3.0.1":
-  version: 3.0.1
-  resolution: "strip-ansi@npm:3.0.1"
-  dependencies:
-    ansi-regex: ^2.0.0
-  checksum: 9b974de611ce5075c70629c00fa98c46144043db92ae17748fb780f706f7a789e9989fd10597b7c2053ae8d1513fd707816a91f1879b2f71e6ac0b6a863db465
-  languageName: node
-  linkType: hard
-
 "strip-ansi@npm:^7.0.1":
   version: 7.0.1
   resolution: "strip-ansi@npm:7.0.1"
@@ -39874,10 +40420,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"style-mod@npm:^4.0.0":
-  version: 4.0.0
-  resolution: "style-mod@npm:4.0.0"
-  checksum: c19f73d660a94244f0715180a6141bf75d05e5b156cc956ba11970b83cd303c3f7edafe5fb61a3192da6186cc008bdcdd803a979070f9b64e13046463644043c
+"style-mod@npm:^4.0.0, style-mod@npm:^4.1.0":
+  version: 4.1.0
+  resolution: "style-mod@npm:4.1.0"
+  checksum: 8402b14ca11113a3640d46b3cf7ba49f05452df7846bc5185a3535d9b6a64a3019e7fb636b59ccbb7816aeb0725b24723e77a85b05612a9360e419958e13b4e6
   languageName: node
   linkType: hard
 
@@ -39924,10 +40470,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"stylis@npm:4.1.3, stylis@npm:^4.0.6":
-  version: 4.1.3
-  resolution: "stylis@npm:4.1.3"
-  checksum: d04dbffcb9bf2c5ca8d8dc09534203c75df3bf711d33973ea22038a99cc475412a350b661ebd99cbc01daa50d7eedcf0d130d121800eb7318759a197023442a6
+"stylis@npm:4.2.0, stylis@npm:^4.0.6":
+  version: 4.2.0
+  resolution: "stylis@npm:4.2.0"
+  checksum: 0eb6cc1b866dc17a6037d0a82ac7fa877eba6a757443e79e7c4f35bacedbf6421fadcab4363b39667b43355cbaaa570a3cde850f776498e5450f32ed2f9b7584
   languageName: node
   linkType: hard
 
@@ -39947,9 +40493,10 @@ __metadata:
   linkType: hard
 
 "sucrase@npm:^3.20.2":
-  version: 3.30.0
-  resolution: "sucrase@npm:3.30.0"
+  version: 3.34.0
+  resolution: "sucrase@npm:3.34.0"
   dependencies:
+    "@jridgewell/gen-mapping": ^0.3.2
     commander: ^4.0.0
     glob: 7.1.6
     lines-and-columns: ^1.1.6
@@ -39959,7 +40506,7 @@ __metadata:
   bin:
     sucrase: bin/sucrase
     sucrase-node: bin/sucrase-node
-  checksum: 9d53ee132f8063573c9f336c2dbc00a1f91fb976a4ad4dca29a15a898d361e6d4a06ada086c6881fe63389d96392cbd761d790a8175a6ecb184eaa337d58f363
+  checksum: 61860063bdf6103413698e13247a3074d25843e91170825a9752e4af7668ffadd331b6e99e92fc32ee5b3c484ee134936f926fa9039d5711fafff29d017a2110
   languageName: node
   linkType: hard
 
@@ -40056,15 +40603,15 @@ __metadata:
   languageName: node
   linkType: hard
 
-"swagger-client@npm:^3.19.8":
-  version: 3.19.8
-  resolution: "swagger-client@npm:3.19.8"
+"swagger-client@npm:^3.20.0":
+  version: 3.20.0
+  resolution: "swagger-client@npm:3.20.0"
   dependencies:
     "@babel/runtime-corejs3": ^7.20.13
-    "@swagger-api/apidom-core": ">=0.70.0 <1.0.0"
-    "@swagger-api/apidom-json-pointer": ">=0.70.0 <1.0.0"
-    "@swagger-api/apidom-ns-openapi-3-1": ">=0.70.0 <1.0.0"
-    "@swagger-api/apidom-reference": ">=0.70.0 <1.0.0"
+    "@swagger-api/apidom-core": ">=0.74.1 <1.0.0"
+    "@swagger-api/apidom-json-pointer": ">=0.74.1 <1.0.0"
+    "@swagger-api/apidom-ns-openapi-3-1": ">=0.74.1 <1.0.0"
+    "@swagger-api/apidom-reference": ">=0.74.1 <1.0.0"
     cookie: ~0.5.0
     cross-fetch: ^3.1.5
     deepmerge: ~4.3.0
@@ -40077,27 +40624,27 @@ __metadata:
     qs: ^6.10.2
     traverse: ~0.6.6
     url: ~0.11.0
-  checksum: 6acb65fe70a24a5c9aace54193b085a594198b1edd3a4533ef86b2ee733a0fcaad8abd7ab0d77d5f14468bccaec88b4b39793a6bc9fa07ff7a925101a106bed4
+  checksum: c61452d0c810e05ec319dfc9bf8b876a87d1d5ed74156764ccc627e79e8a6c0d84f4660754dd1e2f7570adfa17a89c2d16cc337421b7da3bec0b428224a70436
   languageName: node
   linkType: hard
 
 "swagger-ui-react@npm:^5.0.0":
-  version: 5.0.0
-  resolution: "swagger-ui-react@npm:5.0.0"
+  version: 5.6.2
+  resolution: "swagger-ui-react@npm:5.6.2"
   dependencies:
-    "@babel/runtime-corejs3": ^7.22.5
-    "@braintree/sanitize-url": =6.0.2
+    "@babel/runtime-corejs3": ^7.22.11
+    "@braintree/sanitize-url": =6.0.4
     base64-js: ^1.5.1
     classnames: ^2.3.1
     css.escape: 1.5.1
     deep-extend: 0.6.0
-    dompurify: =3.0.2
+    dompurify: =3.0.5
     ieee754: ^1.2.1
     immutable: ^3.x.x
     js-file-download: ^0.4.12
     js-yaml: =4.1.0
     lodash: ^4.17.21
-    patch-package: ^6.5.1
+    patch-package: ^8.0.0
     prop-types: ^15.8.1
     randexp: ^0.5.3
     randombytes: ^2.1.0
@@ -40106,7 +40653,7 @@ __metadata:
     react-immutable-proptypes: 2.2.0
     react-immutable-pure-component: ^2.2.0
     react-inspector: ^6.0.1
-    react-redux: ^8.0.5
+    react-redux: ^8.1.2
     react-syntax-highlighter: ^15.5.0
     redux: ^4.1.2
     redux-immutable: ^4.0.0
@@ -40114,7 +40661,7 @@ __metadata:
     reselect: ^4.1.8
     serialize-error: ^8.1.0
     sha.js: ^2.4.11
-    swagger-client: ^3.19.8
+    swagger-client: ^3.20.0
     url-parse: ^1.5.10
     xml: =1.0.1
     xml-but-prettier: ^1.0.1
@@ -40122,7 +40669,7 @@ __metadata:
   peerDependencies:
     react: ">=17.0.0"
     react-dom: ">=17.0.0"
-  checksum: 88c6232027ee0ec515bd21d183567b672821410df29281a7996e98f82392c41e9eb8955f463d8e835f93ba21201651fa46cd465cb1639c90501475a9757247f4
+  checksum: 50a9ad4ed40a87b2a5b169ac1697c163123491ee4ffcc1a4d617f578bf0636d3246caf92811122c9ec73b7ebe34df41f0298e5de4f05647474c8d8352f7cb194
   languageName: node
   linkType: hard
 
@@ -40146,13 +40693,14 @@ __metadata:
   linkType: hard
 
 "swr@npm:^2.0.0":
-  version: 2.2.0
-  resolution: "swr@npm:2.2.0"
+  version: 2.2.2
+  resolution: "swr@npm:2.2.2"
   dependencies:
+    client-only: ^0.0.1
     use-sync-external-store: ^1.2.0
   peerDependencies:
     react: ^16.11.0 || ^17.0.0 || ^18.0.0
-  checksum: 1f04795ff9dff54987cbf8a544afc9e42d1350a99e899be8a7cdc4885f561e3ee464f78245ee2ebc8ced262b04023d134f731e276227319dc2d6e1843389ddd8
+  checksum: afb3d4824f7631bc3a045483f4e4beb5ca9bfa82b64690b3d1133cdf0666ad8e4a9a879657fac5b34dbf19ea9a1503cf92c9bde972f3d40cefe434c73bd9627a
   languageName: node
   linkType: hard
 
@@ -40229,8 +40777,8 @@ __metadata:
   linkType: hard
 
 "tar@npm:^6.0.2, tar@npm:^6.1.0, tar@npm:^6.1.11, tar@npm:^6.1.12, tar@npm:^6.1.2":
-  version: 6.1.15
-  resolution: "tar@npm:6.1.15"
+  version: 6.2.0
+  resolution: "tar@npm:6.2.0"
   dependencies:
     chownr: ^2.0.0
     fs-minipass: ^2.0.0
@@ -40238,7 +40786,7 @@ __metadata:
     minizlib: ^2.1.1
     mkdirp: ^1.0.3
     yallist: ^4.0.0
-  checksum: f23832fceeba7578bf31907aac744ae21e74a66f4a17a9e94507acf460e48f6db598c7023882db33bab75b80e027c21f276d405e4a0322d58f51c7088d428268
+  checksum: db4d9fe74a2082c3a5016630092c54c8375ff3b280186938cfd104f2e089c4fd9bad58688ef6be9cf186a889671bf355c7cda38f09bbf60604b281715ca57f5c
   languageName: node
   linkType: hard
 
@@ -40287,7 +40835,6 @@ __metadata:
     "@testing-library/jest-dom": ^5.10.1
     "@testing-library/react": ^12.1.3
     "@testing-library/user-event": ^14.0.0
-    "@types/node": ^16.11.26
     "@types/react": "*"
     "@types/react-dom": "*"
     cross-env: ^7.0.0
@@ -40647,17 +41194,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"tough-cookie@npm:^3.0.1":
-  version: 3.0.1
-  resolution: "tough-cookie@npm:3.0.1"
-  dependencies:
-    ip-regex: ^2.1.0
-    psl: ^1.1.28
-    punycode: ^2.1.1
-  checksum: 796f6239bce5674a1267b19f41972a2602a2a23715817237b5922b0dc2343512512eea7d41d29210a4ec545f8ef32173bbbf01277dd8ec3ae3841b19cbe69f67
-  languageName: node
-  linkType: hard
-
 "tough-cookie@npm:^4.0.0":
   version: 4.0.0
   resolution: "tough-cookie@npm:4.0.0"
@@ -40740,14 +41276,14 @@ __metadata:
   languageName: node
   linkType: hard
 
-"tree-sitter@npm:=0.20.1":
-  version: 0.20.1
-  resolution: "tree-sitter@npm:0.20.1"
+"tree-sitter@npm:=0.20.4":
+  version: 0.20.4
+  resolution: "tree-sitter@npm:0.20.4"
   dependencies:
-    nan: ^2.14.0
+    nan: ^2.17.0
     node-gyp: latest
-    prebuild-install: ^6.0.1
-  checksum: a33bf01f9dc558aa0075c9634d06743ed9b7fbf273d2acfbe96daf83f48aec46be7dc42d80d2423c36593d36d3bf189d3fa023d6ce389e20ff9527fae118b215
+    prebuild-install: ^7.1.1
+  checksum: 724f9773759a6ece317fff08deef2d2c63a6ea3b4f6723d5d6d56a7a886d27f799641d189d616c121a580e8492992bc2ede8d2e5c4241f30ff4ee9036dc6bb92
   languageName: node
   linkType: hard
 
@@ -40878,15 +41414,15 @@ __metadata:
   languageName: node
   linkType: hard
 
-"tsconfig-paths@npm:^3.14.1":
-  version: 3.14.1
-  resolution: "tsconfig-paths@npm:3.14.1"
+"tsconfig-paths@npm:^3.14.2":
+  version: 3.14.2
+  resolution: "tsconfig-paths@npm:3.14.2"
   dependencies:
     "@types/json5": ^0.0.29
-    json5: ^1.0.1
+    json5: ^1.0.2
     minimist: ^1.2.6
     strip-bom: ^3.0.0
-  checksum: 8afa01c673ebb4782ba53d3a12df97fa837ce524f8ad38ee4e2b2fd57f5ac79abc21c574e9e9eb014d93efe7fe8214001b96233b5c6ea75bd1ea82afe17a4c6d
+  checksum: a6162eaa1aed680537f93621b82399c7856afd10ec299867b13a0675e981acac4e0ec00896860480efc59fc10fd0b16fdc928c0b885865b52be62cadac692447
   languageName: node
   linkType: hard
 
@@ -41036,6 +41572,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"type-fest@npm:^1.0.2":
+  version: 1.4.0
+  resolution: "type-fest@npm:1.4.0"
+  checksum: b011c3388665b097ae6a109a437a04d6f61d81b7357f74cbcb02246f2f5bd72b888ae33631b99871388122ba0a87f4ff1c94078e7119ff22c70e52c0ff828201
+  languageName: node
+  linkType: hard
+
 "type-fest@npm:^2.19.0":
   version: 2.19.0
   resolution: "type-fest@npm:2.19.0"
@@ -41053,6 +41596,53 @@ __metadata:
   languageName: node
   linkType: hard
 
+"typed-array-buffer@npm:^1.0.0":
+  version: 1.0.0
+  resolution: "typed-array-buffer@npm:1.0.0"
+  dependencies:
+    call-bind: ^1.0.2
+    get-intrinsic: ^1.2.1
+    is-typed-array: ^1.1.10
+  checksum: 3e0281c79b2a40cd97fe715db803884301993f4e8c18e8d79d75fd18f796e8cd203310fec8c7fdb5e6c09bedf0af4f6ab8b75eb3d3a85da69328f28a80456bd3
+  languageName: node
+  linkType: hard
+
+"typed-array-byte-length@npm:^1.0.0":
+  version: 1.0.0
+  resolution: "typed-array-byte-length@npm:1.0.0"
+  dependencies:
+    call-bind: ^1.0.2
+    for-each: ^0.3.3
+    has-proto: ^1.0.1
+    is-typed-array: ^1.1.10
+  checksum: b03db16458322b263d87a702ff25388293f1356326c8a678d7515767ef563ef80e1e67ce648b821ec13178dd628eb2afdc19f97001ceae7a31acf674c849af94
+  languageName: node
+  linkType: hard
+
+"typed-array-byte-offset@npm:^1.0.0":
+  version: 1.0.0
+  resolution: "typed-array-byte-offset@npm:1.0.0"
+  dependencies:
+    available-typed-arrays: ^1.0.5
+    call-bind: ^1.0.2
+    for-each: ^0.3.3
+    has-proto: ^1.0.1
+    is-typed-array: ^1.1.10
+  checksum: 04f6f02d0e9a948a95fbfe0d5a70b002191fae0b8fe0fe3130a9b2336f043daf7a3dda56a31333c35a067a97e13f539949ab261ca0f3692c41603a46a94e960b
+  languageName: node
+  linkType: hard
+
+"typed-array-length@npm:^1.0.4":
+  version: 1.0.4
+  resolution: "typed-array-length@npm:1.0.4"
+  dependencies:
+    call-bind: ^1.0.2
+    for-each: ^0.3.3
+    is-typed-array: ^1.1.9
+  checksum: 2228febc93c7feff142b8c96a58d4a0d7623ecde6c7a24b2b98eb3170e99f7c7eff8c114f9b283085cd59dcd2bd43aadf20e25bba4b034a53c5bb292f71f8956
+  languageName: node
+  linkType: hard
+
 "typed-rest-client@npm:^1.8.4":
   version: 1.8.4
   resolution: "typed-rest-client@npm:1.8.4"
@@ -41071,12 +41661,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"types-ramda@npm:^0.29.3":
-  version: 0.29.3
-  resolution: "types-ramda@npm:0.29.3"
+"types-ramda@npm:^0.29.4":
+  version: 0.29.4
+  resolution: "types-ramda@npm:0.29.4"
   dependencies:
     ts-toolbelt: ^9.6.0
-  checksum: 2efb5182a02b9b11b0fd960c501c8a3c595f7fe82922526872020868a6a98c788b544c6beccb48360f1af9401d0c7f5e0be9b2ca484987f0339a71f48cec6199
+  checksum: 08a872e71555fe6a3f1fd9381989a573d493f2156d9689f3bb72278db73c848122d67a9efff1867ce97b3dfbb2fdadaa3864daaee014ab19cf9bbfe2c171ed52
   languageName: node
   linkType: hard
 
@@ -41098,7 +41688,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"typescript@npm:~4.8.2, typescript@npm:~4.8.4":
+"typescript@npm:~4.8.2":
   version: 4.8.4
   resolution: "typescript@npm:4.8.4"
   bin:
@@ -41118,7 +41708,17 @@ __metadata:
   languageName: node
   linkType: hard
 
-"typescript@patch:typescript@~4.8.2#~builtin<compat/typescript>, typescript@patch:typescript@~4.8.4#~builtin<compat/typescript>":
+"typescript@npm:~5.0.4":
+  version: 5.0.4
+  resolution: "typescript@npm:5.0.4"
+  bin:
+    tsc: bin/tsc
+    tsserver: bin/tsserver
+  checksum: 82b94da3f4604a8946da585f7d6c3025fff8410779e5bde2855ab130d05e4fd08938b9e593b6ebed165bda6ad9292b230984f10952cf82f0a0ca07bbeaa08172
+  languageName: node
+  linkType: hard
+
+"typescript@patch:typescript@~4.8.2#~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:
@@ -41138,6 +41738,16 @@ __metadata:
   languageName: node
   linkType: hard
 
+"typescript@patch:typescript@~5.0.4#~builtin<compat/typescript>":
+  version: 5.0.4
+  resolution: "typescript@patch:typescript@npm%3A5.0.4#~builtin<compat/typescript>::version=5.0.4&hash=a1c5e5"
+  bin:
+    tsc: bin/tsc
+    tsserver: bin/tsserver
+  checksum: 6a1fe9a77bb9c5176ead919cc4a1499ee63e46b4e05bf667079f11bf3a8f7887f135aa72460a4c3b016e6e6bb65a822cb8689a6d86cbfe92d22cc9f501f09213
+  languageName: node
+  linkType: hard
+
 "ua-parser-js@npm:^0.7.30":
   version: 0.7.33
   resolution: "ua-parser-js@npm:0.7.33"
@@ -41262,10 +41872,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"unicode-match-property-value-ecmascript@npm:^2.0.0":
-  version: 2.0.0
-  resolution: "unicode-match-property-value-ecmascript@npm:2.0.0"
-  checksum: 8fe6a09d9085a625cabcead5d95bdbc1a2d5d481712856092ce0347231e81a60b93a68f1b69e82b3076a07e415a72c708044efa2aa40ae23e2e7b5c99ed4a9ea
+"unicode-match-property-value-ecmascript@npm:^2.1.0":
+  version: 2.1.0
+  resolution: "unicode-match-property-value-ecmascript@npm:2.1.0"
+  checksum: 8d6f5f586b9ce1ed0e84a37df6b42fdba1317a05b5df0c249962bd5da89528771e2d149837cad11aa26bcb84c35355cb9f58a10c3d41fa3b899181ece6c85220
   languageName: node
   linkType: hard
 
@@ -41455,10 +42065,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"unraw@npm:^2.0.1":
-  version: 2.0.1
-  resolution: "unraw@npm:2.0.1"
-  checksum: af9a9d2f6e420cb4f52fe2f1f5982e6b0be95da640d6ae8d6d9ff631d864771793cb9fe7e2a16ef1ce631b94065f4438e7bd7f1701076fc69296edc4e704d42f
+"unraw@npm:^3.0.0":
+  version: 3.0.0
+  resolution: "unraw@npm:3.0.0"
+  checksum: 19eee0bc500ce197d262b79723a2c8c81c1d716baaa2a62c48a4d0d6b9e1fd9d350c5df86262e51343d591ab9c8a47ed150317d0b867b2b65795cdc17ef69873
   languageName: node
   linkType: hard
 
@@ -41469,17 +42079,17 @@ __metadata:
   languageName: node
   linkType: hard
 
-"update-browserslist-db@npm:^1.0.9":
-  version: 1.0.9
-  resolution: "update-browserslist-db@npm:1.0.9"
+"update-browserslist-db@npm:^1.0.11":
+  version: 1.0.11
+  resolution: "update-browserslist-db@npm:1.0.11"
   dependencies:
     escalade: ^3.1.1
     picocolors: ^1.0.0
   peerDependencies:
     browserslist: ">= 4.21.0"
   bin:
-    browserslist-lint: cli.js
-  checksum: f625899b236f6a4d7f62b56be1b8da230c5563d1fef84d3ef148f2e1a3f11a5a4b3be4fd7e3703e51274c116194017775b10afb4de09eb2c0d09d36b90f1f578
+    update-browserslist-db: cli.js
+  checksum: b98327518f9a345c7cad5437afae4d2ae7d865f9779554baf2a200fdf4bac4969076b679b1115434bd6557376bdd37ca7583d0f9b8f8e302d7d4cc1e91b5f231
   languageName: node
   linkType: hard
 
@@ -41574,13 +42184,13 @@ __metadata:
   languageName: node
   linkType: hard
 
-"use-immer@npm:^0.8.0":
-  version: 0.8.1
-  resolution: "use-immer@npm:0.8.1"
+"use-immer@npm:^0.9.0":
+  version: 0.9.0
+  resolution: "use-immer@npm:0.9.0"
   peerDependencies:
     immer: ">=2.0.0"
     react: ^16.8.0 || ^17.0.1 || ^18.0.0
-  checksum: 9ffc1a201a92b6b026c420718e6a00e72ba48b62420bb515927b379bb1d791b5b4766b57c755b4851c0e1f80000e639bc1cf8e73424e44466741c159391d35dd
+  checksum: 3f02e31d38f354125e6cffaaed0a08d9bf122b9df261aa7b38a25246813b3bd8b22bf97b192099d4e84adcfbbb07e69e14ba29520e0ac8d93f3991ef3a3652b4
   languageName: node
   linkType: hard
 
@@ -41957,6 +42567,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"void-elements@npm:3.1.0":
+  version: 3.1.0
+  resolution: "void-elements@npm:3.1.0"
+  checksum: 0390f818107fa8fce55bb0a5c3f661056001c1d5a2a48c28d582d4d847347c2ab5b7f8272314cac58acf62345126b6b09bea623a185935f6b1c3bbce0dfd7f7f
+  languageName: node
+  linkType: hard
+
 "vscode-languageserver-types@npm:^3.15.1":
   version: 3.15.1
   resolution: "vscode-languageserver-types@npm:3.15.1"
@@ -42109,10 +42726,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"web-tree-sitter@npm:=0.20.7":
-  version: 0.20.7
-  resolution: "web-tree-sitter@npm:0.20.7"
-  checksum: f2949a679bbca5ecb225ab26a67ff99e6e3907fa905c6bd62bfe6d2cfa216347f8cc481efcd32f181cb6b964bc03c42f9611e16da0825bff43de389b17ff9f7f
+"web-tree-sitter@npm:=0.20.3":
+  version: 0.20.3
+  resolution: "web-tree-sitter@npm:0.20.3"
+  checksum: 1187b48d69d6f6319c74ca8f413e8d7c1703869a351070053351ef169c045aad16e5c6b2a73779beaade2f0b6bb3433166363355c9d02e9b2dcf60a195dbffdb
   languageName: node
   linkType: hard
 
@@ -42180,8 +42797,8 @@ __metadata:
   linkType: hard
 
 "webpack-dev-server@npm:^4.7.3":
-  version: 4.13.3
-  resolution: "webpack-dev-server@npm:4.13.3"
+  version: 4.15.1
+  resolution: "webpack-dev-server@npm:4.15.1"
   dependencies:
     "@types/bonjour": ^3.5.9
     "@types/connect-history-api-fallback": ^1.3.5
@@ -42189,7 +42806,7 @@ __metadata:
     "@types/serve-index": ^1.9.1
     "@types/serve-static": ^1.13.10
     "@types/sockjs": ^0.3.33
-    "@types/ws": ^8.5.1
+    "@types/ws": ^8.5.5
     ansi-html-community: ^0.0.8
     bonjour-service: ^1.0.11
     chokidar: ^3.5.3
@@ -42222,7 +42839,7 @@ __metadata:
       optional: true
   bin:
     webpack-dev-server: bin/webpack-dev-server.js
-  checksum: d019844d3bc384676921afadfbd0a95fd06e475f2d43604789a4a8f42f79a8fb37e745f15f47f352630046dd6c6c9694051a7552b34a056c59d3a601e74d6320
+  checksum: cd0063b068d2b938fd76c412d555374186ac2fa84bbae098265212ed50a5c15d6f03aa12a5a310c544a242943eb58c0bfde4c296d5c36765c182f53799e1bc71
   languageName: node
   linkType: hard
 
@@ -42251,8 +42868,8 @@ __metadata:
   linkType: hard
 
 "webpack@npm:^5, webpack@npm:^5.70.0":
-  version: 5.88.1
-  resolution: "webpack@npm:5.88.1"
+  version: 5.88.2
+  resolution: "webpack@npm:5.88.2"
   dependencies:
     "@types/eslint-scope": ^3.7.3
     "@types/estree": ^1.0.0
@@ -42283,7 +42900,7 @@ __metadata:
       optional: true
   bin:
     webpack: bin/webpack.js
-  checksum: 726e7e05ab2e7c142609a673dd6aa1a711ed97f349418a2a393d650c5ddad172d191257f60e1e37f6b2a77261571c202aabd5ce9240791a686774f0801cf5ec2
+  checksum: 79476a782da31a21f6dd38fbbd06b68da93baf6a62f0d08ca99222367f3b8668f5a1f2086b7bb78e23172e31fa6df6fa7ab09b25e827866c4fc4dc2b30443ce2
   languageName: node
   linkType: hard
 
@@ -42388,6 +43005,26 @@ __metadata:
   languageName: node
   linkType: hard
 
+"which-builtin-type@npm:^1.1.3":
+  version: 1.1.3
+  resolution: "which-builtin-type@npm:1.1.3"
+  dependencies:
+    function.prototype.name: ^1.1.5
+    has-tostringtag: ^1.0.0
+    is-async-function: ^2.0.0
+    is-date-object: ^1.0.5
+    is-finalizationregistry: ^1.0.2
+    is-generator-function: ^1.0.10
+    is-regex: ^1.1.4
+    is-weakref: ^1.0.2
+    isarray: ^2.0.5
+    which-boxed-primitive: ^1.0.2
+    which-collection: ^1.0.1
+    which-typed-array: ^1.1.9
+  checksum: 43730f7d8660ff9e33d1d3f9f9451c4784265ee7bf222babc35e61674a11a08e1c2925019d6c03154fcaaca4541df43abe35d2720843b9b4cbcebdcc31408f36
+  languageName: node
+  linkType: hard
+
 "which-collection@npm:^1.0.1":
   version: 1.0.1
   resolution: "which-collection@npm:1.0.1"
@@ -42400,13 +43037,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"which-module@npm:^1.0.0":
-  version: 1.0.0
-  resolution: "which-module@npm:1.0.0"
-  checksum: 98434f7deb36350cb543c1f15612188541737e1f12d39b23b1c371dff5cf4aa4746210f2bdec202d5fe9da8682adaf8e3f7c44c520687d30948cfc59d5534edb
-  languageName: node
-  linkType: hard
-
 "which-module@npm:^2.0.0":
   version: 2.0.0
   resolution: "which-module@npm:2.0.0"
@@ -42424,17 +43054,16 @@ __metadata:
   languageName: node
   linkType: hard
 
-"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"
+"which-typed-array@npm:^1.1.10, which-typed-array@npm:^1.1.11, which-typed-array@npm:^1.1.2, which-typed-array@npm:^1.1.9":
+  version: 1.1.11
+  resolution: "which-typed-array@npm:1.1.11"
   dependencies:
     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
+  checksum: 711ffc8ef891ca6597b19539075ec3e08bb9b4c2ca1f78887e3c07a977ab91ac1421940505a197758fb5939aa9524976d0a5bbcac34d07ed6faa75cedbb17206
   languageName: node
   linkType: hard
 
@@ -42460,7 +43089,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"wide-align@npm:^1.1.0, wide-align@npm:^1.1.2":
+"wide-align@npm:^1.1.2":
   version: 1.1.5
   resolution: "wide-align@npm:1.1.5"
   dependencies:
@@ -42469,15 +43098,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"window-size@npm:^0.2.0":
-  version: 0.2.0
-  resolution: "window-size@npm:0.2.0"
-  bin:
-    window-size: cli.js
-  checksum: a85e2acf156cfa194301294809867bdadd8a48ee5d972d9fa8e3e1b3420a1d0201b13ac8eb0348a0d14bbf2c3316565b6a749749c2384c5d286caf8a064c4f90
-  languageName: node
-  linkType: hard
-
 "winston-transport@npm:^4.5.0":
   version: 4.5.0
   resolution: "winston-transport@npm:4.5.0"
@@ -42490,8 +43110,8 @@ __metadata:
   linkType: hard
 
 "winston@npm:^3.2.1":
-  version: 3.8.2
-  resolution: "winston@npm:3.8.2"
+  version: 3.10.0
+  resolution: "winston@npm:3.10.0"
   dependencies:
     "@colors/colors": 1.5.0
     "@dabh/diagnostics": ^2.0.2
@@ -42504,7 +43124,7 @@ __metadata:
     stack-trace: 0.0.x
     triple-beam: ^1.3.0
     winston-transport: ^4.5.0
-  checksum: f7b901798b92ab9e93c850110bf6e98500e9a0e762b62dab410cf928b2a4145533dfa6d3d2b24f7bf0dc94b53808d5bd28aaaeff9a4b43b89ea4c798cce308ea
+  checksum: 47df0361220d12b46d1b3c98a1c380a3718321739d527a182ce7984fc20715e5b0b55db0bcd3fd076d1b1d3261903b890b053851cfd4bc028bda7951fa8ca2e0
   languageName: node
   linkType: hard
 
@@ -42533,16 +43153,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"wrap-ansi@npm:^2.0.0":
-  version: 2.1.0
-  resolution: "wrap-ansi@npm:2.1.0"
-  dependencies:
-    string-width: ^1.0.1
-    strip-ansi: ^3.0.1
-  checksum: 2dacd4b3636f7a53ee13d4d0fe7fa2ed9ad81e9967e17231924ea88a286ec4619a78288de8d41881ee483f4449ab2c0287cde8154ba1bd0126c10271101b2ee3
-  languageName: node
-  linkType: hard
-
 "wrap-ansi@npm:^6.0.1, wrap-ansi@npm:^6.2.0":
   version: 6.2.0
   resolution: "wrap-ansi@npm:6.2.0"
@@ -42554,7 +43164,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"wrap-ansi@npm:^8.1.0":
+"wrap-ansi@npm:^8.0.1, wrap-ansi@npm:^8.1.0":
   version: 8.1.0
   resolution: "wrap-ansi@npm:8.1.0"
   dependencies:
@@ -42639,8 +43249,8 @@ __metadata:
   linkType: hard
 
 "ws@npm:^8.11.0, ws@npm:^8.13.0, ws@npm:^8.8.0":
-  version: 8.13.0
-  resolution: "ws@npm:8.13.0"
+  version: 8.14.0
+  resolution: "ws@npm:8.14.0"
   peerDependencies:
     bufferutil: ^4.0.1
     utf-8-validate: ">=5.0.2"
@@ -42649,7 +43259,7 @@ __metadata:
       optional: true
     utf-8-validate:
       optional: true
-  checksum: 53e991bbf928faf5dc6efac9b8eb9ab6497c69feeb94f963d648b7a3530a720b19ec2e0ec037344257e05a4f35bd9ad04d9de6f289615ffb133282031b18c61c
+  checksum: dd91d055396c42552d8e2d26a0ab10221e73ca356de3db9109e337b8d9df216a0a308ace46a5e0520ed18ffcae3f54c2fa45a96711f94a063c816ef13a30b700
   languageName: node
   linkType: hard
 
@@ -42670,12 +43280,12 @@ __metadata:
   linkType: hard
 
 "xml-crypto@npm:^2.1.3":
-  version: 2.1.3
-  resolution: "xml-crypto@npm:2.1.3"
+  version: 2.1.5
+  resolution: "xml-crypto@npm:2.1.5"
   dependencies:
-    "@xmldom/xmldom": ^0.7.0
+    "@xmldom/xmldom": ^0.7.9
     xpath: 0.0.32
-  checksum: 04273568b4ed3d1422b7e93ae7c5e8e14180e9d377038a5767ef6af4d1da2ec766f3a476f4cf0140ecedb93036dac63e563f60d9bb249c5a344d77c93c07ff87
+  checksum: 387ed6aa812f9ea7fb33385bd3e934042152ee9a97870f28ebfa5c7931eee23a7a2d36ca35916fbe5eadd65163ce9483db661cf3f569c9177773e8efa1acfa37
   languageName: node
   linkType: hard
 
@@ -42704,7 +43314,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"xml2js@npm:^0.4.11, xml2js@npm:^0.4.19, xml2js@npm:^0.4.23":
+"xml2js@npm:^0.4.23":
   version: 0.4.23
   resolution: "xml2js@npm:0.4.23"
   dependencies:
@@ -42714,6 +43324,16 @@ __metadata:
   languageName: node
   linkType: hard
 
+"xml2js@npm:^0.5.0":
+  version: 0.5.0
+  resolution: "xml2js@npm:0.5.0"
+  dependencies:
+    sax: ">=0.6.0"
+    xmlbuilder: ~11.0.0
+  checksum: 1aa71d62e5bc2d89138e3929b9ea46459157727759cbc62ef99484b778641c0cd21fb637696c052d901a22f82d092a3e740a16b4ce218e81ac59b933535124ea
+  languageName: node
+  linkType: hard
+
 "xml2js@npm:^0.6.0":
   version: 0.6.2
   resolution: "xml2js@npm:0.6.2"
@@ -42766,17 +43386,35 @@ __metadata:
   languageName: node
   linkType: hard
 
-"xtend@npm:^4.0.0":
+"xtend@npm:^4.0.0, xtend@npm:~4.0.1":
   version: 4.0.2
   resolution: "xtend@npm:4.0.2"
   checksum: ac5dfa738b21f6e7f0dd6e65e1b3155036d68104e67e5d5d1bde74892e327d7e5636a076f625599dc394330a731861e87343ff184b0047fef1360a7ec0a5a36a
   languageName: node
   linkType: hard
 
-"y18n@npm:^3.2.1":
-  version: 3.2.2
-  resolution: "y18n@npm:3.2.2"
-  checksum: 6154fd7544f8bbf5b18cdf77692ed88d389be49c87238ecb4e0d6a5276446cd2a5c29cc4bdbdddfc7e4e498b08df9d7e38df4a1453cf75eecfead392246ea74a
+"xterm-addon-attach@npm:^0.8.0":
+  version: 0.8.0
+  resolution: "xterm-addon-attach@npm:0.8.0"
+  peerDependencies:
+    xterm: ^5.0.0
+  checksum: 2ac70bdd1c97eb05b83b4573132ed9d3686c07ed14212e273800a5693bb0f3ea41c570b49ac90cb95a1e593d5a2764a28c13b649c596054bf5aa87c8489069eb
+  languageName: node
+  linkType: hard
+
+"xterm-addon-fit@npm:^0.7.0":
+  version: 0.7.0
+  resolution: "xterm-addon-fit@npm:0.7.0"
+  peerDependencies:
+    xterm: ^5.0.0
+  checksum: 512d41f80d6f9427ba02dab4e6fd642e94775a9cf7ef72ae4b55eab2a36856b5c67069bfc66b4af412fdce29a0842f9c6382af3672f0b514c4352dfd47defe8f
+  languageName: node
+  linkType: hard
+
+"xterm@npm:^5.2.1":
+  version: 5.2.1
+  resolution: "xterm@npm:5.2.1"
+  checksum: 3a9de30e772c7ae30895ec97fcfb3b0906429c5ea0cddf8948e8e30301385f82e467c6e6aca28ae50a48300ce795381d83fe35b4e17886ab4a1357054a15f68f
   languageName: node
   linkType: hard
 
@@ -42822,6 +43460,28 @@ __metadata:
   languageName: node
   linkType: hard
 
+"yaml-diff-patch@npm:^2.0.0":
+  version: 2.0.0
+  resolution: "yaml-diff-patch@npm:2.0.0"
+  dependencies:
+    fast-json-patch: ^3.1.0
+    oppa: ^0.4.0
+    yaml: ^2.0.0-10
+  bin:
+    yaml-diff-patch: dist/bin/yaml-patch.js
+    yaml-overwrite: dist/bin/yaml-patch.js
+    yaml-patch: dist/bin/yaml-patch.js
+  checksum: 5207d8523584eb6088fe32a0c6010599260ecfa5f959d120a1bad02f19143d1ddeafe10c37ccf125ac04d079072a5ead92b55c6787fd64d12f5acbb0d172e7ec
+  languageName: node
+  linkType: hard
+
+"yaml@npm:2.3.1":
+  version: 2.3.1
+  resolution: "yaml@npm:2.3.1"
+  checksum: 2c7bc9a7cd4c9f40d3b0b0a98e370781b68b8b7c4515720869aced2b00d92f5da1762b4ffa947f9e795d6cd6b19f410bd4d15fdd38aca7bd96df59bd9486fb54
+  languageName: node
+  linkType: hard
+
 "yaml@npm:^1.10.0, yaml@npm:^1.10.2, yaml@npm:^1.7.2":
   version: 1.10.2
   resolution: "yaml@npm:1.10.2"
@@ -42829,10 +43489,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"yaml@npm:^2.0.0, yaml@npm:^2.1.1, yaml@npm:^2.2.1, yaml@npm:^2.2.2":
-  version: 2.2.2
-  resolution: "yaml@npm:2.2.2"
-  checksum: d90c235e099e30094dcff61ba3350437aef53325db4a6bcd04ca96e1bfe7e348b191f6a7a52b5211e2dbc4eeedb22a00b291527da030de7c189728ef3f2b4eb3
+"yaml@npm:^2.0.0, yaml@npm:^2.0.0-10, yaml@npm:^2.1.1, yaml@npm:^2.2.1, yaml@npm:^2.2.2":
+  version: 2.3.2
+  resolution: "yaml@npm:2.3.2"
+  checksum: acd80cc24df12c808c6dec8a0176d404ef9e6f08ad8786f746ecc9d8974968c53c6e8a67fdfabcc5f99f3dc59b6bb0994b95646ff03d18e9b1dcd59eccc02146
   languageName: node
   linkType: hard
 
@@ -42853,23 +43513,13 @@ __metadata:
   languageName: node
   linkType: hard
 
-"yargs-parser@npm:^21.0.0":
+"yargs-parser@npm:^21.1.1":
   version: 21.1.1
   resolution: "yargs-parser@npm:21.1.1"
   checksum: ed2d96a616a9e3e1cc7d204c62ecc61f7aaab633dcbfab2c6df50f7f87b393993fe6640d017759fe112d0cb1e0119f2b4150a87305cc873fd90831c6a58ccf1c
   languageName: node
   linkType: hard
 
-"yargs-parser@npm:^3.2.0":
-  version: 3.2.0
-  resolution: "yargs-parser@npm:3.2.0"
-  dependencies:
-    camelcase: ^3.0.0
-    lodash.assign: ^4.1.0
-  checksum: d86fd69816a28a617f4cad21f7bfe7f7c931b16d063c73449cd914db409b8d5981a0f29f9e2a05014a7229164aa47336adf5a8856fa9870ab892346d29138e9a
-  languageName: node
-  linkType: hard
-
 "yargs@npm:^15.1.0, yargs@npm:^15.3.1":
   version: 15.4.1
   resolution: "yargs@npm:15.4.1"
@@ -42904,40 +43554,18 @@ __metadata:
   languageName: node
   linkType: hard
 
-"yargs@npm:^17.0.0, yargs@npm:^17.1.1, yargs@npm:^17.2.1, yargs@npm:^17.3.1":
-  version: 17.5.1
-  resolution: "yargs@npm:17.5.1"
+"yargs@npm:^17.0.0, yargs@npm:^17.1.1, yargs@npm:^17.2.1, yargs@npm:^17.3.1, yargs@npm:^17.7.1, yargs@npm:^17.7.2":
+  version: 17.7.2
+  resolution: "yargs@npm:17.7.2"
   dependencies:
-    cliui: ^7.0.2
+    cliui: ^8.0.1
     escalade: ^3.1.1
     get-caller-file: ^2.0.5
     require-directory: ^2.1.1
     string-width: ^4.2.3
     y18n: ^5.0.5
-    yargs-parser: ^21.0.0
-  checksum: 00d58a2c052937fa044834313f07910fd0a115dec5ee35919e857eeee3736b21a4eafa8264535800ba8bac312991ce785ecb8a51f4d2cc8c4676d865af1cfbde
-  languageName: node
-  linkType: hard
-
-"yargs@npm:^5.0.0":
-  version: 5.0.0
-  resolution: "yargs@npm:5.0.0"
-  dependencies:
-    cliui: ^3.2.0
-    decamelize: ^1.1.1
-    get-caller-file: ^1.0.1
-    lodash.assign: ^4.2.0
-    os-locale: ^1.4.0
-    read-pkg-up: ^1.0.1
-    require-directory: ^2.1.1
-    require-main-filename: ^1.0.1
-    set-blocking: ^2.0.0
-    string-width: ^1.0.2
-    which-module: ^1.0.0
-    window-size: ^0.2.0
-    y18n: ^3.2.1
-    yargs-parser: ^3.2.0
-  checksum: 478e9c8562c5cf5b9c2efc7c917e0b00c489cc50153d5d911ab68767c2cfddaf0b5bd4e04d6fefc00cb1d8f6263eab1d73df79a24d650ba95f5d45c819a1585a
+    yargs-parser: ^21.1.1
+  checksum: 73b572e863aa4a8cbef323dd911d79d193b772defd5a51aab0aca2d446655216f5002c42c5306033968193bdbf892a7a4c110b0d77954a7fdf563e653967b56a
   languageName: node
   linkType: hard
 
@@ -42952,8 +43580,8 @@ __metadata:
   linkType: hard
 
 "yeoman-environment@npm:^3.9.1":
-  version: 3.15.1
-  resolution: "yeoman-environment@npm:3.15.1"
+  version: 3.19.3
+  resolution: "yeoman-environment@npm:3.19.3"
   dependencies:
     "@npmcli/arborist": ^4.0.4
     are-we-there-yet: ^2.0.0
@@ -42985,18 +43613,16 @@ __metadata:
     pacote: ^12.0.2
     preferred-pm: ^3.0.3
     pretty-bytes: ^5.3.0
+    readable-stream: ^4.3.0
     semver: ^7.1.3
     slash: ^3.0.0
     strip-ansi: ^6.0.0
     text-table: ^0.2.0
     textextensions: ^5.12.0
     untildify: ^4.0.0
-  peerDependencies:
-    mem-fs: ^1.2.0 || ^2.0.0
-    mem-fs-editor: ^8.1.2 || ^9.0.0
   bin:
     yoe: cli/index.js
-  checksum: 7ea7bb0a210f2e0702f54420916075cda329ee2b71243fb911af9bcfc1e59a934daef1027dd9e95a410f5dae1eeb1fcdb85f4c697a0429477a3a50d2e48d0d58
+  checksum: 9d5127304fb5afd176284f0978085095525c919fb82a83e908dc53994e50430f22e9271daddd367d85a197c1ec77f6e88a6fd8d1bda0954382bef0f627c7b7e6
   languageName: node
   linkType: hard
 
@@ -43118,19 +43744,19 @@ __metadata:
   languageName: node
   linkType: hard
 
-"zod-to-json-schema@npm:^3.20.4":
-  version: 3.20.4
-  resolution: "zod-to-json-schema@npm:3.20.4"
+"zod-to-json-schema@npm:^3.20.4, zod-to-json-schema@npm:^3.21.4":
+  version: 3.21.4
+  resolution: "zod-to-json-schema@npm:3.21.4"
   peerDependencies:
-    zod: ^3.20.0
-  checksum: 55bc649dbc82ce25fbfbfdd42ca530d883d83be5d02cb81e89f6401d54bca151fc6b8cc57999c75eb6a3dcaa3f000697315fbd4f505637472621570ed52784d8
+    zod: ^3.21.4
+  checksum: 899c1f461fb6547c0b08a265c82040c250be9b88d3f408f2f3ff77a418fdfad7549077e589d418fccb312c1f6d555c3c7217b199cc9072762e1fab20716dd2a6
   languageName: node
   linkType: hard
 
-"zod@npm:^3.21.4, zod@npm:~3.21.4":
-  version: 3.21.4
-  resolution: "zod@npm:3.21.4"
-  checksum: f185ba87342ff16f7a06686767c2b2a7af41110c7edf7c1974095d8db7a73792696bcb4a00853de0d2edeb34a5b2ea6a55871bc864227dace682a0a28de33e1f
+"zod@npm:^3.21.4":
+  version: 3.22.2
+  resolution: "zod@npm:3.22.2"
+  checksum: 231e2180c8eabb56e88680d80baff5cf6cbe6d64df3c44c50ebe52f73081ecd0229b1c7215b9552537f537a36d9e36afac2737ddd86dc14e3519bdbc777e82b9
   languageName: node
   linkType: hard
 
@@ -43141,6 +43767,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"zod@npm:~3.21.4":
+  version: 3.21.4
+  resolution: "zod@npm:3.21.4"
+  checksum: f185ba87342ff16f7a06686767c2b2a7af41110c7edf7c1974095d8db7a73792696bcb4a00853de0d2edeb34a5b2ea6a55871bc864227dace682a0a28de33e1f
+  languageName: node
+  linkType: hard
+
 "zustand@npm:3.6.9":
   version: 3.6.9
   resolution: "zustand@npm:3.6.9"